diff --git a/[refs] b/[refs] index d302a8e7317e..b8f3d8d29145 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac60ad7413ca8208094609a3b88ed9b1ed012fbc +refs/heads/master: 091593080533a752ce66d12858d8c4105c8e1793 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 98ca1b76277f..475fc22a2857 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -661,6 +661,7 @@ static char printk_buf[1024]; asmlinkage int vprintk(const char *fmt, va_list args) { int printed_len = 0; + int current_log_level = default_message_loglevel; unsigned long flags; int this_cpu; char *p; @@ -710,7 +711,6 @@ asmlinkage int vprintk(const char *fmt, va_list args) */ for (p = printk_buf; *p; p++) { if (new_text_line) { - int current_log_level = default_message_loglevel; /* If a token, set current_log_level and skip over */ if (p[0] == '<' && p[1] >= '0' && p[1] <= '7' && p[2] == '>') {