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

diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 1242e7435647d310d42a4b165f60175a3e3b19f9..c623888029fbf3aabddaa213a67b7f7fbd76137e 100644 (file)
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -76,7 +76,7 @@ int main(void)
        OFFSET(__LC_EXT_CPU_ADDR, lowcore, ext_cpu_addr);
        OFFSET(__LC_EXT_INT_CODE, lowcore, ext_int_code);
        OFFSET(__LC_PGM_ILC, lowcore, pgm_ilc);
-       OFFSET(__LC_PGM_INT_CODE, lowcore, pgm_code);
+       OFFSET(__LC_PGM_CODE, lowcore, pgm_code);
        OFFSET(__LC_DATA_EXC_CODE, lowcore, data_exc_code);
        OFFSET(__LC_MON_CLASS_NR, lowcore, mon_class_num);
        OFFSET(__LC_PER_CODE, lowcore, per_code);

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 2c1f69760e7e0f300ed96ad9b9bd10a97738eae7..beb96989c661e0afb9add75bbdc2506da87a323b 100644 (file)
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -949,8 +949,7 @@ static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)
        rc |= put_guest_lc(vcpu, ilen, (u16 *) __LC_PGM_ILC);
        rc |= put_guest_lc(vcpu, vcpu->arch.sie_block->gbea,
                                 (u64 *) __LC_PGM_LAST_BREAK);
-       rc |= put_guest_lc(vcpu, pgm_info.code,
-                          (u16 *)__LC_PGM_INT_CODE);
+       rc |= put_guest_lc(vcpu, pgm_info.code, (u16 *)__LC_PGM_CODE);
        rc |= write_guest_lc(vcpu, __LC_PGM_OLD_PSW,
                             &vcpu->arch.sie_block->gpsw, sizeof(psw_t));
        rc |= read_guest_lc(vcpu, __LC_PGM_NEW_PSW,