From 3645c48b3e77240c3d22c389ed7291e057b18f8d Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Thu, 6 Dec 2012 17:16:23 +0800 Subject: [PATCH] --- yaml --- r: 344387 b: refs/heads/master c: f0fcf2002bf122afe8fe1b74b2cee3710c7e6cd9 h: refs/heads/master i: 344385: 43870d15206d0b2d02a993c4ac27e508410b2b47 344383: 4dcb3c39f37b23f1a889fa858959d6d5569fad73 v: v3 --- [refs] | 2 +- trunk/kernel/padata.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3785efc0544c..fc2eb31f4b43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a465348ff5d3e564ae0bcde63d5ef2066c079aad +refs/heads/master: f0fcf2002bf122afe8fe1b74b2cee3710c7e6cd9 diff --git a/trunk/kernel/padata.c b/trunk/kernel/padata.c index 89fe3d1b9efb..072f4ee4eb89 100644 --- a/trunk/kernel/padata.c +++ b/trunk/kernel/padata.c @@ -171,7 +171,7 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd) { int cpu, num_cpus; unsigned int next_nr, next_index; - struct padata_parallel_queue *queue, *next_queue; + struct padata_parallel_queue *next_queue; struct padata_priv *padata; struct padata_list *reorder; @@ -204,8 +204,7 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd) goto out; } - queue = per_cpu_ptr(pd->pqueue, smp_processor_id()); - if (queue->cpu_index == next_queue->cpu_index) { + if (__this_cpu_read(pd->pqueue->cpu_index) == next_queue->cpu_index) { padata = ERR_PTR(-ENODATA); goto out; }