diff options
| author | Chandra Seetharaman <sekharan@us.ibm.com> | 2006-06-27 02:54:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 17:32:41 -0700 |
| commit | 26c2143b63b8078d08d562733716de142927e17a (patch) | |
| tree | 6a2add2bca5bffbd33a0465fd934fffa34a695e9 | |
| parent | 74b85f3790aa2550c617fe14439482e13e615fa0 (diff) | |
[PATCH] cpu hotplug: make cpu_notifier related notifier calls __cpuinit only
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.
[akpm@osdl.org: section fix]
Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | kernel/sched.c | 7 | ||||
| -rw-r--r-- | mm/page-writeback.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index b8deddb7833..3e57712aefd 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -4734,8 +4734,9 @@ static void migrate_dead_tasks(unsigned int dead_cpu) * 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; @@ -4805,7 +4806,7 @@ static int migration_call(struct notifier_block *nfb, unsigned long action, /* 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 --git a/mm/page-writeback.c b/mm/page-writeback.c index 8ac6bfb4007..4ec7026c7ba 100644 --- a/mm/page-writeback.c +++ b/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(); |