From: Jan Kiszka <[email protected]> This new header contains everything that mmu_hyp.c exports, while setup.h suggested to be related to setup.c.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm/include/asm/control.h | 2 -- hypervisor/arch/arm/include/asm/{setup.h => mmu_hyp.h} | 8 +------- hypervisor/arch/arm/mmu_hyp.c | 2 +- hypervisor/arch/arm/setup.c | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) rename hypervisor/arch/arm/include/asm/{setup.h => mmu_hyp.h} (71%) diff --git a/hypervisor/arch/arm/include/asm/control.h b/hypervisor/arch/arm/include/asm/control.h index fd3bea03..0b7cb371 100644 --- a/hypervisor/arch/arm/include/asm/control.h +++ b/hypervisor/arch/arm/include/asm/control.h @@ -36,8 +36,6 @@ void arch_shutdown_self(struct per_cpu *cpu_data); unsigned int arm_cpu_by_mpidr(struct cell *cell, unsigned long mpidr); -void __attribute__((noreturn)) arch_shutdown_mmu(struct per_cpu *cpu_data); - void arm_cpu_reset(unsigned long pc); void arm_cpu_park(void); void arm_cpu_kick(unsigned int cpu_id); diff --git a/hypervisor/arch/arm/include/asm/setup.h b/hypervisor/arch/arm/include/asm/mmu_hyp.h similarity index 71% rename from hypervisor/arch/arm/include/asm/setup.h rename to hypervisor/arch/arm/include/asm/mmu_hyp.h index a4d927c0..9a78ac4a 100644 --- a/hypervisor/arch/arm/include/asm/setup.h +++ b/hypervisor/arch/arm/include/asm/mmu_hyp.h @@ -10,14 +10,8 @@ * the COPYING file in the top-level directory. */ -#ifndef _JAILHOUSE_ASM_SETUP_H -#define _JAILHOUSE_ASM_SETUP_H - #include <asm/percpu.h> -#ifndef __ASSEMBLY__ - int switch_exception_level(struct per_cpu *cpu_data); -#endif /* !__ASSEMBLY__ */ -#endif /* !_JAILHOUSE_ASM_SETUP_H */ +void __attribute__((noreturn)) arch_shutdown_mmu(struct per_cpu *cpu_data); diff --git a/hypervisor/arch/arm/mmu_hyp.c b/hypervisor/arch/arm/mmu_hyp.c index aa58fbbb..5fd778a6 100644 --- a/hypervisor/arch/arm/mmu_hyp.c +++ b/hypervisor/arch/arm/mmu_hyp.c @@ -13,7 +13,7 @@ #include <jailhouse/paging.h> #include <jailhouse/printk.h> #include <asm/entry.h> -#include <asm/setup.h> +#include <asm/mmu_hyp.h> #include <asm/sysregs.h> /* This is only used if we use the new hyp-stub ABI that was introduced in diff --git a/hypervisor/arch/arm/setup.c b/hypervisor/arch/arm/setup.c index 997bf438..03a0b75a 100644 --- a/hypervisor/arch/arm/setup.c +++ b/hypervisor/arch/arm/setup.c @@ -16,7 +16,7 @@ #include <jailhouse/string.h> #include <asm/control.h> #include <asm/mach.h> -#include <asm/setup.h> +#include <asm/mmu_hyp.h> #include <asm/setup-common.h> #include <asm/sysregs.h> -- 2.12.3 -- 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.
