aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/hrtimer.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2008-12-08 11:13:02 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-08 11:20:38 -0500
commita0a99b227da57f81319dd239bc4de811b0f530ec (patch)
tree04f15a69f565f90c9f6fb27646921a82fa91a39d /kernel/hrtimer.c
parent37810659ea7d9572c5ac284ade272f806ef8f788 (diff)
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>
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r--kernel/hrtimer.c8
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)
1571static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, 1571static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
1572 unsigned long action, void *hcpu) 1572 unsigned long action, void *hcpu)
1573{ 1573{
1574 int dcpu = -1, scpu = (long)hcpu; 1574 int dcpu, scpu = (long)hcpu;
1575 1575
1576 switch (action) { 1576 switch (action) {
1577 1577
@@ -1585,12 +1585,6 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
1585 case CPU_DEAD_FROZEN: 1585 case CPU_DEAD_FROZEN:
1586 clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu); 1586 clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu);
1587 dcpu = migrate_hrtimers(scpu); 1587 dcpu = migrate_hrtimers(scpu);
1588 break;
1589
1590 case CPU_POST_DEAD:
1591 if (dcpu == -1)
1592 break;
1593
1594 smp_call_function_single(dcpu, tickle_timers, NULL, 0); 1588 smp_call_function_single(dcpu, tickle_timers, NULL, 0);
1595 break; 1589 break;
1596#endif 1590#endif