From 3ae4f154832576f507befe1afb95e61b56fcba58 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 7 Jun 2011 11:17:30 +0200 Subject: [PATCH] --- yaml --- r: 277189 b: refs/heads/master c: 1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1 h: refs/heads/master i: 277187: 09130414f38fdc8e0bc10cfd645b39158d169375 v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 089ea4b02fcf..965886cabf83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47ff5c95db598184122aa634fa3452c0eecea877 +refs/heads/master: 1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index ba5ee0435821..dfd8f73dcb76 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -842,7 +842,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) printk_delay(); /* This stops the holder of console_sem just where we want him */ - raw_local_irq_save(flags); + local_irq_save(flags); this_cpu = smp_processor_id(); /* @@ -962,7 +962,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) lockdep_on(); out_restore_irqs: - raw_local_irq_restore(flags); + local_irq_restore(flags); return printed_len; }