tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

authored by

Sven Schnelle and committed by
Vasily Gorbik 26c21aa4 c8f573ec

+6 -6
+2 -2
arch/s390/boot/pgm_check_info.c
··· 175 175 gpregs[12], gpregs[13], gpregs[14], gpregs[15]); 176 176 print_stacktrace(); 177 177 decompressor_printk("Last Breaking-Event-Address:\n"); 178 - decompressor_printk(" [<%016lx>] %pS\n", (unsigned long)S390_lowcore.breaking_event_addr, 179 - (void *)S390_lowcore.breaking_event_addr); 178 + decompressor_printk(" [<%016lx>] %pS\n", (unsigned long)S390_lowcore.pgm_last_break, 179 + (void *)S390_lowcore.pgm_last_break); 180 180 }
+1 -1
arch/s390/include/asm/lowcore.h
··· 65 65 __u32 external_damage_code; /* 0x00f4 */ 66 66 __u64 failing_storage_address; /* 0x00f8 */ 67 67 __u8 pad_0x0100[0x0110-0x0100]; /* 0x0100 */ 68 - __u64 breaking_event_addr; /* 0x0110 */ 68 + __u64 pgm_last_break; /* 0x0110 */ 69 69 __u8 pad_0x0118[0x0120-0x0118]; /* 0x0118 */ 70 70 psw_t restart_old_psw; /* 0x0120 */ 71 71 psw_t external_old_psw; /* 0x0130 */
+1 -1
arch/s390/kernel/asm-offsets.c
··· 78 78 OFFSET(__LC_MCCK_CODE, lowcore, mcck_interruption_code); 79 79 OFFSET(__LC_EXT_DAMAGE_CODE, lowcore, external_damage_code); 80 80 OFFSET(__LC_MCCK_FAIL_STOR_ADDR, lowcore, failing_storage_address); 81 - OFFSET(__LC_LAST_BREAK, lowcore, breaking_event_addr); 81 + OFFSET(__LC_PGM_LAST_BREAK, lowcore, pgm_last_break); 82 82 OFFSET(__LC_RETURN_LPSWE, lowcore, return_lpswe); 83 83 OFFSET(__LC_RETURN_MCCK_LPSWE, lowcore, return_mcck_lpswe); 84 84 OFFSET(__LC_RST_OLD_PSW, lowcore, restart_old_psw);
+1 -1
arch/s390/kernel/traps.c
··· 300 300 301 301 void noinstr __do_pgm_check(struct pt_regs *regs) 302 302 { 303 - unsigned long last_break = S390_lowcore.breaking_event_addr; 303 + unsigned long last_break = S390_lowcore.pgm_last_break; 304 304 unsigned int trapnr; 305 305 irqentry_state_t state; 306 306
+1 -1
arch/s390/kvm/interrupt.c
··· 960 960 /* bit 1+2 of the target are the ilc, so we can directly use ilen */ 961 961 rc |= put_guest_lc(vcpu, ilen, (u16 *) __LC_PGM_ILC); 962 962 rc |= put_guest_lc(vcpu, vcpu->arch.sie_block->gbea, 963 - (u64 *) __LC_LAST_BREAK); 963 + (u64 *) __LC_PGM_LAST_BREAK); 964 964 rc |= put_guest_lc(vcpu, pgm_info.code, 965 965 (u16 *)__LC_PGM_INT_CODE); 966 966 rc |= write_guest_lc(vcpu, __LC_PGM_OLD_PSW,