padata: purge get_cpu and reorder_via_wq from padata_do_serial

With the removal of the padata timer, padata_do_serial no longer
needs special CPU handling, so remove it.

Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 3 insertions, 20 deletions

diff --git a/kernel/padata.c b/kernel/padata.c
index fbafca18597f..7372fb45eeeb 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -316,24 +316,9 @@ static void padata_serial_worker(struct work_struct *serial_work)
  */
 void padata_do_serial(struct padata_priv *padata)
 {
-        int cpu;
-        struct padata_parallel_queue *pqueue;
-        struct parallel_data *pd;
-        int reorder_via_wq = 0;
-
-        pd = padata->pd;
-
-        cpu = get_cpu();
-
-        /* We need to enqueue the padata object into the correct
-         * per-cpu queue.
-         */
-        if (cpu != padata->cpu) {
-                reorder_via_wq = 1;
-                cpu = padata->cpu;
-        }
-
-        pqueue = per_cpu_ptr(pd->pqueue, cpu);
+        struct parallel_data *pd = padata->pd;
+        struct padata_parallel_queue *pqueue = per_cpu_ptr(pd->pqueue,
+                                                           padata->cpu);
 
         spin_lock(&pqueue->reorder.lock);
         list_add_tail(&padata->list, &pqueue->reorder.list);
@@ -347,8 +332,6 @@ void padata_do_serial(struct padata_priv *padata)
          */
         smp_mb__after_atomic();
 
-        put_cpu();
-
         padata_reorder(pd);
 }
 EXPORT_SYMBOL(padata_do_serial);