diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-03-23 12:05:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-23 12:05:13 +1000 |
| commit | 65d1086c44791112188f6aebbdc3a27cab3736d3 (patch) | |
| tree | f769c133e61c54e34e91aa9ecf1d3504a6eb4fb4 /kernel/workqueue.c | |
| parent | Merge tag 'drm-misc-next-2017-03-21' of git://anongit.freedesktop.org/git/drm... (diff) | |
| parent | Linux 4.11-rc3 (diff) | |
| download | linux-65d1086c44791112188f6aebbdc3a27cab3736d3.tar.gz linux-65d1086c44791112188f6aebbdc3a27cab3736d3.zip | |
BackMerge tag 'v4.11-rc3' into drm-next
Linux 4.11-rc3 as requested by Daniel
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 072cbc9b175d..c0168b7da1ea 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1507,6 +1507,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, struct timer_list *timer = &dwork->timer; struct work_struct *work = &dwork->work; + WARN_ON_ONCE(!wq); WARN_ON_ONCE(timer->function != delayed_work_timer_fn || timer->data != (unsigned long)dwork); WARN_ON_ONCE(timer_pending(timer)); |