Merge commit 'linus/master' into HEAD

[safe/jmp/linux-2.6] / init / main.c

diff --git a/init/main.c b/init/main.c
index f6204f7..7becd8b 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -65,6 +65,7 @@
 #include <linux/idr.h>
 #include <linux/ftrace.h>
 #include <linux/async.h>
+#include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
 #include <trace/boot.h>