diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
commit | dbbcfb2211761fa69e831a78119c9288fb87eb9d (patch) | |
tree | b40b103ed250e287bf3d4790f1c87001cf7cf52f /kernel/printk.c | |
parent | b0356cd0e7497252a2c45ecb07b79d931390c8b2 (diff) | |
parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
arch/x86/mm/ioremap.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r-- | kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 1fb1382009f3..625d240d7ada 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -670,7 +670,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu) | |||
670 | return retval; | 670 | return retval; |
671 | } | 671 | } |
672 | 672 | ||
673 | const char printk_recursion_bug_msg [] = | 673 | static const char printk_recursion_bug_msg [] = |
674 | KERN_CRIT "BUG: recent printk recursion!\n"; | 674 | KERN_CRIT "BUG: recent printk recursion!\n"; |
675 | static int printk_recursion_bug; | 675 | static int printk_recursion_bug; |
676 | 676 | ||