From cfeb37b143869f66ab00e7c8eb767c22f04430a2 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 19 Dec 2008 00:48:27 +0100
Subject: [PATCH] --- yaml --- r: 123236 b: refs/heads/master c:
 b2e3c0adec918ea22b6c9d7c76193dd3aaba9bd4 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 29da89062317..d3753ae277d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0a99b227da57f81319dd239bc4de811b0f530ec
+refs/heads/master: b2e3c0adec918ea22b6c9d7c76193dd3aaba9bd4
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index b741f850426e..bda9cb924276 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, scpu = (long)hcpu;
+	int scpu = (long)hcpu;
 
 	switch (action) {
 
@@ -1583,10 +1583,14 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
 #ifdef CONFIG_HOTPLUG_CPU
 	case CPU_DEAD:
 	case CPU_DEAD_FROZEN:
+	{
+		int dcpu;
+
 		clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu);
 		dcpu = migrate_hrtimers(scpu);
 		smp_call_function_single(dcpu, tickle_timers, NULL, 0);
 		break;
+	}
 #endif
 
 	default: