s390/uprobes: Use __forward_psw() instead of private implementation

With adjust_psw_addr() the uprobes code contains more or less a private
__forward_psw() implementation. Switch it to use __forward_psw(), and
remove adjust_psw_addr().

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kernel/uprobes.c b/arch/s390/kernel/uprobes.c
index 5b0633ea8d93d1f088c0d54897afded431157a19..a91b4fd01bf44720377d597117bcac2d56a0917a 100644 (file)
--- a/arch/s390/kernel/uprobes.c
+++ b/arch/s390/kernel/uprobes.c
@@ -161,11 +161,6 @@ bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check ctx,
 
 /* Instruction Emulation */
 
-static void adjust_psw_addr(psw_t *psw, unsigned long len)
-{
-       psw->addr = __rewind_psw(*psw, -len);
-}
-
 #define EMU_ILLEGAL_OP         1
 #define EMU_SPECIFICATION      2
 #define EMU_ADDRESSING         3
@@ -353,7 +348,7 @@ static void handle_insn_ril(struct arch_uprobe *auprobe, struct pt_regs *regs)
                }
                break;
        }
-       adjust_psw_addr(&regs->psw, ilen);
+       regs->psw.addr = __forward_psw(regs->psw, ilen);
        switch (rc) {
        case EMU_ILLEGAL_OP:
                regs->int_code = ilen << 16 | 0x0001;