diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-21 08:07:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-21 08:07:23 -0500 |
| commit | 96200591a34f8ecb98481c626125df43a2463b55 (patch) | |
| tree | 314c376b01f254d04f9aaf449b1f9147ad177fa6 /arch/x86/Kconfig | |
| parent | 7031281e02bf951a2259849217193fb9d75a9762 (diff) | |
| parent | 68efa37df779b3e04280598e8b5b3a1919b65fee (diff) | |
Merge branch 'tracing/hw-breakpoints' into perf/core
Conflicts:
arch/x86/kernel/kprobes.c
kernel/trace/Makefile
Merge reason: hw-breakpoints perf integration is looking
good in testing and in reviews, plus conflicts
are mounting up - so merge & resolve.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 72ace9515a07..178084b4377c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -49,6 +49,7 @@ config X86 | |||
| 49 | select HAVE_KERNEL_GZIP | 49 | select HAVE_KERNEL_GZIP |
| 50 | select HAVE_KERNEL_BZIP2 | 50 | select HAVE_KERNEL_BZIP2 |
| 51 | select HAVE_KERNEL_LZMA | 51 | select HAVE_KERNEL_LZMA |
| 52 | select HAVE_HW_BREAKPOINT | ||
| 52 | select HAVE_ARCH_KMEMCHECK | 53 | select HAVE_ARCH_KMEMCHECK |
| 53 | 54 | ||
| 54 | config OUTPUT_FORMAT | 55 | config OUTPUT_FORMAT |