diff --git a/[refs] b/[refs]
index 548e1502e195..7e3f4b3edb53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48fc267ee6f34f67db42a49f386fdd367cac6f8a
+refs/heads/master: 57a2ce5f54f3120467be760662c6ef3bea3f9579
diff --git a/trunk/include/linux/padata.h b/trunk/include/linux/padata.h
index bdcd1e9eacea..4633b2f726b6 100644
--- a/trunk/include/linux/padata.h
+++ b/trunk/include/linux/padata.h
@@ -127,8 +127,8 @@ struct padata_cpumask {
  */
 struct parallel_data {
 	struct padata_instance		*pinst;
-	struct padata_parallel_queue	*pqueue;
-	struct padata_serial_queue	*squeue;
+	struct padata_parallel_queue	__percpu *pqueue;
+	struct padata_serial_queue	__percpu *squeue;
 	atomic_t			seq_nr;
 	atomic_t			reorder_objects;
 	atomic_t			refcnt;