diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2011-06-15 15:08:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-15 20:04:01 -0700 |
| commit | d2c32258798f813dc2be6cbc32f78aa5ac5cb205 (patch) | |
| tree | e44c0d0feeaa52fe7d7b02ed343f7f5b671c372a | |
| parent | b0461a44a2f1fc052fc949ae19c3a5d684627b09 (diff) | |
| download | linux-3.10-d2c32258798f813dc2be6cbc32f78aa5ac5cb205.tar.gz linux-3.10-d2c32258798f813dc2be6cbc32f78aa5ac5cb205.tar.bz2 linux-3.10-d2c32258798f813dc2be6cbc32f78aa5ac5cb205.zip | |
gcov: disable CONFIG_CONSTRUCTORS when not needed by CONFIG_GCOV_KERNEL
CONFIG_CONSTRUCTORS controls support for running constructor functions at
kernel init time. According to commit b99b87f70c7785ab ("kernel:
constructor support"), gcov (CONFIG_GCOV_KERNEL) needs this. However,
CONFIG_CONSTRUCTORS currently defaults to y, with no option to disable it,
and CONFIG_GCOV_KERNEL depends on it. Instead, default it to n and have
CONFIG_GCOV_KERNEL select it, so that the normal case of
CONFIG_GCOV_KERNEL=n will result in CONFIG_CONSTRUCTORS=n.
Observed in the short list of =y values in a minimal kernel configuration.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | init/Kconfig | 1 | ||||
| -rw-r--r-- | kernel/gcov/Kconfig | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index e0a22e42d39..412c21b00d5 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -19,7 +19,6 @@ config DEFCONFIG_LIST config CONSTRUCTORS bool depends on !UML - default y config HAVE_IRQ_WORK bool diff --git a/kernel/gcov/Kconfig b/kernel/gcov/Kconfig index b8cadf70b1f..5bf924d80b5 100644 --- a/kernel/gcov/Kconfig +++ b/kernel/gcov/Kconfig @@ -2,7 +2,8 @@ menu "GCOV-based kernel profiling" config GCOV_KERNEL bool "Enable gcov-based kernel profiling" - depends on DEBUG_FS && CONSTRUCTORS + depends on DEBUG_FS + select CONSTRUCTORS default n ---help--- This option enables gcov-based code profiling (e.g. for code coverage |