aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2008-12-08 17:13:02 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-08 17:20:38 +0100
commita0a99b227da57f81319dd239bc4de811b0f530ec (patch)
tree04f15a69f565f90c9f6fb27646921a82fa91a39d /kernel
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')
-rw-r--r--kernel/hrtimer.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b09c7a27631..b741f850426 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