diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 03:45:15 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 03:45:15 -0500 |
commit | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (patch) | |
tree | bca1fcfef55b3e3e82c9a822b4ac6428fce2b419 /init/Kconfig | |
parent | 2b583d8bc8d7105b58d7481a4a0ceb718dac49c6 (diff) | |
parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) |
Merge branch 'linus' into perfcounters/core
Conflicts:
fs/exec.c
include/linux/init_task.h
Simple context conflicts.
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7d147a36e968..c38ae71a5e19 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -588,6 +588,13 @@ config KALLSYMS_ALL | |||
588 | 588 | ||
589 | Say N. | 589 | Say N. |
590 | 590 | ||
591 | config KALLSYMS_STRIP_GENERATED | ||
592 | bool "Strip machine generated symbols from kallsyms" | ||
593 | depends on KALLSYMS_ALL | ||
594 | default y | ||
595 | help | ||
596 | Say N if you want kallsyms to retain even machine generated symbols. | ||
597 | |||
591 | config KALLSYMS_EXTRA_PASS | 598 | config KALLSYMS_EXTRA_PASS |
592 | bool "Do an extra kallsyms pass" | 599 | bool "Do an extra kallsyms pass" |
593 | depends on KALLSYMS | 600 | depends on KALLSYMS |
@@ -838,6 +845,7 @@ config TRACEPOINTS | |||
838 | 845 | ||
839 | config MARKERS | 846 | config MARKERS |
840 | bool "Activate markers" | 847 | bool "Activate markers" |
848 | depends on TRACEPOINTS | ||
841 | help | 849 | help |
842 | Place an empty function call at each marker site. Can be | 850 | Place an empty function call at each marker site. Can be |
843 | dynamically changed for a probe function. | 851 | dynamically changed for a probe function. |