diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2010-11-28 12:25:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2010-11-28 12:25:02 -0800 |
| commit | a9e40a2493d805224f900d839b06188639b7ccd6 (patch) | |
| tree | b33c9477a0728f6299a00a3e817aa26872019576 /arch/x86/Kconfig | |
| parent | Merge branch 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139... (diff) | |
| parent | perf: Fix the software context switch counter (diff) | |
| download | linux-a9e40a2493d805224f900d839b06188639b7ccd6.tar.gz linux-a9e40a2493d805224f900d839b06188639b7ccd6.tar.bz2 linux-a9e40a2493d805224f900d839b06188639b7ccd6.zip | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix the software context switch counter
perf, x86: Fixup Kconfig deps
x86, perf, nmi: Disable perf if counters are not accessible
perf: Fix inherit vs. context rotation bug
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 e8327686d3c5..e330da21b84f 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 |