hrtimer: removing all ur callback modes, fix

> Ingo, this addition fixes the hotplug issue on my machine

And because we're all human...

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 7 deletions

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b09c7a27631d..b741f850426e 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1571,7 +1571,7 @@ static void tickle_timers(void *arg)
 static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
                                         unsigned long action, void *hcpu)
 {
-        int dcpu = -1, scpu = (long)hcpu;
+        int dcpu, scpu = (long)hcpu;
 
         switch (action) {
 
@@ -1585,12 +1585,6 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
         case CPU_DEAD_FROZEN:
                 clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu);
                 dcpu = migrate_hrtimers(scpu);
-                break;
-
-        case CPU_POST_DEAD:
-                if (dcpu == -1)
-                        break;
-
                 smp_call_function_single(dcpu, tickle_timers, NULL, 0);
                 break;
 #endif