diff --git a/[refs] b/[refs] index c993b5143820..9d9bee0b1d7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d783b3e02002bce8cf9d4e4a82922ee7e59b1e5 +refs/heads/master: ac25575203c11145066ea5cb583354cb5f0a8ade diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 3a442bfb8bee..5092397fac29 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -588,8 +588,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) log_level_unknown = 1; } - if (!cpu_online(smp_processor_id()) && - system_state != SYSTEM_RUNNING) { + if (!cpu_online(smp_processor_id())) { /* * Some console drivers may assume that per-cpu resources have * been allocated. So don't allow them to be called by this