diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:37:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:37:19 +1000 |
| commit | 9fe399ad1500c954b5c7cc6fb3d4c4817be4e7d0 (patch) | |
| tree | 654c13ce4ffc7d27ce8dcedb6a75651ecff218ea /init | |
| parent | bab2e568e03396d86d8e908665ff5ef045675ac8 (diff) | |
| parent | dbacdac140def273a3e0721cff4fe501ad1cc88b (diff) | |
Merge commit 'kmemleak/kmemleak'
Conflicts:
arch/x86/kernel/vmlinux_32.lds.S
arch/x86/kernel/vmlinux_64.lds.S
lib/Kconfig.debug
mm/slob.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 064fb795d2c4..cc619415fa9a 100644 --- a/init/main.c +++ b/init/main.c @@ -56,6 +56,7 @@ #include <linux/debug_locks.h> #include <linux/debugobjects.h> #include <linux/lockdep.h> +#include <linux/kmemleak.h> #include <linux/pid_namespace.h> #include <linux/device.h> #include <linux/kthread.h> @@ -604,6 +605,7 @@ asmlinkage void __init start_kernel(void) /* init some links before init_ISA_irqs() */ early_irq_init(); init_IRQ(); + prio_tree_init(); pidhash_init(); init_timers(); hrtimers_init(); @@ -654,6 +656,7 @@ asmlinkage void __init start_kernel(void) enable_debug_pagealloc(); kmem_cache_init(); kmemtrace_init(); + kmemleak_init(); debug_objects_mem_init(); idr_init_cache(); setup_per_cpu_pageset(); @@ -663,7 +666,6 @@ asmlinkage void __init start_kernel(void) calibrate_delay(); pidmap_init(); pgtable_cache_init(); - prio_tree_init(); anon_vma_init(); #ifdef CONFIG_X86 if (efi_enabled) |