ARM64 supports more than 32 bit. Change datatypes for the program counter accordingly.
Signed-off-by: Ralf Ramsauer <[email protected]> --- hypervisor/arch/arm64/control.c | 2 +- hypervisor/arch/arm64/include/asm/control.h | 2 +- hypervisor/arch/arm64/include/asm/percpu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hypervisor/arch/arm64/control.c b/hypervisor/arch/arm64/control.c index 788ebc63..d829e4ec 100644 --- a/hypervisor/arch/arm64/control.c +++ b/hypervisor/arch/arm64/control.c @@ -18,7 +18,7 @@ #include <asm/psci.h> #include <asm/traps.h> -void arm_cpu_reset(unsigned long pc) +void arm_cpu_reset(unsigned long long pc) { struct per_cpu *cpu_data = this_cpu_data(); struct registers *regs = guest_regs(cpu_data); diff --git a/hypervisor/arch/arm64/include/asm/control.h b/hypervisor/arch/arm64/include/asm/control.h index 014c3d7a..b14914cf 100644 --- a/hypervisor/arch/arm64/include/asm/control.h +++ b/hypervisor/arch/arm64/include/asm/control.h @@ -35,7 +35,7 @@ unsigned int arm_cpu_by_mpidr(struct cell *cell, unsigned long mpidr); void __attribute__((noreturn)) vmreturn(struct registers *guest_regs); void __attribute__((noreturn)) shutdown_el2(struct per_cpu *cpu_data); -void arm_cpu_reset(unsigned long pc); +void arm_cpu_reset(unsigned long long pc); void arm_cpu_park(void); void arm_cpu_kick(unsigned int cpu_id); diff --git a/hypervisor/arch/arm64/include/asm/percpu.h b/hypervisor/arch/arm64/include/asm/percpu.h index e0ffa234..6eee05e3 100644 --- a/hypervisor/arch/arm64/include/asm/percpu.h +++ b/hypervisor/arch/arm64/include/asm/percpu.h @@ -82,7 +82,7 @@ struct per_cpu { * host physical <-> guest physical memory mappings. */ bool flush_vcpu_caches; - unsigned long cpu_on_entry; + unsigned long long cpu_on_entry; unsigned long cpu_on_context; } __attribute__((aligned(PAGE_SIZE))); -- 2.14.1 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
