From d24074b9b0f9d24de5242206441eb0ecc3a69ff4 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 8 Dec 2008 17:13:02 +0100 Subject: [PATCH] --- yaml --- r: 123235 b: refs/heads/master c: a0a99b227da57f81319dd239bc4de811b0f530ec h: refs/heads/master i: 123233: f13c8dc832fb9f3701ce318cede251545e09a758 123231: d0efed44ccf7e2aa0c493e06889e1ab11c615426 v: v3 --- [refs] | 2 +- trunk/kernel/hrtimer.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 38c194ec961c..29da89062317 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37810659ea7d9572c5ac284ade272f806ef8f788 +refs/heads/master: a0a99b227da57f81319dd239bc4de811b0f530ec diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index b09c7a27631d..b741f850426e 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/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