diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 22:19:40 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 22:19:40 +0100 |
commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /kernel/printk.c | |
parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
download | kernel_goldelico_gta04-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.zip kernel_goldelico_gta04-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.tar.gz kernel_goldelico_gta04-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.tar.bz2 |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'kernel/printk.c')
-rw-r--r-- | kernel/printk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 3a442bf..5092397 100644 --- a/kernel/printk.c +++ b/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 |