Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2cb2f1c authored by Steffen Klassert's avatar Steffen Klassert Committed by Herbert Xu
Browse files

padata: cpu hotplug code should depend on CONFIG_HOTPLUG_CPU 



This patch makes the padata cpu hotplug code dependend on CONFIG_HOTPLUG_CPU.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent df2071bd

kernel/padata.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -570,6 +570,7 @@ void padata_stop(struct padata_instance *pinst) 
}

}

EXPORT_SYMBOL(padata_stop);

EXPORT_SYMBOL(padata_stop);





#ifdef CONFIG_HOTPLUG_CPU

static int padata_cpu_callback(struct notifier_block *nfb,

static int padata_cpu_callback(struct notifier_block *nfb,

			       unsigned long action, void *hcpu)

			       unsigned long action, void *hcpu)

{

{
@@ -621,6 +622,7 @@ static int padata_cpu_callback(struct notifier_block *nfb, 




	return NOTIFY_OK;

	return NOTIFY_OK;

}

}

#endif





/*

/*

 * padata_alloc - allocate and initialize a padata instance

 * padata_alloc - allocate and initialize a padata instance
@@ -631,7 +633,6 @@ static int padata_cpu_callback(struct notifier_block *nfb, 
struct padata_instance *padata_alloc(const struct cpumask *cpumask,

struct padata_instance *padata_alloc(const struct cpumask *cpumask,

				     struct workqueue_struct *wq)

				     struct workqueue_struct *wq)

{

{

	int err;

	struct padata_instance *pinst;

	struct padata_instance *pinst;

	struct parallel_data *pd;

	struct parallel_data *pd;
@@ -654,18 +655,16 @@ struct padata_instance *padata_alloc(const struct cpumask *cpumask, 




	pinst->flags = 0;

	pinst->flags = 0;





#ifdef CONFIG_HOTPLUG_CPU

	pinst->cpu_notifier.notifier_call = padata_cpu_callback;

	pinst->cpu_notifier.notifier_call = padata_cpu_callback;

	pinst->cpu_notifier.priority = 0;

	pinst->cpu_notifier.priority = 0;

	err = register_hotcpu_notifier(&pinst->cpu_notifier);

	register_hotcpu_notifier(&pinst->cpu_notifier);

	if (err)

#endif

		goto err_free_cpumask;





	mutex_init(&pinst->lock);

	mutex_init(&pinst->lock);





	return pinst;

	return pinst;





err_free_cpumask:

	free_cpumask_var(pinst->cpumask);

err_free_pd:

err_free_pd:

	padata_free_pd(pd);

	padata_free_pd(pd);

err_free_inst:

err_free_inst:
@@ -689,7 +688,9 @@ void padata_free(struct padata_instance *pinst) 
	while (atomic_read(&pinst->pd->refcnt) != 0)

	while (atomic_read(&pinst->pd->refcnt) != 0)

		yield();

		yield();





#ifdef CONFIG_HOTPLUG_CPU

	unregister_hotcpu_notifier(&pinst->cpu_notifier);

	unregister_hotcpu_notifier(&pinst->cpu_notifier);

#endif

	padata_free_pd(pinst->pd);

	padata_free_pd(pinst->pd);

	free_cpumask_var(pinst->cpumask);

	free_cpumask_var(pinst->cpumask);

	kfree(pinst);

	kfree(pinst);