From: Chandra Seetharaman <sekharan@us.ibm.com>

This patch reverts notifier_block changes made in 2.6.17

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/powerpc/kernel/sysfs.c        |    2 +-
 arch/s390/appldata/appldata_base.c |    2 +-
 block/ll_rw_blk.c                  |    2 +-
 kernel/hrtimer.c                   |    2 +-
 kernel/rcupdate.c                  |    2 +-
 kernel/sched.c                     |    2 +-
 kernel/softirq.c                   |    2 +-
 kernel/softlockup.c                |    2 +-
 kernel/timer.c                     |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff -puN arch/powerpc/kernel/sysfs.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 arch/powerpc/kernel/sysfs.c
--- a/arch/powerpc/kernel/sysfs.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/arch/powerpc/kernel/sysfs.c
@@ -297,7 +297,7 @@ static int __devinit sysfs_cpu_notify(st
 	return NOTIFY_OK;
 }
 
-static struct notifier_block sysfs_cpu_nb = {
+static struct notifier_block __devinitdata sysfs_cpu_nb = {
 	.notifier_call	= sysfs_cpu_notify,
 };
 
diff -puN arch/s390/appldata/appldata_base.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 arch/s390/appldata/appldata_base.c
--- a/arch/s390/appldata/appldata_base.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/arch/s390/appldata/appldata_base.c
@@ -652,7 +652,7 @@ appldata_cpu_notify(struct notifier_bloc
 	return NOTIFY_OK;
 }
 
-static struct notifier_block appldata_nb = {
+static struct notifier_block __devinitdata appldata_nb = {
 	.notifier_call = appldata_cpu_notify,
 };
 
diff -puN block/ll_rw_blk.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 block/ll_rw_blk.c
--- a/block/ll_rw_blk.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/block/ll_rw_blk.c
@@ -3406,7 +3406,7 @@ static int blk_cpu_notify(struct notifie
 }
 
 
-static struct notifier_block blk_cpu_notifier = {
+static struct notifier_block __devinitdata blk_cpu_notifier = {
 	.notifier_call	= blk_cpu_notify,
 };
 
diff -puN kernel/hrtimer.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 kernel/hrtimer.c
--- a/kernel/hrtimer.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/kernel/hrtimer.c
@@ -857,7 +857,7 @@ static int __devinit hrtimer_cpu_notify(
 	return NOTIFY_OK;
 }
 
-static struct notifier_block hrtimers_nb = {
+static struct notifier_block __devinitdata hrtimers_nb = {
 	.notifier_call = hrtimer_cpu_notify,
 };
 
diff -puN kernel/rcupdate.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 kernel/rcupdate.c
--- a/kernel/rcupdate.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/kernel/rcupdate.c
@@ -556,7 +556,7 @@ static int __devinit rcu_cpu_notify(stru
 	return NOTIFY_OK;
 }
 
-static struct notifier_block rcu_nb = {
+static struct notifier_block __devinitdata rcu_nb = {
 	.notifier_call	= rcu_cpu_notify,
 };
 
diff -puN kernel/sched.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 kernel/sched.c
--- a/kernel/sched.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/kernel/sched.c
@@ -4818,7 +4818,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 migration_notifier = {
+static struct notifier_block __devinitdata migration_notifier = {
 	.notifier_call = migration_call,
 	.priority = 10
 };
diff -puN kernel/softirq.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 kernel/softirq.c
--- a/kernel/softirq.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/kernel/softirq.c
@@ -486,7 +486,7 @@ static int __devinit cpu_callback(struct
 	return NOTIFY_OK;
 }
 
-static struct notifier_block cpu_nfb = {
+static struct notifier_block __devinitdata cpu_nfb = {
 	.notifier_call = cpu_callback
 };
 
diff -puN kernel/softlockup.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 kernel/softlockup.c
--- a/kernel/softlockup.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/kernel/softlockup.c
@@ -142,7 +142,7 @@ cpu_callback(struct notifier_block *nfb,
 	return NOTIFY_OK;
 }
 
-static struct notifier_block cpu_nfb = {
+static struct notifier_block __devinitdata cpu_nfb = {
 	.notifier_call = cpu_callback
 };
 
diff -puN kernel/timer.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617 kernel/timer.c
--- a/kernel/timer.c~cpu-hotplug-revert-initdata-patch-submitted-for-2617
+++ a/kernel/timer.c
@@ -1346,7 +1346,7 @@ static int __devinit timer_cpu_notify(st
 	return NOTIFY_OK;
 }
 
-static struct notifier_block timers_nb = {
+static struct notifier_block __devinitdata timers_nb = {
 	.notifier_call	= timer_cpu_notify,
 };
 
_