From: Jan Kiszka <[email protected]> The namespace is now free, so let's use it.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm-common/include/asm/{setup-common.h => setup.h} | 0 hypervisor/arch/arm-common/setup.c | 2 +- hypervisor/arch/arm/setup.c | 2 +- hypervisor/arch/arm64/setup.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename hypervisor/arch/arm-common/include/asm/{setup-common.h => setup.h} (100%) diff --git a/hypervisor/arch/arm-common/include/asm/setup-common.h b/hypervisor/arch/arm-common/include/asm/setup.h similarity index 100% rename from hypervisor/arch/arm-common/include/asm/setup-common.h rename to hypervisor/arch/arm-common/include/asm/setup.h diff --git a/hypervisor/arch/arm-common/setup.c b/hypervisor/arch/arm-common/setup.c index 16b8ea4d..bb5dd6da 100644 --- a/hypervisor/arch/arm-common/setup.c +++ b/hypervisor/arch/arm-common/setup.c @@ -13,7 +13,7 @@ #include <jailhouse/control.h> #include <jailhouse/paging.h> #include <jailhouse/processor.h> -#include <asm/setup-common.h> +#include <asm/setup.h> static u32 __attribute__((aligned(PAGE_SIZE))) parking_code[PAGE_SIZE / 4] = { ARM_PARKING_CODE diff --git a/hypervisor/arch/arm/setup.c b/hypervisor/arch/arm/setup.c index 03a0b75a..c466ae1e 100644 --- a/hypervisor/arch/arm/setup.c +++ b/hypervisor/arch/arm/setup.c @@ -17,7 +17,7 @@ #include <asm/control.h> #include <asm/mach.h> #include <asm/mmu_hyp.h> -#include <asm/setup-common.h> +#include <asm/setup.h> #include <asm/sysregs.h> unsigned int cache_line_size; diff --git a/hypervisor/arch/arm64/setup.c b/hypervisor/arch/arm64/setup.c index f304a4e1..832c8b7f 100644 --- a/hypervisor/arch/arm64/setup.c +++ b/hypervisor/arch/arm64/setup.c @@ -18,7 +18,7 @@ #include <asm/control.h> #include <asm/entry.h> #include <asm/irqchip.h> -#include <asm/setup-common.h> +#include <asm/setup.h> extern u8 __trampoline_start[]; -- 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.
