diff options
| author | Adrian Bunk <bunk@kernel.org> | 2007-10-22 04:48:08 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 22:37:22 +0200 |
| commit | ea5806559f92a3e7439bc7a4f2c0d04692e68931 (patch) | |
| tree | 2b6ab7c6121ace9be60edcb39db0e766722d49fa | |
| parent | 01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (diff) | |
| download | kernel_samsung_tuna-ea5806559f92a3e7439bc7a4f2c0d04692e68931.zip kernel_samsung_tuna-ea5806559f92a3e7439bc7a4f2c0d04692e68931.tar.gz kernel_samsung_tuna-ea5806559f92a3e7439bc7a4f2c0d04692e68931.tar.bz2 | |
x86: add instrumentation menu
It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete
due to a clash with the x86 architecture merge.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/i386/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/oprofile/Kconfig | 17 | ||||
| -rw-r--r-- | arch/x86_64/Kconfig | 2 |
3 files changed, 4 insertions, 17 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 5bed8be..b4437ce 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -1270,6 +1270,8 @@ source "drivers/Kconfig" source "fs/Kconfig" +source "kernel/Kconfig.instrumentation" + source "arch/i386/Kconfig.debug" source "security/Kconfig" diff --git a/arch/x86/oprofile/Kconfig b/arch/x86/oprofile/Kconfig deleted file mode 100644 index d8a8408..0000000 --- a/arch/x86/oprofile/Kconfig +++ /dev/null @@ -1,17 +0,0 @@ -config PROFILING - bool "Profiling support (EXPERIMENTAL)" - help - Say Y here to enable the extended profiling support mechanisms used - by profilers such as OProfile. - - -config OPROFILE - tristate "OProfile system profiling (EXPERIMENTAL)" - depends on PROFILING - help - OProfile is a profiling system capable of profiling the - whole system, include the kernel, kernel modules, libraries, - and applications. - - If unsure, say N. - diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index c2d2499..308970a 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -833,6 +833,8 @@ source "drivers/firmware/Kconfig" source fs/Kconfig +source "kernel/Kconfig.instrumentation" + source "arch/x86_64/Kconfig.debug" source "security/Kconfig" |