Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 34 insertions, 0 deletions

diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index fac06155773f..4d80fc67a06b 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -3,6 +3,8 @@
 
 #include <asm/chpid.h>
 #include <asm/schid.h>
+#include "orb.h"
+#include "cio.h"
 
 /*
  * TPI info structure
@@ -87,6 +89,38 @@ static inline int tsch(struct subchannel_id schid, struct irb *addr)
         return ccode;
 }
 
+static inline int ssch(struct subchannel_id schid, union orb *addr)
+{
+        register struct subchannel_id reg1 asm("1") = schid;
+        int ccode = -EIO;
+
+        asm volatile(
+                "       ssch    0(%2)\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : "+d" (ccode)
+                : "d" (reg1), "a" (addr), "m" (*addr)
+                : "cc", "memory");
+        return ccode;
+}
+
+static inline int csch(struct subchannel_id schid)
+{
+        register struct subchannel_id reg1 asm("1") = schid;
+        int ccode;
+
+        asm volatile(
+                "       csch\n"
+                "       ipm     %0\n"
+                "       srl     %0,28"
+                : "=d" (ccode)
+                : "d" (reg1)
+                : "cc");
+        return ccode;
+}
+
 static inline int tpi(struct tpi_info *addr)
 {
         int ccode;