diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 12:08:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 12:08:20 -0700 |
commit | da87bbd14299ef43848742c44dfe05fa1da5a21f (patch) | |
tree | ac28a7cf89fbcad8cc18f71c041c520d216ec091 /kernel | |
parent | e91b3b2681148371d84b9cdf4cab6f9de0522544 (diff) | |
parent | 6e85c5ba73c07b990798087e9b858c065db2b234 (diff) | |
download | kernel_samsung_smdk4412-da87bbd14299ef43848742c44dfe05fa1da5a21f.zip kernel_samsung_smdk4412-da87bbd14299ef43848742c44dfe05fa1da5a21f.tar.gz kernel_samsung_smdk4412-da87bbd14299ef43848742c44dfe05fa1da5a21f.tar.bz2 |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kernel/posix-cpu-timers.c: fix sparse warning
dma-debug: remove broken dma memory leak detection for 2.6.30
locking: Documentation: lockdep-design.txt, fix note of state bits
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 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); } } |