Commit 26c21aa4 authored by Sven Schnelle's avatar Sven Schnelle Committed by Vasily Gorbik
Browse files

s390: rename last_break to pgm_last_break 



With the upcoming BEAR enhancements last_break isn't really
unique, so rename it to pgm_last_break. This way it should
be more obvious that this is the last_break value that is
written by the hardware when a program check occurs.

Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent c8f573ec

arch/s390/boot/pgm_check_info.c

+2 −2
Original line number Diff line number Diff line
@@ -175,6 +175,6 @@ void print_pgm_check_info(void) 
			    gpregs[12], gpregs[13], gpregs[14], gpregs[15]);

	print_stacktrace();

	decompressor_printk("Last Breaking-Event-Address:\n");

	decompressor_printk(" [<%016lx>] %pS\n", (unsigned long)S390_lowcore.breaking_event_addr,

			    (void *)S390_lowcore.breaking_event_addr);

	decompressor_printk(" [<%016lx>] %pS\n", (unsigned long)S390_lowcore.pgm_last_break,

			    (void *)S390_lowcore.pgm_last_break);

}

arch/s390/include/asm/lowcore.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct lowcore { 
	__u32	external_damage_code;		/* 0x00f4 */

	__u64	failing_storage_address;	/* 0x00f8 */

	__u8	pad_0x0100[0x0110-0x0100];	/* 0x0100 */

	__u64	breaking_event_addr;		/* 0x0110 */

	__u64	pgm_last_break;			/* 0x0110 */

	__u8	pad_0x0118[0x0120-0x0118];	/* 0x0118 */

	psw_t	restart_old_psw;		/* 0x0120 */

	psw_t	external_old_psw;		/* 0x0130 */

arch/s390/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int main(void) 
	OFFSET(__LC_MCCK_CODE, lowcore, mcck_interruption_code);

	OFFSET(__LC_EXT_DAMAGE_CODE, lowcore, external_damage_code);

	OFFSET(__LC_MCCK_FAIL_STOR_ADDR, lowcore, failing_storage_address);

	OFFSET(__LC_LAST_BREAK, lowcore, breaking_event_addr);

	OFFSET(__LC_PGM_LAST_BREAK, lowcore, pgm_last_break);

	OFFSET(__LC_RETURN_LPSWE, lowcore, return_lpswe);

	OFFSET(__LC_RETURN_MCCK_LPSWE, lowcore, return_mcck_lpswe);

	OFFSET(__LC_RST_OLD_PSW, lowcore, restart_old_psw);

arch/s390/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static void (*pgm_check_table[128])(struct pt_regs *regs); 


void noinstr __do_pgm_check(struct pt_regs *regs)

{

	unsigned long last_break = S390_lowcore.breaking_event_addr;

	unsigned long last_break = S390_lowcore.pgm_last_break;

	unsigned int trapnr;

	irqentry_state_t state;

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ static int __must_check __deliver_prog(struct kvm_vcpu *vcpu) 
	/* bit 1+2 of the target are the ilc, so we can directly use ilen */

	rc |= put_guest_lc(vcpu, ilen, (u16 *) __LC_PGM_ILC);

	rc |= put_guest_lc(vcpu, vcpu->arch.sie_block->gbea,

				 (u64 *) __LC_LAST_BREAK);

				 (u64 *) __LC_PGM_LAST_BREAK);

	rc |= put_guest_lc(vcpu, pgm_info.code,

			   (u16 *)__LC_PGM_INT_CODE);

	rc |= write_guest_lc(vcpu, __LC_PGM_OLD_PSW,