1 files changed, 19 insertions, 11 deletions

diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index cc5144b6f9d9..3b6f4adc5094 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -7,11 +7,13 @@
  *
  */
 
+#include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 
+#include <asm/compat.h>
 #include <asm/cio.h>
 #include <asm/chsc.h>
 #include <asm/isc.h>
@@ -50,7 +52,7 @@ static void chsc_subchannel_irq(struct subchannel *sch)
 {
         struct chsc_private *private = sch->private;
         struct chsc_request *request = private->request;
-        struct irb *irb = (struct irb *)__LC_IRB;
+        struct irb *irb = (struct irb *)&S390_lowcore.irb;
 
         CHSC_LOG(4, "irb");
         CHSC_LOG_HEX(4, irb, sizeof(*irb));
@@ -122,7 +124,7 @@ static int chsc_subchannel_prepare(struct subchannel *sch)
          * since we don't have a way to clear the subchannel and
          * cannot disable it with a request running.
          */
-        cc = stsch(sch->schid, &schib);
+        cc = stsch_err(sch->schid, &schib);
         if (!cc && scsw_stctl(&schib.scsw))
                 return -EAGAIN;
         return 0;
@@ -236,7 +238,7 @@ static int chsc_async(struct chsc_async_area *chsc_area,
         int ret = -ENODEV;
         char dbf[10];
 
-        chsc_area->header.key = PAGE_DEFAULT_KEY;
+        chsc_area->header.key = PAGE_DEFAULT_KEY >> 4;
         while ((sch = chsc_get_next_subchannel(sch))) {
                 spin_lock(sch->lock);
                 private = sch->private;
@@ -770,24 +772,30 @@ out_free:
 static long chsc_ioctl(struct file *filp, unsigned int cmd,
                        unsigned long arg)
 {
+        void __user *argp;
+
         CHSC_MSG(2, "chsc_ioctl called, cmd=%x\n", cmd);
+        if (is_compat_task())
+                argp = compat_ptr(arg);
+        else
+                argp = (void __user *)arg;
         switch (cmd) {
         case CHSC_START:
-                return chsc_ioctl_start((void __user *)arg);
+                return chsc_ioctl_start(argp);
         case CHSC_INFO_CHANNEL_PATH:
-                return chsc_ioctl_info_channel_path((void __user *)arg);
+                return chsc_ioctl_info_channel_path(argp);
         case CHSC_INFO_CU:
-                return chsc_ioctl_info_cu((void __user *)arg);
+                return chsc_ioctl_info_cu(argp);
         case CHSC_INFO_SCH_CU:
-                return chsc_ioctl_info_sch_cu((void __user *)arg);
+                return chsc_ioctl_info_sch_cu(argp);
         case CHSC_INFO_CI:
-                return chsc_ioctl_conf_info((void __user *)arg);
+                return chsc_ioctl_conf_info(argp);
         case CHSC_INFO_CCL:
-                return chsc_ioctl_conf_comp_list((void __user *)arg);
+                return chsc_ioctl_conf_comp_list(argp);
         case CHSC_INFO_CPD:
-                return chsc_ioctl_chpd((void __user *)arg);
+                return chsc_ioctl_chpd(argp);
         case CHSC_INFO_DCAL:
-                return chsc_ioctl_dcal((void __user *)arg);
+                return chsc_ioctl_dcal(argp);
         default: /* unknown ioctl number */
                 return -ENOIOCTLCMD;
         }