summaryrefslogtreecommitdiffstats
path: root/include/linux/task_work.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-10-30 00:20:56 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-10-30 00:20:56 -0700
commit53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch)
tree9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/task_work.h
parenta6e8c0a25377e27958b11b20e1927885ae7c9857 (diff)
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff)
downloadcachepc-linux-53279f36dccffc26ff536003fd6bb97cc21c3b82.tar.gz
cachepc-linux-53279f36dccffc26ff536003fd6bb97cc21c3b82.zip
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/task_work.h')
-rw-r--r--include/linux/task_work.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/task_work.h b/include/linux/task_work.h
index fb46b03b1852..ca5a1cf27dae 100644
--- a/include/linux/task_work.h
+++ b/include/linux/task_work.h
@@ -18,8 +18,7 @@ void task_work_run(void);
static inline void exit_task_work(struct task_struct *task)
{
- if (unlikely(task->task_works))
- task_work_run();
+ task_work_run();
}
#endif /* _LINUX_TASK_WORK_H */