Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 413d4047 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/traps: print interrupt code and instruction length code 



It always confuses me to see the mixed instruction length code and
interruption code on user space faults, while the message clearly
says it is the interruption code.
So split the value and print both values separately. Also add the ILC
output to the die() message, so thar user and kernel space faults
contain the same information.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 4eafad7f

arch/s390/kernel/dumpstack.c

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ void die(struct pt_regs *regs, const char *str) 
	console_verbose();

	spin_lock_irq(&die_lock);

	bust_spinlocks(1);

	printk("%s: %04x [#%d] ", str, regs->int_code & 0xffff, ++die_counter);

	printk("%s: %04x ilc:%d [#%d] ", str, regs->int_code & 0xffff,

	       regs->int_code >> 17, ++die_counter);

#ifdef CONFIG_PREEMPT

	printk("PREEMPT ");

#endif

arch/s390/kernel/traps.c

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ static inline void report_user_fault(struct pt_regs *regs, int signr) 
		return;

	if (!printk_ratelimit())

		return;

	printk("User process fault: interruption code 0x%X ", regs->int_code);

	printk("User process fault: interruption code %04x ilc:%d ",

	       regs->int_code & 0xffff, regs->int_code >> 17);

	print_vma_addr("in ", regs->psw.addr & PSW_ADDR_INSN);

	printk("\n");

	show_regs(regs);

arch/s390/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -261,8 +261,8 @@ static inline void report_user_fault(struct pt_regs *regs, long signr) 
		return;

	if (!printk_ratelimit())

		return;

	printk(KERN_ALERT "User process fault: interruption code 0x%X ",

	       regs->int_code);

	printk(KERN_ALERT "User process fault: interruption code %04x ilc:%d",

	       regs->int_code & 0xffff, regs->int_code >> 17);

	print_vma_addr(KERN_CONT "in ", regs->psw.addr & PSW_ADDR_INSN);

	printk(KERN_CONT "\n");

	printk(KERN_ALERT "failing address: %016lx TEID: %016lx\n",