Skip to contentSkip to conversation

sched/printk fixes

GIT PULL Ingo Molnar 1 participant 1 message Dec 8, 2010

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest sched-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus

Thanks,

Ingo

------------------>
Heiko Carstens (2):
printk: Fix wake_up_klogd() vs cpu hotplug
nohz: Fix printk_needs_cpu() return value on offline cpus

 kernel/printk.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
kernel/printk.c +3 -1
index 9a2264f..a23315d 100644
@@ -1082,13 +1082,15 @@ void printk_tick(void)
 
 int printk_needs_cpu(int cpu)
 {
+	if (unlikely(cpu_is_offline(cpu)))
+		printk_tick();
 	return per_cpu(printk_pending, cpu);
 }
 
 void wake_up_klogd(void)
 {
 	if (waitqueue_active(&log_wait))
-		__raw_get_cpu_var(printk_pending) = 1;
+		this_cpu_write(printk_pending, 1);
 }
 
 /**