From: tip-bot for Tejun Heo on
Commit-ID: 0b2e918aa99fe6c3b8f163aa323a275ad8577828
Gitweb: http://git.kernel.org/tip/0b2e918aa99fe6c3b8f163aa323a275ad8577828
Author: Tejun Heo <tj(a)kernel.org>
AuthorDate: Mon, 21 Jun 2010 23:53:31 +0200
Committer: Ingo Molnar <mingo(a)elte.hu>
CommitDate: Tue, 22 Jun 2010 08:07:39 +0200

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(a)intel.com>
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Acked-by: Tony Luck <tony.luck(a)intel.com>
Cc: Peter Zijlstra <peterz(a)infradead.org>
LKML-Reference: <4C1FDF5B.1040301(a)kernel.org>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
kernel/cpuset.c | 2 +-
kernel/sched.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 05727dc..7146793 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -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;
diff --git a/kernel/sched.c b/kernel/sched.c
index b4427cc..9064e7d 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)
* 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:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/