Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

1 files changed, 18 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index c7bac39d6c61..09c5c6431f42 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -921,6 +921,11 @@ config HAVE_PERF_EVENTS
         help
           See tools/perf/design.txt for details.
 
+config PERF_USE_VMALLOC
+        bool
+        help
+          See tools/perf/design.txt for details
+
 menu "Kernel Performance Events And Counters"
 
 config PERF_EVENTS
@@ -976,6 +981,19 @@ config PERF_COUNTERS
 
           Say N if unsure.
 
+config DEBUG_PERF_USE_VMALLOC
+        default n
+        bool "Debug: use vmalloc to back perf mmap() buffers"
+        depends on PERF_EVENTS && DEBUG_KERNEL
+        select PERF_USE_VMALLOC
+        help
+         Use vmalloc memory to back perf mmap() buffers.
+
+         Mostly useful for debugging the vmalloc code on platforms
+         that don't require it.
+
+         Say N if unsure.
+
 endmenu
 
 config VM_EVENT_COUNTERS