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

Commit 51aa7640 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "padata: add separate cpuhp node for CPUHP_PADATA_DEAD" 



This reverts commit d6c434ae which is
commit 93175d93 upstream.

It breaks the Android kernel abi and is not needed in this branch at
this point in time.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I53f15ad34f2124aa7a4e06dafcdb828666a91278
parent 8711f6e3

include/linux/padata.h

+2 −4
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ struct parallel_data { 
/**

 * struct padata_instance - The overall control structure.

 *

 * @cpu_online_node: Linkage for CPU online callback.

 * @cpu_dead_node: Linkage for CPU offline callback.

 * @cpu_notifier: cpu hotplug notifier.

 * @wq: The workqueue in use.

 * @pd: The internal control structure.

 * @cpumask: User supplied cpumasks for parallel and serial works.
@@ -151,8 +150,7 @@ struct parallel_data { 
 * @flags: padata flags.

 */

struct padata_instance {

	struct hlist_node		cpu_online_node;

	struct hlist_node		cpu_dead_node;

	struct hlist_node		 node;

	struct workqueue_struct		*wq;

	struct parallel_data		*pd;

	struct padata_cpumask		cpumask;

kernel/padata.c

+6 −8
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static int padata_cpu_online(unsigned int cpu, struct hlist_node *node) 
	struct padata_instance *pinst;

	int ret;



	pinst = hlist_entry_safe(node, struct padata_instance, cpu_online_node);

	pinst = hlist_entry_safe(node, struct padata_instance, node);

	if (!pinst_has_cpu(pinst, cpu))

		return 0;
@@ -763,7 +763,7 @@ static int padata_cpu_dead(unsigned int cpu, struct hlist_node *node) 
	struct padata_instance *pinst;

	int ret;



	pinst = hlist_entry_safe(node, struct padata_instance, cpu_dead_node);

	pinst = hlist_entry_safe(node, struct padata_instance, node);

	if (!pinst_has_cpu(pinst, cpu))

		return 0;
@@ -779,9 +779,8 @@ static enum cpuhp_state hp_online; 
static void __padata_free(struct padata_instance *pinst)

{

#ifdef CONFIG_HOTPLUG_CPU

	cpuhp_state_remove_instance_nocalls(CPUHP_PADATA_DEAD,

					    &pinst->cpu_dead_node);

	cpuhp_state_remove_instance_nocalls(hp_online, &pinst->cpu_online_node);

	cpuhp_state_remove_instance_nocalls(CPUHP_PADATA_DEAD, &pinst->node);

	cpuhp_state_remove_instance_nocalls(hp_online, &pinst->node);

#endif



	padata_stop(pinst);
@@ -965,10 +964,9 @@ static struct padata_instance *padata_alloc(struct workqueue_struct *wq, 
	mutex_init(&pinst->lock);



#ifdef CONFIG_HOTPLUG_CPU

	cpuhp_state_add_instance_nocalls_cpuslocked(hp_online,

						    &pinst->cpu_online_node);

	cpuhp_state_add_instance_nocalls_cpuslocked(hp_online, &pinst->node);

	cpuhp_state_add_instance_nocalls_cpuslocked(CPUHP_PADATA_DEAD,

						    &pinst->cpu_dead_node);

						    &pinst->node);

#endif

	return pinst;