Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 054cc8a2 authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Linus Torvalds
Browse files

[PATCH] cpu hotplug: revert initdata patch submitted for 2.6.17 



This patch reverts notifier_block changes made in 2.6.17

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9c7b216d

arch/powerpc/kernel/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int __devinit sysfs_cpu_notify(struct notifier_block *self, 
	return NOTIFY_OK;

}



static struct notifier_block sysfs_cpu_nb = {

static struct notifier_block __devinitdata sysfs_cpu_nb = {

	.notifier_call	= sysfs_cpu_notify,

};

arch/s390/appldata/appldata_base.c

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ appldata_cpu_notify(struct notifier_block *self, 
	return NOTIFY_OK;

}



static struct notifier_block appldata_nb = {

static struct notifier_block __devinitdata appldata_nb = {

	.notifier_call = appldata_cpu_notify,

};

block/ll_rw_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -3403,7 +3403,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action, 
}





static struct notifier_block blk_cpu_notifier = {

static struct notifier_block __devinitdata blk_cpu_notifier = {

	.notifier_call	= blk_cpu_notify,

};

kernel/hrtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ static int __devinit hrtimer_cpu_notify(struct notifier_block *self, 
	return NOTIFY_OK;

}



static struct notifier_block hrtimers_nb = {

static struct notifier_block __devinitdata hrtimers_nb = {

	.notifier_call = hrtimer_cpu_notify,

};

kernel/rcupdate.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int __devinit rcu_cpu_notify(struct notifier_block *self, 
	return NOTIFY_OK;

}



static struct notifier_block rcu_nb = {

static struct notifier_block __devinitdata rcu_nb = {

	.notifier_call	= rcu_cpu_notify,

};