diff --git a/[refs] b/[refs] index 1cb368d94bb1..8f2ff1140480 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ef097dd7ba4eab8b4f0026d85fcef9fe23b821f +refs/heads/master: cea83886dde49fd7524e9f4a246dd5dff4ad236a diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 40674122ecf2..75077ad0b537 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -70,8 +70,6 @@ int console_printk[4] = { DEFAULT_CONSOLE_LOGLEVEL, /* default_console_loglevel */ }; -static int saved_console_loglevel = -1; - /* * Low level drivers may need that to know if they can schedule in * their unblank() callback or not. So let's export it. @@ -146,6 +144,7 @@ static char __log_buf[__LOG_BUF_LEN]; static char *log_buf = __log_buf; static int log_buf_len = __LOG_BUF_LEN; static unsigned logged_chars; /* Number of chars produced since last read+clear operation */ +static int saved_console_loglevel = -1; #ifdef CONFIG_KEXEC /*