diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
commit | 57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch) | |
tree | 978bd46ca765a88e9c101cb705bbb0bf46015643 /init/main.c | |
parent | 76052749143d03006271cc0ce8205ad756917062 (diff) | |
parent | 5a9e67b1a19e08a82387709f325d26e07b891d27 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
trivial: chack -> check typo fix in main Makefile
trivial: Add a space (and a comma) to a printk in 8250 driver
trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
trivial: Fix misspelling of "firmware" in powerpc Makefile
trivial: Fix misspelling of "firmware" in usb.c
trivial: Fix misspelling of "firmware" in qla1280.c
trivial: Fix misspelling of "firmware" in a100u2w.c
trivial: Fix misspelling of "firmware" in megaraid.c
trivial: Fix misspelling of "firmware" in ql4_mbx.c
trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
trivial: Fix misspelling of "firmware" in ipw2100.c
trivial: Fix misspelling of "firmware" in atmel.c
trivial: Fix misspelled firmware in Kconfig
trivial: fix an -> a typos in documentation and comments
trivial: fix then -> than typos in comments and documentation
trivial: update Jesper Juhl CREDITS entry with new email
trivial: fix singal -> signal typo
trivial: Fix incorrect use of "loose" in event.c
trivial: printk: fix indentation of new_text_line declaration
trivial: rtc-stk17ta8: fix sparse warning
...
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index b5a892c68375..05b313283311 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -599,7 +599,8 @@ asmlinkage void __init start_kernel(void) | |||
599 | sched_clock_init(); | 599 | sched_clock_init(); |
600 | profile_init(); | 600 | profile_init(); |
601 | if (!irqs_disabled()) | 601 | if (!irqs_disabled()) |
602 | printk("start_kernel(): bug: interrupts were enabled early\n"); | 602 | printk(KERN_CRIT "start_kernel(): bug: interrupts were " |
603 | "enabled early\n"); | ||
603 | early_boot_irqs_on(); | 604 | early_boot_irqs_on(); |
604 | local_irq_enable(); | 605 | local_irq_enable(); |
605 | 606 | ||