[PATCH] cpu hotplug: make cpu_notifier related notifier blocks __cpuinit only

Make notifier_blocks associated with cpu_notifier as __cpuinitdata.

__cpuinitdata makes sure that the data is init time only unless
CONFIG_HOTPLUG_CPU is defined.

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>

3 files changed, 5 insertions, 3 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 8ccf6f1b1473..8ac6bfb40073 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -523,7 +523,7 @@ ratelimit_handler(struct notifier_block *self, unsigned long u, void *v)
         return 0;
 }
 
-static struct notifier_block ratelimit_nb = {
+static struct notifier_block __cpuinitdata ratelimit_nb = {
         .notifier_call  = ratelimit_handler,
         .next           = NULL,
 };
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index e9fb2d4064c8..dafd12ec7a0c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2031,7 +2031,7 @@ static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb,
         return ret;
 }
 
-static struct notifier_block pageset_notifier =
+static struct notifier_block __cpuinitdata pageset_notifier =
         { &pageset_cpuup_callback, NULL, 0 };
 
 void __init setup_per_cpu_pageset(void)
diff --git a/mm/slab.c b/mm/slab.c
index 631c0feb9645..d1d55279202e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1255,7 +1255,9 @@ bad:
         return NOTIFY_BAD;
 }
 
-static struct notifier_block cpucache_notifier = { &cpuup_callback, NULL, 0 };
+static struct notifier_block __cpuinitdata cpucache_notifier = {
+        &cpuup_callback, NULL, 0
+};
 
 /*
  * swap the static kmem_list3 with kmalloced memory