diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-12 16:13:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-12 16:13:25 +1100 |
| commit | 3acae8ba2468722014291790405b4b1bec9eeb37 (patch) | |
| tree | 0a5e3b76f220325cf9fa03b2426985fcf2d50144 /init | |
| parent | 6bcfe712c904ad9b7f57aba71c95fb42bf118759 (diff) | |
| parent | e601725c07e6a4855cea78d1f65219ba6be63a06 (diff) | |
Merge commit 'kmemleak/kmemleak'
Conflicts:
Documentation/kernel-parameters.txt
MAINTAINERS
include/linux/percpu.h
include/linux/slab.h
init/main.c
kernel/module.c
lib/Kconfig.debug
mm/slab.c
mm/slob.c
mm/slub.c
mm/vmalloc.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 237c9c3df9e5..65ef0b64f4a3 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(); @@ -645,6 +647,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(); @@ -654,7 +657,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) |