diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 17:10:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 17:10:18 +1100 |
| commit | ffc197f4e0020769405e44a7998ca0ae2a6da03b (patch) | |
| tree | be3760e7d6a3db4794b24c13eb7edb0c582f7f6c /init | |
| parent | 6de71cd23bd8228deb38ec5d6a55c9fa5cacdd74 (diff) | |
| parent | a2a127e219d3eeca56232bad1f7e8681a10e609e (diff) | |
Merge commit 'kmemleak/kmemleak'
Conflicts:
include/linux/slab.h
init/main.c
lib/Kconfig.debug
mm/slab.c
mm/slob.c
mm/slub.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 ea9faf990d48..03f365730f8e 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> @@ -595,6 +596,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(); @@ -646,6 +648,7 @@ asmlinkage void __init start_kernel(void) cpu_hotplug_init(); kmem_cache_init(); kmemtrace_init(); + kmemleak_init(); debug_objects_mem_init(); idr_init_cache(); setup_per_cpu_pageset(); @@ -655,7 +658,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) |