diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-15 17:36:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-15 17:36:31 +1000 |
| commit | 0fe1266ce500f8d5d0874f119588ee066a633c45 (patch) | |
| tree | bd6261e3eb75941c726c1de0b5314f97b926386e /init/main.c | |
| parent | 1edf87269e24a75988d72f0069a8914965e26f7f (diff) | |
| parent | ada8c3d92c8f73e1ed819682ec919c149248cc0a (diff) | |
Merge commit 'kmemcheck/auto-kmemcheck-next'
Conflicts:
arch/x86/kernel/traps_64.c
arch/x86/mm/Makefile
include/asm-x86/pgtable.h
kernel/sysctl.c
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 3ffa681b2507..b8de6034398f 100644 --- a/init/main.c +++ b/init/main.c @@ -61,6 +61,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> @@ -788,6 +789,7 @@ static void __init do_pre_smp_initcalls(void) { extern int spawn_ksoftirqd(void); + kmemcheck_init(); migration_init(); spawn_ksoftirqd(); if (!nosoftlockup) |