aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandra Seetharaman <sekharan@us.ibm.com>2006-06-27 05:54:10 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-27 20:32:41 -0400
commit26c2143b63b8078d08d562733716de142927e17a (patch)
tree6a2add2bca5bffbd33a0465fd934fffa34a695e9
parent74b85f3790aa2550c617fe14439482e13e615fa0 (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.c7
-rw-r--r--mm/page-writeback.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index b8deddb7833a..3e57712aefdf 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4734,8 +4734,9 @@ static void migrate_dead_tasks(unsigned int dead_cpu)
4734 * migration_call - callback that gets triggered when a CPU is added. 4734 * migration_call - callback that gets triggered when a CPU is added.
4735 * Here we can start up the necessary migration thread for the new CPU. 4735 * Here we can start up the necessary migration thread for the new CPU.
4736 */ 4736 */
4737static int migration_call(struct notifier_block *nfb, unsigned long action, 4737static int __cpuinit migration_call(struct notifier_block *nfb,
4738 void *hcpu) 4738 unsigned long action,
4739 void *hcpu)
4739{ 4740{
4740 int cpu = (long)hcpu; 4741 int cpu = (long)hcpu;
4741 struct task_struct *p; 4742 struct task_struct *p;
@@ -4805,7 +4806,7 @@ static int migration_call(struct notifier_block *nfb, unsigned long action,
4805/* Register at highest priority so that task migration (migrate_all_tasks) 4806/* Register at highest priority so that task migration (migrate_all_tasks)
4806 * happens before everything else. 4807 * happens before everything else.
4807 */ 4808 */
4808static struct notifier_block __devinitdata migration_notifier = { 4809static struct notifier_block __cpuinitdata migration_notifier = {
4809 .notifier_call = migration_call, 4810 .notifier_call = migration_call,
4810 .priority = 10 4811 .priority = 10
4811}; 4812};
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 8ac6bfb40073..4ec7026c7bab 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -516,7 +516,7 @@ static void set_ratelimit(void)
516 ratelimit_pages = (4096 * 1024) / PAGE_CACHE_SIZE; 516 ratelimit_pages = (4096 * 1024) / PAGE_CACHE_SIZE;
517} 517}
518 518
519static int 519static int __cpuinit
520ratelimit_handler(struct notifier_block *self, unsigned long u, void *v) 520ratelimit_handler(struct notifier_block *self, unsigned long u, void *v)
521{ 521{
522 set_ratelimit(); 522 set_ratelimit();