Commit:     11b8bf0107e688434b9e0570fd05e7c715534f3b
Parent:     2af48080e100d66db8f086af70a70713a953a83d
Author:     Satyam Sharma <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 12 16:11:31 2007 +0200
Committer:  Martin Schwidefsky <[EMAIL PROTECTED]>
CommitDate: Fri Oct 12 16:13:05 2007 +0200

    [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 <[EMAIL PROTECTED]>
    Cc: Heiko Carstens <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Martin Schwidefsky <[EMAIL PROTECTED]>
 arch/s390/appldata/appldata_base.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/s390/appldata/appldata_base.c 
index 62391fb..a355d81 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -547,8 +547,7 @@ static void __cpuinit appldata_online_cpu(int cpu)
-static void
-appldata_offline_cpu(int cpu)
+static void __cpuexit appldata_offline_cpu(int cpu)
        del_virt_timer(&per_cpu(appldata_timer, cpu));
        if (atomic_dec_and_test(&appldata_expire_count)) {
@@ -560,9 +559,9 @@ appldata_offline_cpu(int cpu)
-static int __cpuinit
-appldata_cpu_notify(struct notifier_block *self,
-                   unsigned long action, void *hcpu)
+static int __cpuinit appldata_cpu_notify(struct notifier_block *self,
+                                        unsigned long action,
+                                        void *hcpu)
        switch (action) {
        case CPU_ONLINE:
@@ -646,6 +645,8 @@ static void __exit appldata_exit(void)
+       unregister_hotcpu_notifier(&appldata_nb);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to