diff options
-rw-r--r-- | kernel/printk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 4da26b067976..0c151877ff71 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -529,7 +529,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) | |||
529 | zap_locks(); | 529 | zap_locks(); |
530 | 530 | ||
531 | /* This stops the holder of console_sem just where we want him */ | 531 | /* This stops the holder of console_sem just where we want him */ |
532 | local_irq_save(flags); | 532 | raw_local_irq_save(flags); |
533 | lockdep_off(); | 533 | lockdep_off(); |
534 | spin_lock(&logbuf_lock); | 534 | spin_lock(&logbuf_lock); |
535 | printk_cpu = smp_processor_id(); | 535 | printk_cpu = smp_processor_id(); |
@@ -618,7 +618,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) | |||
618 | up(&console_sem); | 618 | up(&console_sem); |
619 | } | 619 | } |
620 | lockdep_on(); | 620 | lockdep_on(); |
621 | local_irq_restore(flags); | 621 | raw_local_irq_restore(flags); |
622 | } else { | 622 | } else { |
623 | /* | 623 | /* |
624 | * Someone else owns the drivers. We drop the spinlock, which | 624 | * Someone else owns the drivers. We drop the spinlock, which |
@@ -628,7 +628,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) | |||
628 | printk_cpu = UINT_MAX; | 628 | printk_cpu = UINT_MAX; |
629 | spin_unlock(&logbuf_lock); | 629 | spin_unlock(&logbuf_lock); |
630 | lockdep_on(); | 630 | lockdep_on(); |
631 | local_irq_restore(flags); | 631 | raw_local_irq_restore(flags); |
632 | } | 632 | } |
633 | 633 | ||
634 | preempt_enable(); | 634 | preempt_enable(); |