Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14720
b: refs/heads/master
c: bce61dd
h: refs/heads/master
v: v3
  • Loading branch information
Ben Collins authored and Linus Torvalds committed Nov 28, 2005
1 parent 029f646 commit ab32a4e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: ee500f274914653a7d3dfca7d0140a3d21658e32
refs/heads/master: bce61dd49d6ba7799be2de17c772e4c701558f14
12 changes: 6 additions & 6 deletions trunk/kernel/workqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ int fastcall queue_work(struct workqueue_struct *wq, struct work_struct *work)

if (!test_and_set_bit(0, &work->pending)) {
if (unlikely(is_single_threaded(wq)))
cpu = 0;
cpu = any_online_cpu(cpu_online_map);
BUG_ON(!list_empty(&work->entry));
__queue_work(per_cpu_ptr(wq->cpu_wq, cpu), work);
ret = 1;
Expand All @@ -118,7 +118,7 @@ static void delayed_work_timer_fn(unsigned long __data)
int cpu = smp_processor_id();

if (unlikely(is_single_threaded(wq)))
cpu = 0;
cpu = any_online_cpu(cpu_online_map);

__queue_work(per_cpu_ptr(wq->cpu_wq, cpu), work);
}
Expand Down Expand Up @@ -266,8 +266,8 @@ void fastcall flush_workqueue(struct workqueue_struct *wq)
might_sleep();

if (is_single_threaded(wq)) {
/* Always use cpu 0's area. */
flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, 0));
/* Always use first cpu's area. */
flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, any_online_cpu(cpu_online_map)));
} else {
int cpu;

Expand Down Expand Up @@ -320,7 +320,7 @@ struct workqueue_struct *__create_workqueue(const char *name,
lock_cpu_hotplug();
if (singlethread) {
INIT_LIST_HEAD(&wq->list);
p = create_workqueue_thread(wq, 0);
p = create_workqueue_thread(wq, any_online_cpu(cpu_online_map));
if (!p)
destroy = 1;
else
Expand Down Expand Up @@ -374,7 +374,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
/* We don't need the distraction of CPUs appearing and vanishing. */
lock_cpu_hotplug();
if (is_single_threaded(wq))
cleanup_workqueue_thread(wq, 0);
cleanup_workqueue_thread(wq, any_online_cpu(cpu_online_map));
else {
for_each_online_cpu(cpu)
cleanup_workqueue_thread(wq, cpu);
Expand Down

0 comments on commit ab32a4e

Please sign in to comment.