Skip to contentSkip to conversation

percpu: add missing markups in kernel/workqueue.c

PATCH In review Namhyung Kim 2 participants 4 messages Aug 6, 2010 – Aug 8, 2010 Workqueue

lore
Share & tools
lore
#0 lore raw

PATCH 3/5 percpu: add missing markups in kernel/workqueue.c

---
 kernel/workqueue.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/workqueue.c +2 -2
index 327d2de..bb030e3 100644
@@ -57,7 +57,7 @@ struct cpu_workqueue_struct {
  * per-CPU workqueues:
  */
 struct workqueue_struct {
-	struct cpu_workqueue_struct *cpu_wq;
+	struct cpu_workqueue_struct __percpu *cpu_wq;
 	struct list_head list;
 	const char *name;
 	int singlethread;
@@ -821,7 +821,7 @@ int schedule_on_each_cpu(work_func_t func)
 {
 	int cpu;
 	int orig = -1;
-	struct work_struct *works;
+	struct work_struct __percpu *works;
 
 	works = alloc_percpu(struct work_struct);
 	if (!works)
Signature · 1 line
1.7.0.4
maintainer
#1 lore raw
Quoted 19 lines · Namhyung Kim
---
 kernel/workqueue.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/workqueue.c +1 -1
index 327d2de..bb030e3 100644
@@ -57,7 +57,7 @@ struct cpu_workqueue_struct {
  * per-CPU workqueues:
  */
 struct workqueue_struct {
-	struct cpu_workqueue_struct *cpu_wq;
+	struct cpu_workqueue_struct __percpu *cpu_wq;
 	struct list_head list;
 	const char *name;
 	int singlethread;

kernel/workqueue.c int schedule_on_each_cpu(work_func_t func) · line 827

Quoted 8 lines
kernel/workqueue.c +1 -1
@@ -821,7 +821,7 @@ int schedule_on_each_cpu(work_func_t func)
 {
 	int cpu;
 	int orig = -1;
-	struct work_struct *works;
+	struct work_struct __percpu *works;
 
 	works = alloc_percpu(struct work_struct);
 	if (!works)

Can you please redo this patch against the following git tree?

git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-linus

Thanks.

Signature · 1 line
tejun
#2 lore raw

PATCH 1/1 workqueue: add missing __percpu markup in kernel/workqueue.c

works is a percpu pointer but was missing __percpu markup. Add it.

---
 kernel/workqueue.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/workqueue.c +1 -1
index e2eb351..334a9e0 100644
@@ -2553,7 +2553,7 @@ EXPORT_SYMBOL(schedule_delayed_work_on);
 int schedule_on_each_cpu(work_func_t func)
 {
 	int cpu;
-	struct work_struct *works;
+	struct work_struct __percpu *works;
 
 	works = alloc_percpu(struct work_struct);
 	if (!works)
Signature · 1 line
1.7.0.4
maintainer Applied
#3 lore raw

Re: [PATCH] workqueue: add missing __percpu markup in kernel/workqueue.c

Quoted 4 lines · Namhyung Kim

works is a percpu pointer but was missing __percpu markup. Add it.

Applied to wq#for-linus. Thanks.

Signature · 1 line
tejun