The patch titled
cpu hotplug: make cpu_notifier related notifier calls __cpuinit only
has been added to the -mm tree. Its filename is
cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only.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: make cpu_notifier related notifier calls __cpuinit only
From: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Make notifier_calls associated with cpu_notifier as __cpuinit.
__cpuinit makes sure that the function is init time only unless
CONFIG_HOTPLUG_CPU is defined.
Signed-off-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Cc: Ashok Raj <ashok.raj@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/cpufreq/cpufreq.c | 2 +-
drivers/cpufreq/cpufreq_stats.c | 2 +-
kernel/sched.c | 7 ++++---
mm/page-writeback.c | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff -puN drivers/cpufreq/cpufreq.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only drivers/cpufreq/cpufreq.c
--- a/drivers/cpufreq/cpufreq.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only
+++ a/drivers/cpufreq/cpufreq.c
@@ -1551,7 +1551,7 @@ static struct notifier_block __cpuinitda
* (and isn't unregistered in the meantime).
*
*/
-int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+int __cpuinit cpufreq_register_driver(struct cpufreq_driver *driver_data)
{
unsigned long flags;
int ret;
diff -puN drivers/cpufreq/cpufreq_stats.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only drivers/cpufreq/cpufreq_stats.c
--- a/drivers/cpufreq/cpufreq_stats.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only
+++ a/drivers/cpufreq/cpufreq_stats.c
@@ -303,7 +303,7 @@ cpufreq_stat_notifier_trans (struct noti
return 0;
}
-static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
diff -puN kernel/sched.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only kernel/sched.c
--- a/kernel/sched.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only
+++ a/kernel/sched.c
@@ -4747,8 +4747,9 @@ static void migrate_dead_tasks(unsigned
* migration_call - callback that gets triggered when a CPU is added.
* Here we can start up the necessary migration thread for the new CPU.
*/
-static int migration_call(struct notifier_block *nfb, unsigned long action,
- void *hcpu)
+static int __cpuinit migration_call(struct notifier_block *nfb,
+ unsigned long action,
+ void *hcpu)
{
int cpu = (long)hcpu;
struct task_struct *p;
@@ -4818,7 +4819,7 @@ static int migration_call(struct notifie
/* Register at highest priority so that task migration (migrate_all_tasks)
* happens before everything else.
*/
-static struct notifier_block __devinitdata migration_notifier = {
+static struct notifier_block __cpuinitdata migration_notifier = {
.notifier_call = migration_call,
.priority = 10
};
diff -puN mm/page-writeback.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only mm/page-writeback.c
--- a/mm/page-writeback.c~cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only
+++ a/mm/page-writeback.c
@@ -516,7 +516,7 @@ static void set_ratelimit(void)
ratelimit_pages = (4096 * 1024) / PAGE_CACHE_SIZE;
}
-static int
+static int __cpuinit
ratelimit_handler(struct notifier_block *self, unsigned long u, void *v)
{
set_ratelimit();
_
Patches currently in -mm which might be from sekharan@xxxxxxxxxx are
cpu-hotplug-revert-init-patch-submitted-for-2617.patch
cpu-hotplug-revert-initdata-patch-submitted-for-2617.patch
cpu-hotplug-make-register_cpu_notifier-init-time-only.patch
cpu-hotplug-make-cpu_notifier-related-notifier-blocks-__cpuinit-only.patch
cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only.patch
cpu-hotplug-add-hotplug-versions-of-cpu_notifier.patch
cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places.patch
per-task-delay-accounting-cpu-delay-collection-via-schedstats.patch
task-watchers-task-watchers.patch
task-watchers-task-watchers-tidy.patch
task-watchers-register-per-task-delay-accounting.patch
task-watchers-add-support-for-per-task-watchers.patch
task-watchers-add-support-for-per-task-watchers-warning-fix.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
