1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index b6a3a443fbde..296c9b66c04a 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -96,16 +96,16 @@
        EXCEPTION_PROLOG_PSERIES_1(label, h);
 #define __KVMTEST(n)                                                    \
-        lbz     r10,PACA_KVM_SVCPU+SVCPU_IN_GUEST(r13);                 \
+        lbz     r10,HSTATE_IN_GUEST(r13);                       \
        cmpwi   r10,0;                                                  \
        bne     do_kvm_##n
 #define __KVM_HANDLER(area, h, n)                                       \
 do_kvm_##n:                                                             \
        ld      r10,area+EX_R10(r13);                                   \
-        stw     r9,PACA_KVM_SVCPU+SVCPU_SCRATCH1(r13);                  \
+        stw     r9,HSTATE_SCRATCH1(r13);                        \
        ld      r9,area+EX_R9(r13);                                     \
-        std     r12,PACA_KVM_SVCPU+SVCPU_SCRATCH0(r13);                 \
+        std     r12,HSTATE_SCRATCH0(r13);                       \
        li      r12,n;                                                  \
        b       kvmppc_interrupt
@@ -114,9 +114,9 @@ do_kvm_##n:								\
        cmpwi   r10,KVM_GUEST_MODE_SKIP;                                \
        ld      r10,area+EX_R10(r13);                                   \
        beq     89f;                                                    \
-        stw     r9,PACA_KVM_SVCPU+SVCPU_SCRATCH1(r13);                  \
+        stw     r9,HSTATE_SCRATCH1(r13);                        \
        ld      r9,area+EX_R9(r13);                                     \
-        std     r12,PACA_KVM_SVCPU+SVCPU_SCRATCH0(r13);                 \
+        std     r12,HSTATE_SCRATCH0(r13);                       \
        li      r12,n;                                                  \
        b       kvmppc_interrupt;                                       \
 89:     mtocrf  0x80,r9;                                                \

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index b6a3a443fbde..296c9b66c04a 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h
@@ -96,16 +96,16 @@
96	EXCEPTION_PROLOG_PSERIES_1(label, h);	96	EXCEPTION_PROLOG_PSERIES_1(label, h);
97		97
98	#define __KVMTEST(n) \	98	#define __KVMTEST(n) \
99	lbz r10,PACA_KVM_SVCPU+SVCPU_IN_GUEST(r13); \	99	lbz r10,HSTATE_IN_GUEST(r13); \
100	cmpwi r10,0; \	100	cmpwi r10,0; \
101	bne do_kvm_##n	101	bne do_kvm_##n
102		102
103	#define __KVM_HANDLER(area, h, n) \	103	#define __KVM_HANDLER(area, h, n) \
104	do_kvm_##n: \	104	do_kvm_##n: \
105	ld r10,area+EX_R10(r13); \	105	ld r10,area+EX_R10(r13); \
106	stw r9,PACA_KVM_SVCPU+SVCPU_SCRATCH1(r13); \	106	stw r9,HSTATE_SCRATCH1(r13); \
107	ld r9,area+EX_R9(r13); \	107	ld r9,area+EX_R9(r13); \
108	std r12,PACA_KVM_SVCPU+SVCPU_SCRATCH0(r13); \	108	std r12,HSTATE_SCRATCH0(r13); \
109	li r12,n; \	109	li r12,n; \
110	b kvmppc_interrupt	110	b kvmppc_interrupt
111		111
@@ -114,9 +114,9 @@ do_kvm_##n: \
114	cmpwi r10,KVM_GUEST_MODE_SKIP; \	114	cmpwi r10,KVM_GUEST_MODE_SKIP; \
115	ld r10,area+EX_R10(r13); \	115	ld r10,area+EX_R10(r13); \
116	beq 89f; \	116	beq 89f; \
117	stw r9,PACA_KVM_SVCPU+SVCPU_SCRATCH1(r13); \	117	stw r9,HSTATE_SCRATCH1(r13); \
118	ld r9,area+EX_R9(r13); \	118	ld r9,area+EX_R9(r13); \
119	std r12,PACA_KVM_SVCPU+SVCPU_SCRATCH0(r13); \	119	std r12,HSTATE_SCRATCH0(r13); \
120	li r12,n; \	120	li r12,n; \
121	b kvmppc_interrupt; \	121	b kvmppc_interrupt; \
122	89: mtocrf 0x80,r9; \	122	89: mtocrf 0x80,r9; \