diff options
author | Tejun Heo <tj@kernel.org> | 2010-06-21 17:53:31 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-22 02:07:39 -0400 |
commit | 0b2e918aa99fe6c3b8f163aa323a275ad8577828 (patch) | |
tree | 9e979e6ec865e31bbcc3cddf4f18751c48aa1934 /kernel/sched.c | |
parent | 8d1f431cbec115a780cd551ab1b4955c125f8d31 (diff) |
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: Tony Luck <tony.luck@intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <4C1FDF5B.1040301@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index b4427cc70acd..9064e7d6ad65 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -7477,8 +7477,8 @@ int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls) | |||
7477 | * disabled, cpuset_update_active_cpus() becomes a simple wrapper | 7477 | * disabled, cpuset_update_active_cpus() becomes a simple wrapper |
7478 | * around partition_sched_domains(). | 7478 | * around partition_sched_domains(). |
7479 | */ | 7479 | */ |
7480 | static int __cpuexit cpuset_cpu_active(struct notifier_block *nfb, | 7480 | static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action, |
7481 | unsigned long action, void *hcpu) | 7481 | void *hcpu) |
7482 | { | 7482 | { |
7483 | switch (action & ~CPU_TASKS_FROZEN) { | 7483 | switch (action & ~CPU_TASKS_FROZEN) { |
7484 | case CPU_ONLINE: | 7484 | case CPU_ONLINE: |
@@ -7490,8 +7490,8 @@ static int __cpuexit cpuset_cpu_active(struct notifier_block *nfb, | |||
7490 | } | 7490 | } |
7491 | } | 7491 | } |
7492 | 7492 | ||
7493 | static int __cpuexit cpuset_cpu_inactive(struct notifier_block *nfb, | 7493 | static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action, |
7494 | unsigned long action, void *hcpu) | 7494 | void *hcpu) |
7495 | { | 7495 | { |
7496 | switch (action & ~CPU_TASKS_FROZEN) { | 7496 | switch (action & ~CPU_TASKS_FROZEN) { |
7497 | case CPU_DOWN_PREPARE: | 7497 | case CPU_DOWN_PREPARE: |