diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 17:56:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 17:56:39 -0700 |
commit | 4d831f53ddd5c0117ff40f841cf330c78d242e82 (patch) | |
tree | 29bca9f045f22af41a7a059afba85f5eb74ab267 /kernel/softirq.c | |
parent | 20d9207849d5abe60461841b3c3724f6e7c9d33e (diff) | |
parent | 79d381c9f2354b594dcab9b04dfcc0debf7294fe (diff) | |
download | op-kernel-dev-4d831f53ddd5c0117ff40f841cf330c78d242e82.zip op-kernel-dev-4d831f53ddd5c0117ff40f841cf330c78d242e82.tar.gz |
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/softirq.c: fix sparse warning
rcu: Make hierarchical RCU less IPI-happy
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 2fecefa..b525dd3 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -472,9 +472,9 @@ void tasklet_kill(struct tasklet_struct *t) printk("Attempt to kill tasklet from interrupt\n"); while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) { - do + do { yield(); - while (test_bit(TASKLET_STATE_SCHED, &t->state)); + } while (test_bit(TASKLET_STATE_SCHED, &t->state)); } tasklet_unlock_wait(t); clear_bit(TASKLET_STATE_SCHED, &t->state); |