aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2010-07-27 01:14:28 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2010-07-31 07:53:04 -0400
commite6cc11707661770ca2bd4db4b0256d28f48e7541 (patch)
tree885f2ea00e90ac9e379d54adf8e5ad0fbb9d9892
parentcc74f4bc111e9554bcd6445ad0fe1d90e5d2eb34 (diff)
padata: Rename padata_alloc functions
We rename padata_alloc to padata_alloc_possible because this function allocates a padata_instance and uses the cpu_possible mask for parallel and serial workers. Also we rename __padata_alloc to padata_alloc to avoid to export underlined functions. Underlined functions are considered to be private to padata. Users are updated accordingly. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/pcrypt.c2
-rw-r--r--include/linux/padata.h9
-rw-r--r--kernel/padata.c24
3 files changed, 18 insertions, 17 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 794c172b99f..55460839624 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -457,7 +457,7 @@ static int __pcrypt_init_instance(struct pcrypt_instance *pcrypt,
457 if (!pcrypt->wq) 457 if (!pcrypt->wq)
458 goto err; 458 goto err;
459 459
460 pcrypt->pinst = padata_alloc(pcrypt->wq); 460 pcrypt->pinst = padata_alloc_possible(pcrypt->wq);
461 if (!pcrypt->pinst) 461 if (!pcrypt->pinst)
462 goto err_destroy_workqueue; 462 goto err_destroy_workqueue;
463 463
diff --git a/include/linux/padata.h b/include/linux/padata.h
index 293ad46ffce..71dfc9d1f85 100644
--- a/include/linux/padata.h
+++ b/include/linux/padata.h
@@ -165,10 +165,11 @@ struct padata_instance {
165#define PADATA_INVALID 4 165#define PADATA_INVALID 4
166}; 166};
167 167
168extern struct padata_instance *padata_alloc(struct workqueue_struct *wq); 168extern struct padata_instance *padata_alloc_possible(
169extern struct padata_instance *__padata_alloc(struct workqueue_struct *wq, 169 struct workqueue_struct *wq);
170 const struct cpumask *pcpumask, 170extern struct padata_instance *padata_alloc(struct workqueue_struct *wq,
171 const struct cpumask *cbcpumask); 171 const struct cpumask *pcpumask,
172 const struct cpumask *cbcpumask);
172extern void padata_free(struct padata_instance *pinst); 173extern void padata_free(struct padata_instance *pinst);
173extern int padata_do_parallel(struct padata_instance *pinst, 174extern int padata_do_parallel(struct padata_instance *pinst,
174 struct padata_priv *padata, int cb_cpu); 175 struct padata_priv *padata, int cb_cpu);
diff --git a/kernel/padata.c b/kernel/padata.c
index 7f895e2b4ef..12860bce6b7 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -1060,29 +1060,29 @@ static struct kobj_type padata_attr_type = {
1060}; 1060};
1061 1061
1062/** 1062/**
1063 * padata_alloc - Allocate and initialize padata instance. 1063 * padata_alloc_possible - Allocate and initialize padata instance.
1064 * Use default cpumask(cpu_possible_mask) 1064 * Use the cpu_possible_mask for serial and
1065 * for serial and parallel workes. 1065 * parallel workers.
1066 * 1066 *
1067 * @wq: workqueue to use for the allocated padata instance 1067 * @wq: workqueue to use for the allocated padata instance
1068 */ 1068 */
1069struct padata_instance *padata_alloc(struct workqueue_struct *wq) 1069struct padata_instance *padata_alloc_possible(struct workqueue_struct *wq)
1070{ 1070{
1071 return __padata_alloc(wq, cpu_possible_mask, cpu_possible_mask); 1071 return padata_alloc(wq, cpu_possible_mask, cpu_possible_mask);
1072} 1072}
1073EXPORT_SYMBOL(padata_alloc); 1073EXPORT_SYMBOL(padata_alloc_possible);
1074 1074
1075/** 1075/**
1076 * __padata_alloc - allocate and initialize a padata instance 1076 * padata_alloc - allocate and initialize a padata instance and specify
1077 * and specify cpumasks for serial and parallel workers. 1077 * cpumasks for serial and parallel workers.
1078 * 1078 *
1079 * @wq: workqueue to use for the allocated padata instance 1079 * @wq: workqueue to use for the allocated padata instance
1080 * @pcpumask: cpumask that will be used for padata parallelization 1080 * @pcpumask: cpumask that will be used for padata parallelization
1081 * @cbcpumask: cpumask that will be used for padata serialization 1081 * @cbcpumask: cpumask that will be used for padata serialization
1082 */ 1082 */
1083struct padata_instance *__padata_alloc(struct workqueue_struct *wq, 1083struct padata_instance *padata_alloc(struct workqueue_struct *wq,
1084 const struct cpumask *pcpumask, 1084 const struct cpumask *pcpumask,
1085 const struct cpumask *cbcpumask) 1085 const struct cpumask *cbcpumask)
1086{ 1086{
1087 struct padata_instance *pinst; 1087 struct padata_instance *pinst;
1088 struct parallel_data *pd = NULL; 1088 struct parallel_data *pd = NULL;
@@ -1138,7 +1138,7 @@ err_free_inst:
1138err: 1138err:
1139 return NULL; 1139 return NULL;
1140} 1140}
1141EXPORT_SYMBOL(__padata_alloc); 1141EXPORT_SYMBOL(padata_alloc);
1142 1142
1143/** 1143/**
1144 * padata_free - free a padata instance 1144 * padata_free - free a padata instance