---

yaml
---
r: 144623
b: refs/heads/master
c: 6e85c5b
h: refs/heads/master
i:
  144621: 9bccd01
  144619: 2e81b4f
  144615: ae1b810
  144607: 075269d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 314eeac9e35d8b934dd7a09ed3a8e00d41977b84
+refs/heads/master: 6e85c5ba73c07b990798087e9b858c065db2b234

trunk/kernel/posix-cpu-timers.c

@@ -1420,19 +1420,19 @@ void run_posix_cpu_timers(struct task_struct *tsk)
 	 * timer call will interfere.
 	 */
 	list_for_each_entry_safe(timer, next, &firing, it.cpu.entry) {
-		int firing;
+		int cpu_firing;
+
 		spin_lock(&timer->it_lock);
 		list_del_init(&timer->it.cpu.entry);
-		firing = timer->it.cpu.firing;
+		cpu_firing = timer->it.cpu.firing;
 		timer->it.cpu.firing = 0;
 		/*
 		 * The firing flag is -1 if we collided with a reset
 		 * of the timer, which already reported this
 		 * almost-firing as an overrun.  So don't generate an event.
 		 */
-		if (likely(firing >= 0)) {
+		if (likely(cpu_firing >= 0))
 			cpu_timer_fire(timer);
-		}
 		spin_unlock(&timer->it_lock);
 	}
 }