Commit 649bbaa4 authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Linus Torvalds
Browse files

[PATCH] Remove __devinitdata from notifier block definitions 



Few of the notifier_chain_register() callers use __devinitdata in the
definition of notifier_block data structure.  It is incorrect as the
data structure should be available after the initializations (they do
not unregister them during initializations).

This was leading to an oops when notifier_chain_register() call is
invoked for those callback chains after initialization.

This patch fixes all such usages to _not_ have the notifier_block data
structure in the init data section.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e7edf9cd

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 __devinitdata sysfs_cpu_nb = {

static struct notifier_block 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 __devinitdata appldata_nb = {

static struct notifier_block appldata_nb = {

	.notifier_call = appldata_cpu_notify,

};

block/ll_rw_blk.c

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





static struct notifier_block __devinitdata blk_cpu_notifier = {

static struct notifier_block blk_cpu_notifier = {

	.notifier_call	= blk_cpu_notify,

};

kernel/hrtimer.c

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

}



static struct notifier_block __devinitdata hrtimers_nb = {

static struct notifier_block hrtimers_nb = {

	.notifier_call = hrtimer_cpu_notify,

};

kernel/rcupdate.c

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

}



static struct notifier_block __devinitdata rcu_nb = {

static struct notifier_block rcu_nb = {

	.notifier_call	= rcu_cpu_notify,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE