Merge branch 'linus' into tracing/core

[linux-2.6-block.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index d4ba347a872d99a81c4156ac96e7823353add867..dc4d0cfdcb2d66a851f83eb09ab16775af5ea3a0 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -471,9 +471,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);