---

yaml --- r: 199186 b: refs/heads/master c: 2abfb9e h: refs/heads/master v: v3
git-mirror · May 26, 2010 · a8fd7a8 · a8fd7a8
1 parent 0e8825c
commit a8fd7a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -747,15 +747,16 @@ 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;
 
 	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;