Oddly enough, the original version of this patch compiles fine with
Thumb, and not ARM...
Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
---
arch/arm/kvm/interrupts_head.S | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S
index 25433fc..ece84d1 100644
--- a/arch/arm/kvm/interrupts_head.S
+++ b/arch/arm/kvm/interrupts_head.S
@@ -136,12 +136,12 @@
* Clobbers *all* registers.
*/
.macro restore_guest_regs
- restore_guest_regs_mode svc, VCPU_SVC_REGS
- restore_guest_regs_mode abt, VCPU_ABT_REGS
- restore_guest_regs_mode und, VCPU_UND_REGS
- restore_guest_regs_mode irq, VCPU_IRQ_REGS
+ restore_guest_regs_mode svc, #VCPU_SVC_REGS
+ restore_guest_regs_mode abt, #VCPU_ABT_REGS
+ restore_guest_regs_mode und, #VCPU_UND_REGS
+ restore_guest_regs_mode irq, #VCPU_IRQ_REGS
- add r1, r0, VCPU_FIQ_REGS
+ add r1, r0, #VCPU_FIQ_REGS
ldm r1, {r2-r9}
msr r8_fiq, r2
msr r9_fiq, r3
@@ -206,10 +206,10 @@
str r3, [r1, #VCPU_CPSR]
@ Store other guest registers
- save_guest_regs_mode svc, VCPU_SVC_REGS
- save_guest_regs_mode abt, VCPU_ABT_REGS
- save_guest_regs_mode und, VCPU_UND_REGS
- save_guest_regs_mode irq, VCPU_IRQ_REGS
+ save_guest_regs_mode svc, #VCPU_SVC_REGS
+ save_guest_regs_mode abt, #VCPU_ABT_REGS
+ save_guest_regs_mode und, #VCPU_UND_REGS
+ save_guest_regs_mode irq, #VCPU_IRQ_REGS
.endm
/* Reads cp15 registers from hardware and stores them in memory
--
1.7.12
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
