diff options
| author | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /init | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 3bbf93be744c..d721dad05dd7 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -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); |