aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorJeremy Erickson <jerickso@cs.unc.edu>2014-04-11 13:24:45 -0400
committerJeremy Erickson <jerickso@cs.unc.edu>2014-04-11 13:24:45 -0400
commit438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch)
tree76941991e36f4a32bf1be0db3854959053f24619 /kernel/printk.c
parent9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff)
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 9dc8ea140426..2dc36b49d2d2 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1072,13 +1072,15 @@ void printk_tick(void)
1072 1072
1073int printk_needs_cpu(int cpu) 1073int printk_needs_cpu(int cpu)
1074{ 1074{
1075 if (unlikely(cpu_is_offline(cpu)))
1076 printk_tick();
1075 return per_cpu(printk_pending, cpu); 1077 return per_cpu(printk_pending, cpu);
1076} 1078}
1077 1079
1078void wake_up_klogd(void) 1080void wake_up_klogd(void)
1079{ 1081{
1080 if (!trace_override && waitqueue_active(&log_wait)) 1082 if (!trace_override && waitqueue_active(&log_wait))
1081 __raw_get_cpu_var(printk_pending) = 1; 1083 this_cpu_write(printk_pending, 1);
1082} 1084}
1083 1085
1084/** 1086/**