30 Jul, 2011

2 commits

  • * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
    kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
    xconfig: Abort close if configuration cannot be saved
    kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.h
    kconfig/nconf: remove useless conditionnal
    kconfig/nconf: prevent segfault on empty menu
    kconfig/nconf: use the generic menu_get_ext_help()
    nconfig: Avoid Wunused-but-set warning
    kconfig/conf: mark xfgets() private
    kconfig: remove pending prototypes for kconfig_load()
    kconfig/conf: add command line options' description
    kconfig/conf: reduce the scope of `defconfig_file'
    kconfig: use calloc() for expr allocation
    kconfig: introduce specialized printer
    kconfig: do not overwrite symbol direct dependency in assignment
    kconfig/gconf: silent missing prototype warnings
    kconfig/gconf: kill deadcode
    kconfig: nuke LKC_DIRECT_LINK cruft
    kconfig: nuke reference to SWIG
    kconfig: add missing inclusion
    kconfig: add missing inclusion
    ...

    Fix up conflicts in scripts/kconfig/Makefile

    Linus Torvalds
     
  • Replace the config_is_*() macros with a variant that allows for grepping
    for usage of CONFIG_* options in the code. Usage:

    if (IS_ENABLED(CONFIG_NUMA))

    or

    #if IS_ENABLED(CONFIG_NUMA)

    The IS_ENABLED() macro evaluates to 1 if the argument is set (to either 'y'
    or 'm'), IS_BUILTIN() tests if the option is 'y' and IS_MODULE() test if
    the option is 'm'. Only boolean and tristate options are supported.

    Reviewed-by: Arnaud Lacombe
    Acked-by: Randy Dunlap
    Signed-off-by: Michal Marek

    Michal Marek
     

25 Jul, 2011

1 commit


18 Jul, 2011

1 commit

  • The specialized printer for headers (espectially autoconf.h) is missing
    fixup code for S_HEX symbol's "0x" prefix. As long as kconfig does not
    warn for such missing prefix, this code is needed. Fix this.

    In the same time, fix some nits in `header_print_symbol()'.

    Cc: Randy Dunlap
    Cc: Mauro Carvalho Chehab

    Broken-by: Arnaud Lacombe
    Reported-by: Randy Dunlap
    Reported-by: Mauro Carvalho Chehab
    Acked-by: Mauro Carvalho Chehab
    Acked-by: Randy Dunlap
    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     

13 Jul, 2011

4 commits

  • After the test

    if (!submenu || ...)
    continue;

    the variable `submenu' can _not_ be NULL, so do not test for this
    situation.

    Cc: Nir Tzachar
    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     
  • nconf does not check the validity of the current menu when help is
    requested (with either , '?' or 'h'). This leads to a NULL pointer
    dereference when an empty menu is encountered.

    The following reduced testcase exposes the problem:

    config DEP
    bool

    menu "FOO"

    config BAR
    bool "BAR"
    depends on DEP

    endmenu

    Issue will happen when entering menu "FOO" and requesting help.

    nconf is the only front-end which do not filter the validity of the
    current menu. Such filter can not really happen beforehand as other key
    which does not deals with the current menu might be entered by the user,
    so just bails out earlier if we encounter an invalid menu.

    Cc: Nir Tzachar
    Cc: Andrej Gelenberg
    Reported-by: Andrej Gelenberg
    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     
  • nconf is the only front-end which does not use this helper, but prefer
    to copy/paste the code. The test wrt. menu validity added in this
    version of the code is bogus anyway as an invalid menu will get
    dereferenced a few line below by calling menu_get_prompt().

    For now, convert nconf to use menu_get_ext_help(), as do every other
    front-end. We will deals with menu validity checks properly in a
    separate commit.

    Cc: Nir Tzachar
    Cc: Andrej Gelenberg
    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     
  • I am seeing Wunused-but-set warning while make nconfig. Looks like
    active_menu is not used. Removing it fixes the warning.

    Signed-off-by: Raghavendra D Prabhu
    Acked-by: WANG Cong
    Signed-off-by: Michal Marek

    Raghavendra D Prabhu
     

04 Jul, 2011

1 commit


02 Jul, 2011

5 commits


01 Jul, 2011

1 commit

  • Make conf_write_symbol() grammar agnostic to be able to use it from different
    code path. These path pass a printer callback which will print a symbol's name
    and its value in different format.

    conf_write_symbol()'s job become mostly only to prepare a string for the
    printer. This avoid to have to pass specialized flag to generic
    functions

    Signed-off-by: Arnaud Lacombe
    [mmarek: rebased on top of de12518 (kconfig: autogenerated config_is_xxx
    macro)]
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     

24 Jun, 2011

1 commit

  • Considering the following configuration:

    config F
    bool "F"

    choice AB
    bool "AB"
    config A
    bool "A"
    config B
    bool "B"
    endchoice

    if A
    config D
    bool
    default y if F
    select E
    config E
    bool "E"
    endif

    if B
    config D
    bool
    default y if F
    select E
    config E
    bool "E"
    endif

    The following configuration:

    CONFIG_F=y
    CONFIG_A=y
    # CONFIG_B is not set
    CONFIG_D=y
    CONFIG_E=y

    emits a spurious warning:

    (D) selects E which has unmet direct dependencies (B)

    If a symbol appears in two different branch of the tree, it should inherit the
    dependency of both parent, not just the last one.

    Reported-by: Yann E. Morin
    Tested-by: Yann E. Morin
    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     

10 Jun, 2011

5 commits


09 Jun, 2011

1 commit


07 Jun, 2011

9 commits


25 May, 2011

3 commits


24 May, 2011

4 commits


17 May, 2011

1 commit

  • this will allow to use to use

    if(config_is_xxx())
    if(config_is_xxx_module())

    in the code instead of

    #ifdef CONFIG_xxx
    #ifdef CONFIG_xxx_MODULE

    and now let the compiler remove the non usefull code and not the
    pre-processor

    as done in the mach-types for arm as exmaple

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Andi Kleen
    Signed-off-by: Michal Marek

    Jean-Christophe PLAGNIOL-VILLARD
     

29 Apr, 2011

1 commit