---

yaml --- r: 123235 b: refs/heads/master c: a0a99b2 h: refs/heads/master i: 123233: f13c8dc 123231: d0efed4 v: v3
git-mirror · Dec 8, 2008 · d24074b · d24074b
1 parent 3df34b6
commit d24074b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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