summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-14 17:24:13 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-14 17:24:13 +0200
commitfb46cf6fb9dbf4cf58e4fd6939b77de1c39d40d2 (patch)
tree730271e7bc6f73e8f32fc8f95783e2ce04ec5d1d /init
parent7591103c08abade60aeddb432ed0686ddd0de1c6 (diff)
parentf2d5bcd8284c28cf559f06dc0d12472648c33878 (diff)
Merge branch 'kmemcheck-v2' into auto-kmemcheck-next
Diffstat (limited to 'init')
-rw-r--r--init/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index 3820323c4c84..838e575520ec 100644
--- a/init/main.c
+++ b/init/main.c
@@ -60,6 +60,7 @@
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/idr.h>
+#include <linux/kmemcheck.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@ -779,6 +780,9 @@ static void __init do_pre_smp_initcalls(void)
{
initcall_t *call;
+ /* kmemcheck must initialize before all early initcalls: */
+ kmemcheck_init();
+
for (call = __initcall_start; call < __early_initcall_end; call++)
do_one_initcall(*call);
}