diff --git a/[refs] b/[refs] index f017261336bd..fd21a53aaeb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ced9cd40ac14111befd6b0c73ec90106c22a3fd7 +refs/heads/master: fa33507a22623b3bd543b15a21c362cf364b6cff diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 655cc2ca10cc..57e9cd7a9581 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -1000,7 +1000,7 @@ int printk_needs_cpu(int cpu) void wake_up_klogd(void) { if (waitqueue_active(&log_wait)) - __get_cpu_var(printk_pending) = 1; + __raw_get_cpu_var(printk_pending) = 1; } /**