Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on on a handful of tracing fixes present in .30-rc5-almost. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user