Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux.git] / kernel / padata.c

diff --git a/kernel/padata.c b/kernel/padata.c
index 832224dcf2e121a06fbab8c68af7cbafb14885b9..c3fec1413295bb142305d501fd83f694204c8f00 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -400,21 +400,12 @@ static void padata_init_squeues(struct parallel_data *pd)
 /* Initialize all percpu queues used by parallel workers */
 static void padata_init_pqueues(struct parallel_data *pd)
 {
-       int cpu_index, cpu;
+       int cpu;
        struct padata_parallel_queue *pqueue;
 
-       cpu_index = 0;
-       for_each_possible_cpu(cpu) {
+       for_each_cpu(cpu, pd->cpumask.pcpu) {
                pqueue = per_cpu_ptr(pd->pqueue, cpu);
 
-               if (!cpumask_test_cpu(cpu, pd->cpumask.pcpu)) {
-                       pqueue->cpu_index = -1;
-                       continue;
-               }
-
-               pqueue->cpu_index = cpu_index;
-               cpu_index++;
-
                __padata_list_init(&pqueue->reorder);
                __padata_list_init(&pqueue->parallel);
                INIT_WORK(&pqueue->work, padata_parallel_worker);