From 38a25e6a1b7dea8f5d9b61951f795f7a1a2de6fa Mon Sep 17 00:00:00 2001 From: Steffen Klassert Date: Fri, 9 Mar 2012 07:20:12 +0100 Subject: [PATCH] --- yaml --- r: 292267 b: refs/heads/master c: 3047817b894ddae62be07787bc8735a616104398 h: refs/heads/master i: 292265: abfb5e6a239598bf230fe04bb3ae17ff9ce5a663 292263: 7f0ac33226ce95d283700c424ea3151010aaa885 v: v3 --- [refs] | 2 +- trunk/kernel/padata.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6a5f6e05fd87..c4668a7faec1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b95ec56ae19f61ca664e83766a2180057f0e351 +refs/heads/master: 3047817b894ddae62be07787bc8735a616104398 diff --git a/trunk/kernel/padata.c b/trunk/kernel/padata.c index b45259931512..aa9929545855 100644 --- a/trunk/kernel/padata.c +++ b/trunk/kernel/padata.c @@ -230,6 +230,7 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd) static void padata_reorder(struct parallel_data *pd) { + int cb_cpu; struct padata_priv *padata; struct padata_serial_queue *squeue; struct padata_instance *pinst = pd->pinst; @@ -270,13 +271,14 @@ static void padata_reorder(struct parallel_data *pd) return; } - squeue = per_cpu_ptr(pd->squeue, padata->cb_cpu); + cb_cpu = padata->cb_cpu; + squeue = per_cpu_ptr(pd->squeue, cb_cpu); spin_lock(&squeue->serial.lock); list_add_tail(&padata->list, &squeue->serial.list); spin_unlock(&squeue->serial.lock); - queue_work_on(padata->cb_cpu, pinst->wq, &squeue->work); + queue_work_on(cb_cpu, pinst->wq, &squeue->work); } spin_unlock_bh(&pd->lock);