diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2009-04-29 19:14:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-30 02:08:31 -0400 |
commit | 6e85c5ba73c07b990798087e9b858c065db2b234 (patch) | |
tree | d3cfcdd1f8d779f65035a0f610ed13bda9b96d68 /kernel | |
parent | 314eeac9e35d8b934dd7a09ed3a8e00d41977b84 (diff) |
kernel/posix-cpu-timers.c: fix sparse warning
Sparse reports the following in kernel/posix-cpu-timers.c:
warning: symbol 'firing' shadows an earlier one
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Subrata Modak <subrata@linux.vnet.ibm.com>
LKML-Reference: <BD79186B4FD85F4B8E60E381CAEE1909016C1AFE@mi8nycmail19.Mi8.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/posix-cpu-timers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index c9dcf98b4463..bece7c0b67b2 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
@@ -1420,19 +1420,19 @@ void run_posix_cpu_timers(struct task_struct *tsk) | |||
1420 | * timer call will interfere. | 1420 | * timer call will interfere. |
1421 | */ | 1421 | */ |
1422 | list_for_each_entry_safe(timer, next, &firing, it.cpu.entry) { | 1422 | list_for_each_entry_safe(timer, next, &firing, it.cpu.entry) { |
1423 | int firing; | 1423 | int cpu_firing; |
1424 | |||
1424 | spin_lock(&timer->it_lock); | 1425 | spin_lock(&timer->it_lock); |
1425 | list_del_init(&timer->it.cpu.entry); | 1426 | list_del_init(&timer->it.cpu.entry); |
1426 | firing = timer->it.cpu.firing; | 1427 | cpu_firing = timer->it.cpu.firing; |
1427 | timer->it.cpu.firing = 0; | 1428 | timer->it.cpu.firing = 0; |
1428 | /* | 1429 | /* |
1429 | * The firing flag is -1 if we collided with a reset | 1430 | * The firing flag is -1 if we collided with a reset |
1430 | * of the timer, which already reported this | 1431 | * of the timer, which already reported this |
1431 | * almost-firing as an overrun. So don't generate an event. | 1432 | * almost-firing as an overrun. So don't generate an event. |
1432 | */ | 1433 | */ |
1433 | if (likely(firing >= 0)) { | 1434 | if (likely(cpu_firing >= 0)) |
1434 | cpu_timer_fire(timer); | 1435 | cpu_timer_fire(timer); |
1435 | } | ||
1436 | spin_unlock(&timer->it_lock); | 1436 | spin_unlock(&timer->it_lock); |
1437 | } | 1437 | } |
1438 | } | 1438 | } |