Skip to content

Commit a0a8f2b

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/asm-offsets: Rename __LC_PGM_INT_CODE
Avoid confusion and rename __LC_PGM_INT_CODE since it correlates to the pgm_code member of struct lowcore, and not the pgm_int_code member. Reviewed-by: Alexander Gordeev <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent b337f6a commit a0a8f2b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

arch/s390/kernel/asm-offsets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ int main(void)
7676
OFFSET(__LC_EXT_CPU_ADDR, lowcore, ext_cpu_addr);
7777
OFFSET(__LC_EXT_INT_CODE, lowcore, ext_int_code);
7878
OFFSET(__LC_PGM_ILC, lowcore, pgm_ilc);
79-
OFFSET(__LC_PGM_INT_CODE, lowcore, pgm_code);
79+
OFFSET(__LC_PGM_CODE, lowcore, pgm_code);
8080
OFFSET(__LC_DATA_EXC_CODE, lowcore, data_exc_code);
8181
OFFSET(__LC_MON_CLASS_NR, lowcore, mon_class_num);
8282
OFFSET(__LC_PER_CODE, lowcore, per_code);

arch/s390/kvm/interrupt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,8 +949,7 @@ static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)
949949
rc |= put_guest_lc(vcpu, ilen, (u16 *) __LC_PGM_ILC);
950950
rc |= put_guest_lc(vcpu, vcpu->arch.sie_block->gbea,
951951
(u64 *) __LC_PGM_LAST_BREAK);
952-
rc |= put_guest_lc(vcpu, pgm_info.code,
953-
(u16 *)__LC_PGM_INT_CODE);
952+
rc |= put_guest_lc(vcpu, pgm_info.code, (u16 *)__LC_PGM_CODE);
954953
rc |= write_guest_lc(vcpu, __LC_PGM_OLD_PSW,
955954
&vcpu->arch.sie_block->gpsw, sizeof(psw_t));
956955
rc |= read_guest_lc(vcpu, __LC_PGM_NEW_PSW,

0 commit comments

Comments
 (0)