diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 16:15:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 16:15:18 +1100 |
| commit | f388e00a257652f638232e9049d6f3408e0333c2 (patch) | |
| tree | 371a3df9df67d60e272b1800f2978bdf18851c20 /init | |
| parent | 4a53628a5b001191c0874fc4107458b1e94c8a59 (diff) | |
| parent | 00f39605364d5d04d669c7c280d8645efee3aa51 (diff) | |
Merge commit 'slab/for-next'
Diffstat (limited to 'init')
| -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 a074e8329073..cf0b22efeaab 100644 --- a/init/main.c +++ b/init/main.c @@ -71,6 +71,7 @@ #include <asm/setup.h> #include <asm/sections.h> #include <asm/cacheflush.h> +#include <linux/kmemtrace.h> #ifdef CONFIG_X86_LOCAL_APIC #include <asm/smp.h> @@ -684,6 +685,7 @@ asmlinkage void __init start_kernel(void) enable_debug_pagealloc(); cpu_hotplug_init(); kmem_cache_init(); + kmemtrace_init(); debug_objects_mem_init(); idr_init_cache(); setup_per_cpu_pageset(); |