diff --git a/[refs] b/[refs] index 085446f670f3..fe20c6d44de8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75fa29c7000924060677e0591368045576daad93 +refs/heads/master: 85eae82a0855d49852b87deac8653e4ebc8b291f diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 66a2ea37b576..2d607f4d1797 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -1890,7 +1890,6 @@ static int __cpuinit console_cpu_notify(struct notifier_block *self, switch (action) { case CPU_ONLINE: case CPU_DEAD: - case CPU_DYING: case CPU_DOWN_FAILED: case CPU_UP_CANCELED: console_lock();