diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-25 18:16:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-25 18:16:26 +0000 |
| commit | 0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f (patch) | |
| tree | b6597ffe774a67ab5b8eebd57c9a723732d3a39c /kernel/workqueue_internal.h | |
| parent | 3bb0f7c31b1aedd0f85c675297031281799145d7 (diff) | |
| parent | 93a00c467fe998bf5716cbc9cabc127046054782 (diff) | |
| download | linux-0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f.tar.gz linux-0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f.tar.bz2 linux-0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f.zip | |
Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-twl-breakage
Diffstat (limited to 'kernel/workqueue_internal.h')
| -rw-r--r-- | kernel/workqueue_internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h index efdd72e15794..d390d1be3748 100644 --- a/kernel/workqueue_internal.h +++ b/kernel/workqueue_internal.h @@ -10,6 +10,7 @@ #include <linux/workqueue.h> #include <linux/kthread.h> +#include <linux/preempt.h> struct worker_pool; @@ -60,7 +61,7 @@ struct worker { */ static inline struct worker *current_wq_worker(void) { - if (current->flags & PF_WQ_WORKER) + if (in_task() && (current->flags & PF_WQ_WORKER)) return kthread_data(current); return NULL; } |