diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index 3bbf93be744c..bb7dc57eee36 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -64,6 +64,7 @@ | |||
64 | #include <linux/idr.h> | 64 | #include <linux/idr.h> |
65 | #include <linux/ftrace.h> | 65 | #include <linux/ftrace.h> |
66 | #include <linux/async.h> | 66 | #include <linux/async.h> |
67 | #include <linux/kmemtrace.h> | ||
67 | #include <trace/boot.h> | 68 | #include <trace/boot.h> |
68 | 69 | ||
69 | #include <asm/io.h> | 70 | #include <asm/io.h> |
@@ -71,7 +72,6 @@ | |||
71 | #include <asm/setup.h> | 72 | #include <asm/setup.h> |
72 | #include <asm/sections.h> | 73 | #include <asm/sections.h> |
73 | #include <asm/cacheflush.h> | 74 | #include <asm/cacheflush.h> |
74 | #include <trace/kmemtrace.h> | ||
75 | 75 | ||
76 | #ifdef CONFIG_X86_LOCAL_APIC | 76 | #ifdef CONFIG_X86_LOCAL_APIC |
77 | #include <asm/smp.h> | 77 | #include <asm/smp.h> |
@@ -566,8 +566,7 @@ asmlinkage void __init start_kernel(void) | |||
566 | tick_init(); | 566 | tick_init(); |
567 | boot_cpu_init(); | 567 | boot_cpu_init(); |
568 | page_address_init(); | 568 | page_address_init(); |
569 | printk(KERN_NOTICE); | 569 | printk(KERN_NOTICE "%s", linux_banner); |
570 | printk(linux_banner); | ||
571 | setup_arch(&command_line); | 570 | setup_arch(&command_line); |
572 | mm_init_owner(&init_mm, &init_task); | 571 | mm_init_owner(&init_mm, &init_task); |
573 | setup_command_line(command_line); | 572 | setup_command_line(command_line); |