X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fpadata.c;h=072f4ee4eb893a5341942146775c2ce9fcc1dbc8;hb=5b37649bbcfc14c1ecfb76c5b018dd686924b946;hp=89fe3d1b9efbc1f34351e5752dd730db3c5bbab4;hpb=905cec410a8b0ff3afb1845d6fe7215e0259b717;p=~andy%2Flinux

diff --git a/kernel/padata.c b/kernel/padata.c
index 89fe3d1b9ef..072f4ee4eb8 100644
--- a/kernel/padata.c
+++ b/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;
 	}