The patch titled
cpu hotplug: replace __devinit* with __cpuinit* for cpu notifications
has been added to the -mm tree. Its filename is
replace-__devinit-with-__cpuinit-for-cpu-notifications.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cpu hotplug: replace __devinit* with __cpuinit* for cpu notifications
From: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Few of the callback functions and notifier blocks that are associated with cpu
notifications incorrectly have __devinit and __devinitdata. They should be
__cpuinit and __cpuinitdata instead.
It makes no functional difference but wastes text area when CONFIG_HOTPLUG is
enabled and CONFIG_HOTPLUG_CPU is not.
This patch fixes all those instances.
Signed-off-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Cc: Ashok Raj <ashok.raj@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/kernel/sysfs.c | 4 ++--
kernel/hrtimer.c | 4 ++--
kernel/rcupdate.c | 4 ++--
kernel/softirq.c | 4 ++--
kernel/softlockup.c | 4 ++--
kernel/timer.c | 4 ++--
mm/slab.c | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff -puN arch/powerpc/kernel/sysfs.c~replace-__devinit-with-__cpuinit-for-cpu-notifications arch/powerpc/kernel/sysfs.c
--- a/arch/powerpc/kernel/sysfs.c~replace-__devinit-with-__cpuinit-for-cpu-notifications
+++ a/arch/powerpc/kernel/sysfs.c
@@ -278,7 +278,7 @@ static void unregister_cpu_online(unsign
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int __devinit sysfs_cpu_notify(struct notifier_block *self,
+static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)(long)hcpu;
@@ -296,7 +296,7 @@ static int __devinit sysfs_cpu_notify(st
return NOTIFY_OK;
}
-static struct notifier_block __devinitdata sysfs_cpu_nb = {
+static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
.notifier_call = sysfs_cpu_notify,
};
diff -puN kernel/hrtimer.c~replace-__devinit-with-__cpuinit-for-cpu-notifications kernel/hrtimer.c
--- a/kernel/hrtimer.c~replace-__devinit-with-__cpuinit-for-cpu-notifications
+++ a/kernel/hrtimer.c
@@ -835,7 +835,7 @@ static void migrate_hrtimers(int cpu)
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int __devinit hrtimer_cpu_notify(struct notifier_block *self,
+static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@ -859,7 +859,7 @@ static int __devinit hrtimer_cpu_notify(
return NOTIFY_OK;
}
-static struct notifier_block __devinitdata hrtimers_nb = {
+static struct notifier_block __cpuinitdata hrtimers_nb = {
.notifier_call = hrtimer_cpu_notify,
};
diff -puN kernel/rcupdate.c~replace-__devinit-with-__cpuinit-for-cpu-notifications kernel/rcupdate.c
--- a/kernel/rcupdate.c~replace-__devinit-with-__cpuinit-for-cpu-notifications
+++ a/kernel/rcupdate.c
@@ -548,7 +548,7 @@ static void __devinit rcu_online_cpu(int
tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);
}
-static int __devinit rcu_cpu_notify(struct notifier_block *self,
+static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@ -565,7 +565,7 @@ static int __devinit rcu_cpu_notify(stru
return NOTIFY_OK;
}
-static struct notifier_block __devinitdata rcu_nb = {
+static struct notifier_block __cpuinitdata rcu_nb = {
.notifier_call = rcu_cpu_notify,
};
diff -puN kernel/softirq.c~replace-__devinit-with-__cpuinit-for-cpu-notifications kernel/softirq.c
--- a/kernel/softirq.c~replace-__devinit-with-__cpuinit-for-cpu-notifications
+++ a/kernel/softirq.c
@@ -547,7 +547,7 @@ static void takeover_tasklets(unsigned i
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int __devinit cpu_callback(struct notifier_block *nfb,
+static int __cpuinit cpu_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
@@ -587,7 +587,7 @@ static int __devinit cpu_callback(struct
return NOTIFY_OK;
}
-static struct notifier_block __devinitdata cpu_nfb = {
+static struct notifier_block __cpuinitdata cpu_nfb = {
.notifier_call = cpu_callback
};
diff -puN kernel/softlockup.c~replace-__devinit-with-__cpuinit-for-cpu-notifications kernel/softlockup.c
--- a/kernel/softlockup.c~replace-__devinit-with-__cpuinit-for-cpu-notifications
+++ a/kernel/softlockup.c
@@ -104,7 +104,7 @@ static int watchdog(void * __bind_cpu)
/*
* Create/destroy watchdog threads as CPUs come and go:
*/
-static int __devinit
+static int __cpuinit
cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
int hotcpu = (unsigned long)hcpu;
@@ -142,7 +142,7 @@ cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block __devinitdata cpu_nfb = {
+static struct notifier_block __cpuinitdata cpu_nfb = {
.notifier_call = cpu_callback
};
diff -puN kernel/timer.c~replace-__devinit-with-__cpuinit-for-cpu-notifications kernel/timer.c
--- a/kernel/timer.c~replace-__devinit-with-__cpuinit-for-cpu-notifications
+++ a/kernel/timer.c
@@ -1688,7 +1688,7 @@ static void __devinit migrate_timers(int
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int __devinit timer_cpu_notify(struct notifier_block *self,
+static int __cpuinit timer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@ -1708,7 +1708,7 @@ static int __devinit timer_cpu_notify(st
return NOTIFY_OK;
}
-static struct notifier_block __devinitdata timers_nb = {
+static struct notifier_block __cpuinitdata timers_nb = {
.notifier_call = timer_cpu_notify,
};
diff -puN mm/slab.c~replace-__devinit-with-__cpuinit-for-cpu-notifications mm/slab.c
--- a/mm/slab.c~replace-__devinit-with-__cpuinit-for-cpu-notifications
+++ a/mm/slab.c
@@ -1105,7 +1105,7 @@ static inline int cache_free_alien(struc
#endif
-static int __devinit cpuup_callback(struct notifier_block *nfb,
+static int __cpuinit cpuup_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
_
Patches currently in -mm which might be from sekharan@xxxxxxxxxx are
process-events-fix-biarch-compatibility-issue-use-__u64-timestamp.patch
taskstats-free-skb-avoid-returns-in.patch
replace-__devinit-with-__cpuinit-for-cpu-notifications.patch
fix-hotplug-cpu-documentation-for-proper-usage.patch
use-hotplug-version-of-registration-in-late-inits.patch
task-watchers-task-watchers.patch
task-watchers-register-per-task-delay-accounting.patch
task-watchers-add-support-for-per-task-watchers.patch
add-srcu-based-notifier-chains.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
