Automatic merge with /usr/src/ntfs-2.6.git.

2 files changed, 3 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a7660ccc69..b1091d7542 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -164,6 +164,7 @@ config SYSCTL
 
 config AUDIT
         bool "Auditing support"
+        depends on NET
         default y if SECURITY_SELINUX
         help
           Enable auditing infrastructure that can be used with another
@@ -173,7 +174,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML)
+        depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
diff --git a/init/main.c b/init/main.c
index 40bf367ffd..d324801729 100644
--- a/init/main.c
+++ b/init/main.c
@@ -490,6 +490,7 @@ asmlinkage void __init start_kernel(void)
         vfs_caches_init_early();
         mem_init();
         kmem_cache_init();
+        setup_per_cpu_pageset();
         numa_policy_init();
         if (late_time_init)
                 late_time_init();