2 files changed, 19 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index c7bac39d6c61..f51586406d62 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -297,7 +297,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64|| SUPERH)
+        depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -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
diff --git a/init/main.c b/init/main.c
index 7449819a4805..5988debfc505 100644
--- a/init/main.c
+++ b/init/main.c
@@ -778,7 +778,6 @@ static void __init do_initcalls(void)
  */
 static void __init do_basic_setup(void)
 {
-        rcu_init_sched(); /* needed by module_init stage. */
         init_workqueues();
         cpuset_init_smp();
         usermodehelper_init();