diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 15:16:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 15:16:24 +0100 |
| commit | 2ff9f9d9629bf9530fe2ab8d803d612761ffc059 (patch) | |
| tree | b22e3fddffbc0f58b1e1974f4819896d58b7bdaf /init | |
| parent | Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' in... (diff) | |
| parent | kmemtrace: add missing newline (diff) | |
| download | linux-2ff9f9d9629bf9530fe2ab8d803d612761ffc059.tar.xz linux-2ff9f9d9629bf9530fe2ab8d803d612761ffc059.zip | |
Merge branch 'topic/kmemtrace' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 into tracing/kmemtrace
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 17e9757bfde2..9711586aa7c9 100644 --- a/init/main.c +++ b/init/main.c @@ -70,6 +70,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> @@ -654,6 +655,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(); |