Commit a603a003 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

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: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 37450e09

arch/s390/kernel/uprobes.c

+1 −6
Original line number Diff line number Diff line
@@ -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;