From a8fd7a8806a12327129203fa75fce8914cb2d803 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 26 May 2010 16:07:13 +0200
Subject: [PATCH] --- yaml --- r: 199186 b: refs/heads/master c:
 2abfb9e1d470f7082e5e20e4b11a271a0124211b h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/timer.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3dda6e4225eb..94b62f45b08c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e63d7795e30b4091e303cc8c060509bd8eea742
+refs/heads/master: 2abfb9e1d470f7082e5e20e4b11a271a0124211b
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index d8decb8d46b0..22118342a456 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -747,7 +747,7 @@ EXPORT_SYMBOL(mod_timer_pending);
 static inline
 unsigned long apply_slack(struct timer_list *timer, unsigned long expires)
 {
-	unsigned long expires_limit, mask, now;
+	unsigned long expires_limit, mask;
 	int bit;
 
 	expires_limit = expires;
@@ -755,7 +755,8 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires)
 	if (timer->slack >= 0) {
 		expires_limit = expires + timer->slack;
 	} else {
-		now = jiffies;
+		unsigned long now = jiffies;
+
 		/* No slack, if already expired else auto slack 0.4% */
 		if (time_after(expires, now))
 			expires_limit = expires + (expires - now)/256;