Merge branch 'linux-2.6'

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index c9f4f044a8a8..23c03f43e196 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1411,11 +1411,13 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
         switch (action) {
 
         case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
                 init_hrtimers_cpu(cpu);
                 break;
 
 #ifdef CONFIG_HOTPLUG_CPU
         case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
                 clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &cpu);
                 migrate_hrtimers(cpu);
                 break;