diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 3 | ||||
-rw-r--r-- | init/main.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index a7660ccc693f..b1091d7542ce 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -164,6 +164,7 @@ config SYSCTL | |||
164 | 164 | ||
165 | config AUDIT | 165 | config AUDIT |
166 | bool "Auditing support" | 166 | bool "Auditing support" |
167 | depends on NET | ||
167 | default y if SECURITY_SELINUX | 168 | default y if SECURITY_SELINUX |
168 | help | 169 | help |
169 | Enable auditing infrastructure that can be used with another | 170 | Enable auditing infrastructure that can be used with another |
@@ -173,7 +174,7 @@ config AUDIT | |||
173 | 174 | ||
174 | config AUDITSYSCALL | 175 | config AUDITSYSCALL |
175 | bool "Enable system-call auditing support" | 176 | bool "Enable system-call auditing support" |
176 | depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML) | 177 | depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML) |
177 | default y if SECURITY_SELINUX | 178 | default y if SECURITY_SELINUX |
178 | help | 179 | help |
179 | Enable low-overhead system-call auditing infrastructure that | 180 | Enable low-overhead system-call auditing infrastructure that |
diff --git a/init/main.c b/init/main.c index 40bf367ffdf1..d324801729ba 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -490,6 +490,7 @@ asmlinkage void __init start_kernel(void) | |||
490 | vfs_caches_init_early(); | 490 | vfs_caches_init_early(); |
491 | mem_init(); | 491 | mem_init(); |
492 | kmem_cache_init(); | 492 | kmem_cache_init(); |
493 | setup_per_cpu_pageset(); | ||
493 | numa_policy_init(); | 494 | numa_policy_init(); |
494 | if (late_time_init) | 495 | if (late_time_init) |
495 | late_time_init(); | 496 | late_time_init(); |