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

Commit 0b2e918a authored by Tejun Heo's avatar Tejun Heo Committed by Ingo Molnar
Browse files

sched, cpuset: Drop __cpuexit from cpu hotplug callbacks 



Commit 3a101d05 (sched: adjust when cpu_active and cpuset
configurations are updated during cpu on/offlining) added
hotplug notifiers marked with __cpuexit; however, ia64 drops
text in __cpuexit during link unlike x86.

This means that functions which are referenced during init but used
only for cpu hot unplugging afterwards shouldn't be marked with
__cpuexit. Drop __cpuexit from those functions.

Reported-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <4C1FDF5B.1040301@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8d1f431c

kernel/cpuset.c

+1 −1
Original line number Diff line number Diff line
@@ -2118,7 +2118,7 @@ static void scan_for_empty_cpusets(struct cpuset *root) 
 * Called within get_online_cpus().  Needs to call cgroup_lock()

 * before calling generate_sched_domains().

 */

void __cpuexit cpuset_update_active_cpus(void)

void cpuset_update_active_cpus(void)

{

	struct sched_domain_attr *attr;

	cpumask_var_t *doms;

kernel/sched.c

+4 −4
Original line number Diff line number Diff line
@@ -7477,8 +7477,8 @@ int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls) 
 * disabled, cpuset_update_active_cpus() becomes a simple wrapper

 * around partition_sched_domains().

 */

static int __cpuexit cpuset_cpu_active(struct notifier_block *nfb,

				       unsigned long action, void *hcpu)

static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,

			     void *hcpu)

{

	switch (action & ~CPU_TASKS_FROZEN) {

	case CPU_ONLINE:
@@ -7490,8 +7490,8 @@ static int __cpuexit cpuset_cpu_active(struct notifier_block *nfb, 
	}

}



static int __cpuexit cpuset_cpu_inactive(struct notifier_block *nfb,

					 unsigned long action, void *hcpu)

static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action,

			       void *hcpu)

{

	switch (action & ~CPU_TASKS_FROZEN) {

	case CPU_DOWN_PREPARE: