X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=kernel%2Fhrtimer.c;h=23c03f43e1962d6f0dfa4cb8a716080cf671a48c;hb=f744a0547ac5055a3e9eb20bfe7ff29077a32c16;hp=c9f4f044a8a8f032e203c2bb81fb73fa1c98c212;hpb=393bfca19ecdce60a8d9a4d2577cac11ca924a25;p=mv-sheeva.git

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index c9f4f044a8a..23c03f43e19 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;