diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /kernel/printk.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
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 3a442bfb8bee..5092397fac29 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
| @@ -588,8 +588,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) | |||
| 588 | log_level_unknown = 1; | 588 | log_level_unknown = 1; |
| 589 | } | 589 | } |
| 590 | 590 | ||
| 591 | if (!cpu_online(smp_processor_id()) && | 591 | if (!cpu_online(smp_processor_id())) { |
| 592 | system_state != SYSTEM_RUNNING) { | ||
| 593 | /* | 592 | /* |
| 594 | * Some console drivers may assume that per-cpu resources have | 593 | * Some console drivers may assume that per-cpu resources have |
| 595 | * been allocated. So don't allow them to be called by this | 594 | * been allocated. So don't allow them to be called by this |