From ee9cf50f7a424a4ddd3bbe5c9a1259737d45f605 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Tue, 27 Jul 2010 07:14:28 +0200
Subject: [PATCH] --- yaml --- r: 204359 b: refs/heads/master c:
 e6cc11707661770ca2bd4db4b0256d28f48e7541 h: refs/heads/master i:   204357:
 67fe52c85a36d9b2309d3a86a37f466d5ebdef7d   204355:
 46db29f8f4ea7c4a9f45d7f3e4d82adaf74645bc   204351:
 6ac4f39c05ee7bef201b3593ac8feb4faa553f5a v: v3

---
 [refs]                       |  2 +-
 trunk/crypto/pcrypt.c        |  2 +-
 trunk/include/linux/padata.h |  9 +++++----
 trunk/kernel/padata.c        | 24 ++++++++++++------------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 8a5f3bc69089..e8003fc4bdcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc74f4bc111e9554bcd6445ad0fe1d90e5d2eb34
+refs/heads/master: e6cc11707661770ca2bd4db4b0256d28f48e7541
diff --git a/trunk/crypto/pcrypt.c b/trunk/crypto/pcrypt.c
index 794c172b99f7..55460839624e 100644
--- a/trunk/crypto/pcrypt.c
+++ b/trunk/crypto/pcrypt.c
@@ -457,7 +457,7 @@ static int __pcrypt_init_instance(struct pcrypt_instance *pcrypt,
 	if (!pcrypt->wq)
 		goto err;
 
-	pcrypt->pinst = padata_alloc(pcrypt->wq);
+	pcrypt->pinst = padata_alloc_possible(pcrypt->wq);
 	if (!pcrypt->pinst)
 		goto err_destroy_workqueue;
 
diff --git a/trunk/include/linux/padata.h b/trunk/include/linux/padata.h
index 293ad46ffced..71dfc9d1f856 100644
--- a/trunk/include/linux/padata.h
+++ b/trunk/include/linux/padata.h
@@ -165,10 +165,11 @@ struct padata_instance {
 #define	PADATA_INVALID	4
 };
 
-extern struct padata_instance *padata_alloc(struct workqueue_struct *wq);
-extern struct padata_instance *__padata_alloc(struct workqueue_struct *wq,
-					      const struct cpumask *pcpumask,
-					      const struct cpumask *cbcpumask);
+extern struct padata_instance *padata_alloc_possible(
+					struct workqueue_struct *wq);
+extern struct padata_instance *padata_alloc(struct workqueue_struct *wq,
+					    const struct cpumask *pcpumask,
+					    const struct cpumask *cbcpumask);
 extern void padata_free(struct padata_instance *pinst);
 extern int padata_do_parallel(struct padata_instance *pinst,
 			      struct padata_priv *padata, int cb_cpu);
diff --git a/trunk/kernel/padata.c b/trunk/kernel/padata.c
index 7f895e2b4efb..12860bce6b78 100644
--- a/trunk/kernel/padata.c
+++ b/trunk/kernel/padata.c
@@ -1060,29 +1060,29 @@ static struct kobj_type padata_attr_type = {
 };
 
 /**
- * padata_alloc - Allocate and initialize padata instance.
- *                Use default cpumask(cpu_possible_mask)
- *                for serial and parallel workes.
+ * padata_alloc_possible - Allocate and initialize padata instance.
+ *                         Use the cpu_possible_mask for serial and
+ *                         parallel workers.
  *
  * @wq: workqueue to use for the allocated padata instance
  */
-struct padata_instance *padata_alloc(struct workqueue_struct *wq)
+struct padata_instance *padata_alloc_possible(struct workqueue_struct *wq)
 {
-	return __padata_alloc(wq, cpu_possible_mask, cpu_possible_mask);
+	return padata_alloc(wq, cpu_possible_mask, cpu_possible_mask);
 }
-EXPORT_SYMBOL(padata_alloc);
+EXPORT_SYMBOL(padata_alloc_possible);
 
 /**
- * __padata_alloc - allocate and initialize a padata instance
- *                  and specify cpumasks for serial and parallel workers.
+ * padata_alloc - allocate and initialize a padata instance and specify
+ *                cpumasks for serial and parallel workers.
  *
  * @wq: workqueue to use for the allocated padata instance
  * @pcpumask: cpumask that will be used for padata parallelization
  * @cbcpumask: cpumask that will be used for padata serialization
  */
-struct padata_instance *__padata_alloc(struct workqueue_struct *wq,
-				       const struct cpumask *pcpumask,
-				       const struct cpumask *cbcpumask)
+struct padata_instance *padata_alloc(struct workqueue_struct *wq,
+				     const struct cpumask *pcpumask,
+				     const struct cpumask *cbcpumask)
 {
 	struct padata_instance *pinst;
 	struct parallel_data *pd = NULL;
@@ -1138,7 +1138,7 @@ struct padata_instance *__padata_alloc(struct workqueue_struct *wq,
 err:
 	return NULL;
 }
-EXPORT_SYMBOL(__padata_alloc);
+EXPORT_SYMBOL(padata_alloc);
 
 /**
  * padata_free - free a padata instance