mirror of https://gitee.com/openkylin/linux.git
[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: 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>
This commit is contained in:
parent
9c7b216d23
commit
054cc8a2d8
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -4805,7 +4805,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 migration_notifier = {
|
||||
static struct notifier_block __devinitdata migration_notifier = {
|
||||
.notifier_call = migration_call,
|
||||
.priority = 10
|
||||
};
|
||||
|
|
|
@ -486,7 +486,7 @@ static int __devinit 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
|
||||
};
|
||||
|
||||
|
|
|
@ -142,7 +142,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
|
|||
return NOTIFY_OK;
|
||||
}
|
||||
|
||||
static struct notifier_block cpu_nfb = {
|
||||
static struct notifier_block __devinitdata cpu_nfb = {
|
||||
.notifier_call = cpu_callback
|
||||
};
|
||||
|
||||
|
|
|
@ -1672,7 +1672,7 @@ static int __devinit timer_cpu_notify(struct notifier_block *self,
|
|||
return NOTIFY_OK;
|
||||
}
|
||||
|
||||
static struct notifier_block timers_nb = {
|
||||
static struct notifier_block __devinitdata timers_nb = {
|
||||
.notifier_call = timer_cpu_notify,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue