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>
This commit is contained in:
Peter Zijlstra 2008-12-08 17:13:02 +01:00 committed by Ingo Molnar
parent 37810659ea
commit a0a99b227d

View file

@ -1571,7 +1571,7 @@ static void tickle_timers(void *arg)
static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {
int dcpu = -1, scpu = (long)hcpu; int dcpu, scpu = (long)hcpu;
switch (action) { switch (action) {
@ -1585,12 +1585,6 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
case CPU_DEAD_FROZEN: case CPU_DEAD_FROZEN:
clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu); clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu);
dcpu = migrate_hrtimers(scpu); dcpu = migrate_hrtimers(scpu);
break;
case CPU_POST_DEAD:
if (dcpu == -1)
break;
smp_call_function_single(dcpu, tickle_timers, NULL, 0); smp_call_function_single(dcpu, tickle_timers, NULL, 0);
break; break;
#endif #endif