Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336223
b: refs/heads/master
c: fc4b514
h: refs/heads/master
i:
  336221: 5484ac7
  336219: b2dd5c3
  336215: c0b850e
  336207: 469fd9e
  336191: 9c92247
v: v3
  • Loading branch information
Tejun Heo committed Dec 4, 2012
1 parent 5afa6d6 commit 7079864
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c1d390d8e6128b050f0f66b1c33d390760deb3f4
refs/heads/master: fc4b514f2727f74a4587c31db87e0e93465518c3
4 changes: 2 additions & 2 deletions trunk/kernel/workqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -1361,8 +1361,8 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,

WARN_ON_ONCE(timer->function != delayed_work_timer_fn ||
timer->data != (unsigned long)dwork);
BUG_ON(timer_pending(timer));
BUG_ON(!list_empty(&work->entry));
WARN_ON_ONCE(timer_pending(timer));
WARN_ON_ONCE(!list_empty(&work->entry));

/*
* If @delay is 0, queue @dwork->work immediately. This is for
Expand Down

0 comments on commit 7079864

Please sign in to comment.