---

yaml --- r: 344387 b: refs/heads/master c: f0fcf20 h: refs/heads/master i: 344385: 43870d1 344383: 4dcb3c3 v: v3
git-mirror · Dec 6, 2012 · 3645c48 · 3645c48
1 parent d26931d
commit 3645c48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;
 	}