linux-stable.git/scripts/kconfig/symbol.c, branch linux-3.12.y

kconfig: switch to "long long" for sanity

2013-08-15T20:48:06+00:00

Instead of using "long" for kconfig "hex" and "range" values, which may
change in size depending on the host architecture, use "long long". This
will allow values greater than INT_MAX on 32-bit hosts when cross
compiling.

Signed-off-by: Kees Cook 
Acked-by: Geert Uytterhoeven 
Tested-by: "Yann E. MORIN" 
Signed-off-by: "Yann E. MORIN"

kconfig: simplify symbol-search code

2013-07-16T18:39:42+00:00

There is no need for a double indirection in the temporary array that
stores the internediate search results.

Reported-by: Jean Delvare 
Signed-off-by: "Yann E. MORIN" 
Reviewed-by: Jean Delvare

kconfig: don't allocate n+1 elements in temporary array

2013-07-16T18:36:18+00:00

The temporary array that stores the search results is not NULL-terminated,
so there is no reason to allocate n+1 elements.

Reported-by: Jean Delvare 
Signed-off-by: "Yann E. MORIN" 
Reviewed-by: Jean Delvare

kconfig: minor style fixes in symbol-search code

2013-07-16T18:34:44+00:00

Two minor style fixes:
  - no space before/after parenthesis in function definition
  - no {} for single-line if()

And one grammar fix in a comment.

Reported-by: Jean Delvare 
Signed-off-by: "Yann E. MORIN" 
Cc: Jean Delvare 
Reviewed-by: Jean Delvare

kconfig: avoid multiple calls to strlen

2013-07-16T18:26:46+00:00

Calls to strlen are costly, so avoid calling strln as much as we can.

Reported-by: Jean Delvare 
Signed-off-by: "Yann E. MORIN" 
Cc: Jean Delvare 
Reviewed-by: Jean Delvare

kconfig: allow "hex" and "range" to support longs

2013-06-29T13:30:17+00:00

The parsing routines for Kconfig files use strtol(), but store and
render values as int. Switch types and formating to long to support a
wider range of values. For example, 0x80000000 wasn't representable.

Signed-off-by: Kees Cook 
Tested-by: "Yann E. MORIN" 
Reviewed-by: "Yann E. MORIN" 
Signed-off-by: "Yann E. MORIN"

kconfig: sort found symbols by relevance

2013-06-24T17:57:45+00:00

When searching for symbols, return the symbols sorted by relevance.

Sorting is done as thus:
  - first, symbols that match exactly
  - then, alphabetical sort

Since the search can be a regexp, it is possible that more than one symbol
matches exactly. In this case, we can't decide which to sort first, so we
fallback to alphabeticall sort.

Explain this (new!) sorting heuristic in the documentation.

Reported-by: Jean Delvare 
Signed-off-by: "Yann E. MORIN" 
Cc: Jean Delvare 
Cc: Michal Marek 
Cc: Roland Eggner 
Cc: Wang YanQing 

--
Changes v1->v2:
  - drop the previous, complex heuristic in favour of a simpler heuristic
    that is both easier to understand, *and* to maintain (Jean)
  - explain sorting heuristic in the doc  (Jean)

kconfig: Fix defconfig when one choice menu selects options that another choice menu depends on

2013-06-16T09:00:30+00:00

The defconfig and Kconfig combination below, which is based on 3.10-rc4
Kconfigs, resulted in several options getting set to "m" instead of "y".

defconfig.choice:
---8<---
CONFIG_MODULES=y
CONFIG_USB_ZERO=y
---8<---

Kconfig.choice:
---8<---
menuconfig MODULES
	bool "Enable loadable module support"

config CONFIGFS_FS
	tristate "Userspace-driven configuration filesystem"

config OCFS2_FS
        tristate "OCFS2 file system support"
        depends on CONFIGFS_FS
        select CRC32

config USB_LIBCOMPOSITE
	tristate
	select CONFIGFS_FS

choice
	tristate "USB Gadget Drivers"
	default USB_ETH

config USB_ZERO
	tristate "Gadget Zero (DEVELOPMENT)"
	select USB_LIBCOMPOSITE

config USB_ETH
	tristate "Ethernet Gadget (with CDC Ethernet support)"
	select USB_LIBCOMPOSITE

endchoice

config CRC32
        tristate "CRC32/CRC32c functions"
        default y

choice
        prompt "CRC32 implementation"
        depends on CRC32
        default CRC32_SLICEBY8

config CRC32_SLICEBY8
        bool "Slice by 8 bytes"

endchoice
---8<---

$ scripts/kconfig/conf --defconfig=defconfig.choice Kconfig.choice

would result in:

.config:
---8<---
CONFIG_MODULES=y
CONFIG_CONFIGFS_FS=m
CONFIG_USB_LIBCOMPOSITE=m
CONFIG_USB_ZERO=m
CONFIG_CRC32=y
CONFIG_CRC32_SLICEBY8=y
---8<---

when the expected result would be:

.config:
---8<---
CONFIG_MODULES=y
CONFIG_CONFIGFS_FS=y
CONFIG_USB_LIBCOMPOSITE=y
CONFIG_USB_ZERO=y
CONFIG_CRC32=y
CONFIG_CRC32_SLICEBY8=y
---8<---

Signed-off-by: Arve Hjønnevåg 
[yann.morin.1998@free.fr: add the resulting .config to commit log,
                          remove unneeded USB_GADGET from the defconfig]
Tested-by: "Yann E. MORIN" 
Reviewed-by: "Yann E. MORIN" 
Signed-off-by: Yann E. MORIN

kconfig: Fix malloc handling in conf tools

2012-11-20T11:12:47+00:00

(and get them out of the noise in the audit work)

Signed-off-by: Alan Cox 
Signed-off-by: Michal Marek

kconfig: fix new choices being skipped upon config update

2012-01-26T10:01:56+00:00

Running `oldconfig' after any of the following configuration change:

either trivial addition, such as:

config A
	bool "A"

choice
	prompt "Choice ?"
	depends on A

	config CHOICE_B
		bool "Choice B"

	config CHOICE_C
		bool "Choice C"
endchoice

or more tricky change:

OLD KCONFIG                      |  NEW KCONFIG
                                 |
                                 |  config A
                                 |          bool "A"
                                 |
choice                           |  choice
        prompt "Choice ?"        |          prompt "Choice ?"
                                 |
        config CHOICE_C          |          config CHOICE_C
                bool "Choice C"  |                  bool "Choice C"
                                 |
        config CHOICE_D          |          config CHOICE_D
                bool "Choice D"  |                  bool "Choice D"
endchoice                        |
                                 |          config CHOICE_E
                                 |                  bool "Choice E"
                                 |                  depends on A
                                 |  endchoice

will not cause the choice to be considered as NEW, and thus not be
asked. The cause of this behavior is that choice's novelty are computed
statically right after the saved configuration has been read. At this
point, the new dependency's value is still unknown and asserted to be
`no'. Moreover, no update to this decision is made afterward.

Correct this by dynamically evaluating a choice's novelty, and removing the
static evaluation.

Reported-and-tested-by: Uwe Kleine-König 
Signed-off-by: Arnaud Lacombe 
Signed-off-by: Michal Marek