diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2025-02-07 15:49:04 +0100 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2025-03-04 17:18:07 +0100 |
| commit | 9b06500008d0f73fede024cffe2263b8dc91e30d (patch) | |
| tree | 461414bfdacae316b34ff9715573fd5b99d5da21 /arch/s390/kernel/sysinfo.c | |
| parent | s390/diag: Convert MACHINE_HAS_DIAG9C to machine_has_diag9c() (diff) | |
| download | linux-9b06500008d0f73fede024cffe2263b8dc91e30d.tar.gz linux-9b06500008d0f73fede024cffe2263b8dc91e30d.zip | |
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>
Diffstat (limited to 'arch/s390/kernel/sysinfo.c')
| -rw-r--r-- | arch/s390/kernel/sysinfo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c index a74154c6529e..a592f9509ce8 100644 --- 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), |