[S390] appldata_base: Misc cpuinit annotations and bugfix
appldata_offline_cpu() is only called from __cpuinit-marked hotplug notifier callback and from the __exit-marked module_exit function, therefore candidate for __cpuexit. BTW the __exit module_exit function appldata_exit() of this driver fails to unregister_hotcpu_notifier() the notifier_block that was registered by appldata_init() during module startup. This will lead to oops if hotplug notification comes after module has been unloaded. Let's fix this by unregistering the notifier appropriately (before appldata_offline_cpu()'ing the CPUs). Signed-off-by: Satyam Sharma <satyam@infradead.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
parent
2af48080e1
commit
11b8bf0107
|
@ -547,8 +547,7 @@ static void __cpuinit appldata_online_cpu(int cpu)
|
||||||
spin_unlock(&appldata_timer_lock);
|
spin_unlock(&appldata_timer_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void __cpuexit appldata_offline_cpu(int cpu)
|
||||||
appldata_offline_cpu(int cpu)
|
|
||||||
{
|
{
|
||||||
del_virt_timer(&per_cpu(appldata_timer, cpu));
|
del_virt_timer(&per_cpu(appldata_timer, cpu));
|
||||||
if (atomic_dec_and_test(&appldata_expire_count)) {
|
if (atomic_dec_and_test(&appldata_expire_count)) {
|
||||||
|
@ -560,9 +559,9 @@ appldata_offline_cpu(int cpu)
|
||||||
spin_unlock(&appldata_timer_lock);
|
spin_unlock(&appldata_timer_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __cpuinit
|
static int __cpuinit appldata_cpu_notify(struct notifier_block *self,
|
||||||
appldata_cpu_notify(struct notifier_block *self,
|
unsigned long action,
|
||||||
unsigned long action, void *hcpu)
|
void *hcpu)
|
||||||
{
|
{
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case CPU_ONLINE:
|
case CPU_ONLINE:
|
||||||
|
@ -646,6 +645,8 @@ static void __exit appldata_exit(void)
|
||||||
}
|
}
|
||||||
spin_unlock(&appldata_ops_lock);
|
spin_unlock(&appldata_ops_lock);
|
||||||
|
|
||||||
|
unregister_hotcpu_notifier(&appldata_nb);
|
||||||
|
|
||||||
for_each_online_cpu(i)
|
for_each_online_cpu(i)
|
||||||
appldata_offline_cpu(i);
|
appldata_offline_cpu(i);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue