diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-12 18:24:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-12 18:24:31 +1100 |
| commit | aa153371d542fd067eca01944bbaf9f70b6154ca (patch) | |
| tree | 7ef939dc641027c82e6e651c224c7e5344e33bec /kernel/printk.c | |
| parent | a44043634a621be09687928c0ff46140211724f4 (diff) | |
| parent | cc689b174bcd15b5d68eed83089b3851d3e69dc6 (diff) | |
Merge commit 'trivial/for-next'
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 f492f1583d77..fb1794405543 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -619,7 +619,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu) static const char recursion_bug_msg [] = KERN_CRIT "BUG: recent printk recursion!\n"; static int recursion_bug; - static int new_text_line = 1; +static int new_text_line = 1; static char printk_buf[1024]; asmlinkage int vprintk(const char *fmt, va_list args) |