git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kmemleak: Add the base support
[pandora-kernel.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
3bbf93b
..
9d759d6
100644
(file)
--- 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/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>
#include <linux/pid_namespace.h>
#include <linux/device.h>
#include <linux/kthread.h>
@@
-64,6
+65,7
@@
#include <linux/idr.h>
#include <linux/ftrace.h>
#include <linux/async.h>
#include <linux/idr.h>
#include <linux/ftrace.h>
#include <linux/async.h>
+#include <linux/kmemtrace.h>
#include <trace/boot.h>
#include <asm/io.h>
#include <trace/boot.h>
#include <asm/io.h>
@@
-71,7
+73,6
@@
#include <asm/setup.h>
#include <asm/sections.h>
#include <asm/cacheflush.h>
#include <asm/setup.h>
#include <asm/sections.h>
#include <asm/cacheflush.h>
-#include <trace/kmemtrace.h>
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/smp.h>
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/smp.h>
@@
-566,8
+567,7
@@
asmlinkage void __init start_kernel(void)
tick_init();
boot_cpu_init();
page_address_init();
tick_init();
boot_cpu_init();
page_address_init();
- printk(KERN_NOTICE);
- printk(linux_banner);
+ printk(KERN_NOTICE "%s", linux_banner);
setup_arch(&command_line);
mm_init_owner(&init_mm, &init_task);
setup_command_line(command_line);
setup_arch(&command_line);
mm_init_owner(&init_mm, &init_task);
setup_command_line(command_line);
@@
-604,6
+604,7
@@
asmlinkage void __init start_kernel(void)
/* init some links before init_ISA_irqs() */
early_irq_init();
init_IRQ();
/* init some links before init_ISA_irqs() */
early_irq_init();
init_IRQ();
+ prio_tree_init();
pidhash_init();
init_timers();
hrtimers_init();
pidhash_init();
init_timers();
hrtimers_init();
@@
-655,6
+656,7
@@
asmlinkage void __init start_kernel(void)
cpu_hotplug_init();
kmem_cache_init();
kmemtrace_init();
cpu_hotplug_init();
kmem_cache_init();
kmemtrace_init();
+ kmemleak_init();
debug_objects_mem_init();
idr_init_cache();
setup_per_cpu_pageset();
debug_objects_mem_init();
idr_init_cache();
setup_per_cpu_pageset();
@@
-664,7
+666,6
@@
asmlinkage void __init start_kernel(void)
calibrate_delay();
pidmap_init();
pgtable_cache_init();
calibrate_delay();
pidmap_init();
pgtable_cache_init();
- prio_tree_init();
anon_vma_init();
#ifdef CONFIG_X86
if (efi_enabled)
anon_vma_init();
#ifdef CONFIG_X86
if (efi_enabled)