7 files changed, 40 insertions, 39 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index bb72e0a5b0e0..ac6d4d3218b3 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2299,9 +2299,8 @@ int dasd_generic_set_offline(struct ccw_device *cdev)
          * in the other openers.
          */
         if (device->block) {
-                struct dasd_block *block = device->block;
-                max_count = block->bdev ? 0 : -1;
-                open_count = (int) atomic_read(&block->open_count);
+                max_count = device->block->bdev ? 0 : -1;
+                open_count = atomic_read(&device->block->open_count);
                 if (open_count > max_count) {
                         if (open_count > 0)
                                 printk(KERN_WARNING "Can't offline dasd "
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 3a40bee9d358..2d8df0b30538 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -745,6 +745,19 @@ static void flush_all_alias_devices_on_lcu(struct alias_lcu *lcu)
         spin_unlock_irqrestore(&lcu->lock, flags);
 }
 
+static void __stop_device_on_lcu(struct dasd_device *device,
+                                 struct dasd_device *pos)
+{
+        /* If pos == device then device is already locked! */
+        if (pos == device) {
+                pos->stopped |= DASD_STOPPED_SU;
+                return;
+        }
+        spin_lock(get_ccwdev_lock(pos->cdev));
+        pos->stopped |= DASD_STOPPED_SU;
+        spin_unlock(get_ccwdev_lock(pos->cdev));
+}
+
 /*
  * This function is called in interrupt context, so the
  * cdev lock for device is already locked!
@@ -755,35 +768,15 @@ static void _stop_all_devices_on_lcu(struct alias_lcu *lcu,
         struct alias_pav_group *pavgroup;
         struct dasd_device *pos;
 
-        list_for_each_entry(pos, &lcu->active_devices, alias_list) {
-                if (pos != device)
-                        spin_lock(get_ccwdev_lock(pos->cdev));
-                pos->stopped |= DASD_STOPPED_SU;
-                if (pos != device)
-                        spin_unlock(get_ccwdev_lock(pos->cdev));
-        }
-        list_for_each_entry(pos, &lcu->inactive_devices, alias_list) {
-                if (pos != device)
-                        spin_lock(get_ccwdev_lock(pos->cdev));
-                pos->stopped |= DASD_STOPPED_SU;
-                if (pos != device)
-                        spin_unlock(get_ccwdev_lock(pos->cdev));
-        }
+        list_for_each_entry(pos, &lcu->active_devices, alias_list)
+                __stop_device_on_lcu(device, pos);
+        list_for_each_entry(pos, &lcu->inactive_devices, alias_list)
+                __stop_device_on_lcu(device, pos);
         list_for_each_entry(pavgroup, &lcu->grouplist, group) {
-                list_for_each_entry(pos, &pavgroup->baselist, alias_list) {
-                        if (pos != device)
-                                spin_lock(get_ccwdev_lock(pos->cdev));
-                        pos->stopped |= DASD_STOPPED_SU;
-                        if (pos != device)
-                                spin_unlock(get_ccwdev_lock(pos->cdev));
-                }
-                list_for_each_entry(pos, &pavgroup->aliaslist, alias_list) {
-                        if (pos != device)
-                                spin_lock(get_ccwdev_lock(pos->cdev));
-                        pos->stopped |= DASD_STOPPED_SU;
-                        if (pos != device)
-                                spin_unlock(get_ccwdev_lock(pos->cdev));
-                }
+                list_for_each_entry(pos, &pavgroup->baselist, alias_list)
+                        __stop_device_on_lcu(device, pos);
+                list_for_each_entry(pos, &pavgroup->aliaslist, alias_list)
+                        __stop_device_on_lcu(device, pos);
         }
 }
 
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 41db3cc653f5..23ffcc4768a7 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -670,10 +670,14 @@ do_IRQ (struct pt_regs *regs)
                         continue;
                 }
                 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
-                if (sch)
-                        spin_lock(sch->lock);
+                if (!sch) {
+                        /* Clear pending interrupt condition. */
+                        tsch(tpi_info->schid, irb);
+                        continue;
+                }
+                spin_lock(sch->lock);
                 /* Store interrupt response block to lowcore. */
-                if (tsch (tpi_info->schid, irb) == 0 && sch) {
+                if (tsch(tpi_info->schid, irb) == 0) {
                         /* Keep subchannel information word up to date. */
                         memcpy (&sch->schib.scsw, &irb->scsw,
                                 sizeof (irb->scsw));
@@ -681,8 +685,7 @@ do_IRQ (struct pt_regs *regs)
                         if (sch->driver && sch->driver->irq)
                                 sch->driver->irq(sch);
                 }
-                if (sch)
-                        spin_unlock(sch->lock);
+                spin_unlock(sch->lock);
                 /*
                  * Are more interrupts pending?
                  * If so, the tpi instruction will update the lowcore
@@ -708,8 +711,9 @@ void *cio_get_console_priv(void)
 /*
  * busy wait for the next interrupt on the console
  */
-void
-wait_cons_dev (void)
+void wait_cons_dev(void)
+        __releases(console_subchannel.lock)
+        __acquires(console_subchannel.lock)
 {
         unsigned long cr6      __attribute__ ((aligned (8)));
         unsigned long save_cr6 __attribute__ ((aligned (8)));
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 52afa4c784de..08f2235c5a6f 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -100,6 +100,7 @@ extern int cio_modify (struct subchannel *);
 
 int cio_create_sch_lock(struct subchannel *);
 void do_adapter_IO(void);
+void do_IRQ(struct pt_regs *);
 
 /* Use with care. */
 #ifdef CONFIG_CCW_CONSOLE
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index fec004f62bcf..e0c7adb8958e 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -577,7 +577,6 @@ static DEVICE_ATTR(devtype, 0444, devtype_show, NULL);
 static DEVICE_ATTR(cutype, 0444, cutype_show, NULL);
 static DEVICE_ATTR(modalias, 0444, modalias_show, NULL);
 static DEVICE_ATTR(online, 0644, online_show, online_store);
-extern struct device_attribute dev_attr_cmb_enable;
 static DEVICE_ATTR(availability, 0444, available_show, NULL);
 
 static struct attribute * subch_attrs[] = {
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index d40a2ffaa000..cb08092be39f 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -127,4 +127,5 @@ extern struct bus_type ccw_bus_type;
 void retry_set_schib(struct ccw_device *cdev);
 void cmf_retry_copy_block(struct ccw_device *);
 int cmf_reenable(struct ccw_device *);
+extern struct device_attribute dev_attr_cmb_enable;
 #endif
diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index d3ca4281a494..ca681f9b67fc 100644
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -105,4 +105,8 @@ static inline int stcrw(struct crw *pcrw )
 #define ED_ETR_SYNC     12      /* External damage ETR sync check */
 #define ED_ETR_SWITCH   13      /* External damage ETR switch to local */
 
+struct pt_regs;
+
+void s390_handle_mcck(void);
+void s390_do_machine_check(struct pt_regs *regs);
 #endif /* __s390mach */