Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232136
b: refs/heads/master
c: 42c025f
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo committed Jan 11, 2011
1 parent cfe4736 commit cdbd7f0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: e159489baa717dbae70f9903770a6a4990865887
refs/heads/master: 42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf
6 changes: 5 additions & 1 deletion trunk/kernel/workqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,11 @@ static inline void worker_clr_flags(struct worker *worker, unsigned int flags)

worker->flags &= ~flags;

/* if transitioning out of NOT_RUNNING, increment nr_running */
/*
* If transitioning out of NOT_RUNNING, increment nr_running. Note
* that the nested NOT_RUNNING is not a noop. NOT_RUNNING is mask
* of multiple flags, not a single flag.
*/
if ((flags & WORKER_NOT_RUNNING) && (oflags & WORKER_NOT_RUNNING))
if (!(worker->flags & WORKER_NOT_RUNNING))
atomic_inc(get_gcwq_nr_running(gcwq->cpu));
Expand Down

0 comments on commit cdbd7f0

Please sign in to comment.