s390/sysinfo: Remove exception handling from __stsi()

The exception handling for __stsi() was added in 2001 when it still was
possible to run Linux on systems without LPAR hypervisor, and therefore
without an stsi instruction. Given that this is not supported anymore
remove the exception handling from the __stsi() inline assembly.

Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
index a74154c6529eb2040185f5db069605e722b4cd60..a592f9509ce874fc909ed556ae3039fb779bfa9c 100644 (file)
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
@@ -34,10 +34,9 @@ static inline int __stsi(void *sysinfo, int fc, int sel1, int sel2, int *lvl)
                "       lr      0,%[r0]\n"
                "       lr      1,%[r1]\n"
                "       stsi    0(%[sysinfo])\n"
-               "0:     jz      2f\n"
-               "1:     lhi     %[rc],%[retval]\n"
-               "2:     lr      %[r0],0\n"
-               EX_TABLE(0b, 1b)
+               "       jz      0f\n"
+               "       lhi     %[rc],%[retval]\n"
+               "0:     lr      %[r0],0\n"
                : [r0] "+d" (r0), [rc] "+d" (rc)
                : [r1] "d" (sel2),
                  [sysinfo] "a" (sysinfo),