10 files changed, 35 insertions, 24 deletions

diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 222a8a71a5e8..53db58a68617 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -218,7 +218,7 @@ dasd_diag_term_IO(struct dasd_ccw_req * cqr)
 
 /* Handle external interruption. */
 static void
-dasd_ext_handler(struct pt_regs *regs, __u16 code)
+dasd_ext_handler(__u16 code)
 {
         struct dasd_ccw_req *cqr, *next;
         struct dasd_device *device;
diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c
index d83eb6358bac..49e9628d9297 100644
--- a/drivers/s390/char/ctrlchar.c
+++ b/drivers/s390/char/ctrlchar.c
@@ -20,7 +20,7 @@ static int ctrlchar_sysrq_key;
 static void
 ctrlchar_handle_sysrq(void *tty)
 {
-        handle_sysrq(ctrlchar_sysrq_key, NULL, (struct tty_struct *) tty);
+        handle_sysrq(ctrlchar_sysrq_key, (struct tty_struct *) tty);
 }
 
 static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL);
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 3be06569180d..e3491a5f5219 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -304,7 +304,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)
                 if (kbd->sysrq) {
                         if (kbd->sysrq == K(KT_LATIN, '-')) {
                                 kbd->sysrq = 0;
-                                handle_sysrq(value, NULL, kbd->tty);
+                                handle_sysrq(value, kbd->tty);
                                 return;
                         }
                         if (value == '-') {
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 1e3939aeb8ab..4362ff260244 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -26,6 +26,7 @@
 #define MONWRITE_MAX_DATALEN    4024
 
 static int mon_max_bufs = 255;
+static int mon_buf_count;
 
 struct mon_buf {
         struct list_head list;
@@ -40,7 +41,6 @@ struct mon_private {
         size_t hdr_to_read;
         size_t data_to_read;
         struct mon_buf *current_buf;
-        int mon_buf_count;
 };
 
 /*
@@ -99,13 +99,13 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
                         rc = monwrite_diag(monhdr, monbuf->data,
                                            APPLDATA_STOP_REC);
                         list_del(&monbuf->list);
-                        monpriv->mon_buf_count--;
+                        mon_buf_count--;
                         kfree(monbuf->data);
                         kfree(monbuf);
                         monbuf = NULL;
                 }
         } else {
-                if (monpriv->mon_buf_count >= mon_max_bufs)
+                if (mon_buf_count >= mon_max_bufs)
                         return -ENOSPC;
                 monbuf = kzalloc(sizeof(struct mon_buf), GFP_KERNEL);
                 if (!monbuf)
@@ -118,7 +118,7 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
                 }
                 monbuf->hdr = *monhdr;
                 list_add_tail(&monbuf->list, &monpriv->list);
-                monpriv->mon_buf_count++;
+                mon_buf_count++;
         }
         monpriv->current_buf = monbuf;
         return 0;
@@ -186,7 +186,7 @@ static int monwrite_close(struct inode *inode, struct file *filp)
                 if (entry->hdr.mon_function != MONWRITE_GEN_EVENT)
                         monwrite_diag(&entry->hdr, entry->data,
                                       APPLDATA_STOP_REC);
-                monpriv->mon_buf_count--;
+                mon_buf_count--;
                 list_del(&entry->list);
                 kfree(entry->data);
                 kfree(entry);
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 31e335751d6d..8a056df09d6b 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -324,7 +324,7 @@ __sclp_find_req(u32 sccb)
  * Prepare read event data request if necessary. Start processing of next
  * request on queue. */
 static void
-sclp_interrupt_handler(struct pt_regs *regs, __u16 code)
+sclp_interrupt_handler(__u16 code)
 {
         struct sclp_req *req;
         u32 finished_sccb;
@@ -743,7 +743,7 @@ EXPORT_SYMBOL(sclp_reactivate);
 /* Handler for external interruption used during initialization. Modify
  * request state to done. */
 static void
-sclp_check_handler(struct pt_regs *regs, __u16 code)
+sclp_check_handler(__u16 code)
 {
         u32 finished_sccb;
 
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 3bb4e472d73d..07c7f19339d2 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -200,11 +200,13 @@ css_get_ssd_info(struct subchannel *sch)
         spin_unlock_irq(&sch->lock);
         free_page((unsigned long)page);
         if (!ret) {
-                int j, chpid;
+                int j, chpid, mask;
                 /* Allocate channel path structures, if needed. */
                 for (j = 0; j < 8; j++) {
+                        mask = 0x80 >> j;
                         chpid = sch->ssd_info.chpid[j];
-                        if (chpid && (get_chp_status(chpid) < 0))
+                        if ((sch->schib.pmcw.pim & mask) &&
+                            (get_chp_status(chpid) < 0))
                             new_channel_path(chpid);
                 }
         }
@@ -222,13 +224,15 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
 
         sch = to_subchannel(dev);
         chpid = data;
-        for (j = 0; j < 8; j++)
-                if (sch->schib.pmcw.chpid[j] == chpid->id)
+        for (j = 0; j < 8; j++) {
+                mask = 0x80 >> j;
+                if ((sch->schib.pmcw.pim & mask) &&
+                    (sch->schib.pmcw.chpid[j] == chpid->id))
                         break;
+        }
         if (j >= 8)
                 return 0;
 
-        mask = 0x80 >> j;
         spin_lock_irq(&sch->lock);
 
         stsch(sch->schid, &schib);
@@ -620,7 +624,7 @@ __chp_add_new_sch(struct subchannel_id schid)
 static int
 __chp_add(struct subchannel_id schid, void *data)
 {
-        int i;
+        int i, mask;
         struct channel_path *chp;
         struct subchannel *sch;
 
@@ -630,8 +634,10 @@ __chp_add(struct subchannel_id schid, void *data)
                 /* Check if the subchannel is now available. */
                 return __chp_add_new_sch(schid);
         spin_lock_irq(&sch->lock);
-        for (i=0; i<8; i++)
-                if (sch->schib.pmcw.chpid[i] == chp->id) {
+        for (i=0; i<8; i++) {
+                mask = 0x80 >> i;
+                if ((sch->schib.pmcw.pim & mask) &&
+                    (sch->schib.pmcw.chpid[i] == chp->id)) {
                         if (stsch(sch->schid, &sch->schib) != 0) {
                                 /* Endgame. */
                                 spin_unlock_irq(&sch->lock);
@@ -639,6 +645,7 @@ __chp_add(struct subchannel_id schid, void *data)
                         }
                         break;
                 }
+        }
         if (i==8) {
                 spin_unlock_irq(&sch->lock);
                 return 0;
@@ -646,7 +653,7 @@ __chp_add(struct subchannel_id schid, void *data)
         sch->lpm = ((sch->schib.pmcw.pim &
                      sch->schib.pmcw.pam &
                      sch->schib.pmcw.pom)
-                    | 0x80 >> i) & sch->opm;
+                    | mask) & sch->opm;
 
         if (sch->driver && sch->driver->verify)
                 sch->driver->verify(&sch->dev);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 2e2882daefbb..f18b1623cad7 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -19,6 +19,7 @@
 #include <asm/cio.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
+#include <asm/irq_regs.h>
 #include <asm/setup.h>
 #include "airq.h"
 #include "cio.h"
@@ -606,15 +607,17 @@ do_IRQ (struct pt_regs *regs)
         struct tpi_info *tpi_info;
         struct subchannel *sch;
         struct irb *irb;
+        struct pt_regs *old_regs;
 
         irq_enter ();
+        old_regs = set_irq_regs(regs);
         asm volatile ("mc 0,0");
         if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)
                 /**
                  * Make sure that the i/o interrupt did not "overtake"
                  * the last HZ timer interrupt.
                  */
-                account_ticks(regs);
+                account_ticks();
         /*
          * Get interrupt information from lowcore
          */
@@ -652,6 +655,7 @@ do_IRQ (struct pt_regs *regs)
                  * out of the sie which costs more cycles than it saves.
                  */
         } while (!MACHINE_IS_VM && tpi (NULL) != 0);
+        set_irq_regs(old_regs);
         irq_exit ();
 }
 
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index cd30f37fceae..c5ccd20b110c 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -1062,7 +1062,7 @@ static int ap_poll_thread(void *data)
         unsigned long flags;
         int requests;
 
-        set_user_nice(current, -20);
+        set_user_nice(current, 19);
         while (1) {
                 if (need_resched()) {
                         schedule();
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index 809dd8d7f47a..1476ce2b437c 100644
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -116,7 +116,7 @@ static DEFINE_SPINLOCK(iucv_irq_queue_lock);
  *Internal function prototypes
  */
 static void iucv_tasklet_handler(unsigned long);
-static void iucv_irq_handler(struct pt_regs *, __u16);
+static void iucv_irq_handler(__u16);
 
 static DECLARE_TASKLET(iucv_tasklet,iucv_tasklet_handler,0);
 
@@ -2251,7 +2251,7 @@ iucv_sever(__u16 pathid, __u8 user_data[16])
  * Places the interrupt buffer on a queue and schedules iucv_tasklet_handler().
  */
 static void
-iucv_irq_handler(struct pt_regs *regs, __u16 code)
+iucv_irq_handler(__u16 code)
 {
         iucv_irqdata *irqdata;
 
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 862a411a4aa0..c88babce9bca 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1987,7 +1987,7 @@ zfcp_erp_adapter_strategy_open_qdio(struct zfcp_erp_action *erp_action)
                 sbale = &(adapter->response_queue.buffer[i]->element[0]);
                 sbale->length = 0;
                 sbale->flags = SBAL_FLAGS_LAST_ENTRY;
-                sbale->addr = 0;
+                sbale->addr = NULL;
         }
 
         ZFCP_LOG_TRACE("calling do_QDIO on adapter %s (flags=0x%x, "