diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:07:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:07:02 +0100 |
| commit | 6c869e772c72d509d0db243a56c205ef48a29baf (patch) | |
| tree | 9a290f1742526a8816f94560cb09bc0a09c910de /arch/x86/Kconfig | |
| parent | e4e91ac410356da3a518188f371e9d3b52ee38ee (diff) | |
| parent | ee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556 (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
Merge reason: Resolve conflict, queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e8327686d3c..e330da21b84 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -21,7 +21,7 @@ config X86 select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE select HAVE_OPROFILE - select HAVE_PERF_EVENTS if (!M386 && !M486) + select HAVE_PERF_EVENTS select HAVE_IRQ_WORK select HAVE_IOREMAP_PROT select HAVE_KPROBES |