summaryrefslogtreecommitdiffstats
path: root/kernel/task_work.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 13:04:34 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 13:04:34 +0800
commitfc600432cd23e35c85de2ff4468d816d6938a112 (patch)
treec191c51e4458ec31c1d8254f01e23b2e1574b6f4 /kernel/task_work.c
parentdb61550931957ee6c7dba751662919424b4344f3 (diff)
parent4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff)
Merge tag 'v3.6-rc4' into asoc-omap
Linux 3.6-rc4
Diffstat (limited to 'kernel/task_work.c')
-rw-r--r--kernel/task_work.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 91d4e1742a0..d320d44903b 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
@@ -75,6 +75,7 @@ void task_work_run(void)
p = q->next;
q->func(q);
q = p;
+ cond_resched();
}
}
}