2009-04-29 23:14:48

by Hartley Sweeten

Subject: [PATCH] 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 <[email protected]>
Cc: Subrata Modak <[email protected]>

---

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index c9dcf98..88f24ab 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1420,17 +1420,17 @@ 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);

2009-04-30 06:25:41

by Hartley Sweeten

Subject: [tip:core/urgent] kernel/posix-cpu-timers.c: fix sparse warning

Commit-ID: 6e85c5ba73c07b990798087e9b858c065db2b234
Gitweb: http://git.kernel.org/tip/6e85c5ba73c07b990798087e9b858c065db2b234
Author: H Hartley Sweeten <[email protected]>
AuthorDate: Wed, 29 Apr 2009 19:14:32 -0400
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 30 Apr 2009 08:08:31 +0200

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 <[email protected]>
Cc: Subrata Modak <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
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 c9dcf98..bece7c0 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)
* 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);
}
}