diff options
author | 2007-10-22 04:48:08 +0200 | |
---|---|---|
committer | 2007-10-23 22:37:22 +0200 | |
commit | ea5806559f92a3e7439bc7a4f2c0d04692e68931 (patch) | |
tree | 2b6ab7c6121ace9be60edcb39db0e766722d49fa /arch/x86_64/Kconfig | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
download | linux-ea5806559f92a3e7439bc7a4f2c0d04692e68931.tar.gz linux-ea5806559f92a3e7439bc7a4f2c0d04692e68931.tar.bz2 linux-ea5806559f92a3e7439bc7a4f2c0d04692e68931.zip |
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>
Diffstat (limited to 'arch/x86_64/Kconfig')
-rw-r--r-- | arch/x86_64/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index c2d24991bb2b..308970aa5382 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" |