Remove XXX_FROZEN state from kernel/timer.
Signed-off-by: Chen, Gong <gong.c...@linux.intel.com>
---
kernel/timer.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/timer.c b/kernel/timer.c
index 3bb01a3..cc11324 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1642,16 +1642,14 @@ static int timer_cpu_notify(struct notifier_block *self,
long cpu = (long)hcpu;
int err;
- switch(action) {
+ switch (action & ~CPU_TASKS_FROZEN) {
case CPU_UP_PREPARE:
- case CPU_UP_PREPARE_FROZEN:
err = init_timers_cpu(cpu);
if (err < 0)
return notifier_from_errno(err);
break;
#ifdef CONFIG_HOTPLUG_CPU
case CPU_DEAD:
- case CPU_DEAD_FROZEN:
migrate_timers(cpu);
break;
#endif
--
2.0.0.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
