[S390] tape: reversed order of labels

[safe/jmp/linux-2.6] / drivers / s390 / char / sclp_config.c

diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index 9dc77f1..b497afe 100644 (file)
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -5,30 +5,35 @@
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
  */
 
+#define KMSG_COMPONENT "sclp_config"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/cpu.h>
 #include <linux/sysdev.h>
 #include <linux/workqueue.h>
-#include "sclp.h"
+#include <asm/smp.h>
 
-#define TAG    "sclp_config: "
+#include "sclp.h"
 
 struct conf_mgm_data {
        u8 reserved;
        u8 ev_qualifier;
 } __attribute__((packed));
 
+#define EV_QUAL_CPU_CHANGE     1
 #define EV_QUAL_CAP_CHANGE     3
 
 static struct work_struct sclp_cpu_capability_work;
+static struct work_struct sclp_cpu_change_work;
 
 static void sclp_cpu_capability_notify(struct work_struct *work)
 {
        int cpu;
        struct sys_device *sysdev;
 
-       printk(KERN_WARNING TAG "cpu capability changed.\n");
+       pr_warning("cpu capability changed.\n");
        get_online_cpus();
        for_each_online_cpu(cpu) {
                sysdev = get_cpu_sysdev(cpu);
@@ -37,13 +42,24 @@ static void sclp_cpu_capability_notify(struct work_struct *work)
        put_online_cpus();
 }
 
+static void __ref sclp_cpu_change_notify(struct work_struct *work)
+{
+       smp_rescan_cpus();
+}
+
 static void sclp_conf_receiver_fn(struct evbuf_header *evbuf)
 {
        struct conf_mgm_data *cdata;
 
        cdata = (struct conf_mgm_data *)(evbuf + 1);
-       if (cdata->ev_qualifier == EV_QUAL_CAP_CHANGE)
+       switch (cdata->ev_qualifier) {
+       case EV_QUAL_CPU_CHANGE:
+               schedule_work(&sclp_cpu_change_work);
+               break;
+       case EV_QUAL_CAP_CHANGE:
                schedule_work(&sclp_cpu_capability_work);
+               break;
+       }
 }
 
 static struct sclp_register sclp_conf_register =
@@ -57,15 +73,14 @@ static int __init sclp_conf_init(void)
        int rc;
 
        INIT_WORK(&sclp_cpu_capability_work, sclp_cpu_capability_notify);
+       INIT_WORK(&sclp_cpu_change_work, sclp_cpu_change_notify);
 
        rc = sclp_register(&sclp_conf_register);
-       if (rc) {
-               printk(KERN_ERR TAG "failed to register (%d).\n", rc);
+       if (rc)
                return rc;
-       }
 
-       if (!(sclp_conf_register.sclp_receive_mask & EVTYP_CONFMGMDATA_MASK)) {
-               printk(KERN_WARNING TAG "no configuration management.\n");
+       if (!(sclp_conf_register.sclp_send_mask & EVTYP_CONFMGMDATA_MASK)) {
+               pr_warning("no configuration management.\n");
                sclp_unregister(&sclp_conf_register);
                rc = -ENOSYS;
        }