[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.

[[email protected]: section fix]
Signed-off-by: Chandra Seetharaman <[email protected]>
Cc: Ashok Raj <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/kernel/sched.c b/kernel/sched.c
index b8deddb7833a52d2ad0ca4b439f45becea53ee1c..3e57712aefdf5d8e73cf8bbdb98061b1bd32229b 100644 (file)
--- 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 8ac6bfb400736c4ae92f33bcd6524b529f6f3459..4ec7026c7bab14e1f4a9e512742e318a6630607f 100644 (file)
--- 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();