diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 12:05:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 12:05:50 -0700 |
| commit | b924f9599dfd4a604761e84b1e920e480fb57f66 (patch) | |
| tree | a1456ef8aea8beb8415d8258a978e072467d8ff6 /arch | |
| parent | b9d40b7b1e349bdc5c174b4ef1a333e62f7d749c (diff) | |
| parent | 2dca6999eed58d44b67e9de7d6ec230f6250553d (diff) | |
Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA
perf_event: Provide vmalloc() based mmap() backing
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index ac45aab741a..05ef5380a68 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -26,6 +26,7 @@ config SPARC select RTC_CLASS select RTC_DRV_M48T59 select HAVE_PERF_EVENTS + select PERF_USE_VMALLOC select HAVE_DMA_ATTRS select HAVE_DMA_API_DEBUG @@ -48,6 +49,7 @@ config SPARC64 select RTC_DRV_SUN4V select RTC_DRV_STARFIRE select HAVE_PERF_EVENTS + select PERF_USE_VMALLOC config ARCH_DEFCONFIG string |