Analogously to the C source files, move also the asm headers that are shared between ARM and its 64-bit variant into arm-common. This helps to quickly identify the dual use and reduces the risk of breaking the other side due to incompatible changes.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/{arm => arm-common}/include/asm/asm-defines.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/gic.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/gic_v2.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/irqchip.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/mmio.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/paging_modes.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/psci.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/uart-pl011.h | 0 hypervisor/arch/{arm => arm-common}/include/asm/uart.h | 0 hypervisor/arch/arm/Makefile | 2 ++ hypervisor/arch/arm64/Makefile | 2 +- inmates/Makefile | 4 ++-- scripts/header_check | 8 ++++---- 13 files changed, 9 insertions(+), 7 deletions(-) rename hypervisor/arch/{arm => arm-common}/include/asm/asm-defines.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/gic.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/gic_v2.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/irqchip.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/mmio.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/paging_modes.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/psci.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/uart-pl011.h (100%) rename hypervisor/arch/{arm => arm-common}/include/asm/uart.h (100%) diff --git a/hypervisor/arch/arm/include/asm/asm-defines.h b/hypervisor/arch/arm-common/include/asm/asm-defines.h similarity index 100% rename from hypervisor/arch/arm/include/asm/asm-defines.h rename to hypervisor/arch/arm-common/include/asm/asm-defines.h diff --git a/hypervisor/arch/arm/include/asm/gic.h b/hypervisor/arch/arm-common/include/asm/gic.h similarity index 100% rename from hypervisor/arch/arm/include/asm/gic.h rename to hypervisor/arch/arm-common/include/asm/gic.h diff --git a/hypervisor/arch/arm/include/asm/gic_v2.h b/hypervisor/arch/arm-common/include/asm/gic_v2.h similarity index 100% rename from hypervisor/arch/arm/include/asm/gic_v2.h rename to hypervisor/arch/arm-common/include/asm/gic_v2.h diff --git a/hypervisor/arch/arm/include/asm/irqchip.h b/hypervisor/arch/arm-common/include/asm/irqchip.h similarity index 100% rename from hypervisor/arch/arm/include/asm/irqchip.h rename to hypervisor/arch/arm-common/include/asm/irqchip.h diff --git a/hypervisor/arch/arm/include/asm/mmio.h b/hypervisor/arch/arm-common/include/asm/mmio.h similarity index 100% rename from hypervisor/arch/arm/include/asm/mmio.h rename to hypervisor/arch/arm-common/include/asm/mmio.h diff --git a/hypervisor/arch/arm/include/asm/paging_modes.h b/hypervisor/arch/arm-common/include/asm/paging_modes.h similarity index 100% rename from hypervisor/arch/arm/include/asm/paging_modes.h rename to hypervisor/arch/arm-common/include/asm/paging_modes.h diff --git a/hypervisor/arch/arm/include/asm/psci.h b/hypervisor/arch/arm-common/include/asm/psci.h similarity index 100% rename from hypervisor/arch/arm/include/asm/psci.h rename to hypervisor/arch/arm-common/include/asm/psci.h diff --git a/hypervisor/arch/arm/include/asm/uart-pl011.h b/hypervisor/arch/arm-common/include/asm/uart-pl011.h similarity index 100% rename from hypervisor/arch/arm/include/asm/uart-pl011.h rename to hypervisor/arch/arm-common/include/asm/uart-pl011.h diff --git a/hypervisor/arch/arm/include/asm/uart.h b/hypervisor/arch/arm-common/include/asm/uart.h similarity index 100% rename from hypervisor/arch/arm/include/asm/uart.h rename to hypervisor/arch/arm-common/include/asm/uart.h diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile index e4721c5..2f930cf 100644 --- a/hypervisor/arch/arm/Makefile +++ b/hypervisor/arch/arm/Makefile @@ -10,4 +10,6 @@ # the COPYING file in the top-level directory. # +LINUXINCLUDE += -I$(src)/arch/arm-common/include + KBUILD_CFLAGS += -marm diff --git a/hypervisor/arch/arm64/Makefile b/hypervisor/arch/arm64/Makefile index b78e88b..1eb961d 100644 --- a/hypervisor/arch/arm64/Makefile +++ b/hypervisor/arch/arm64/Makefile @@ -10,4 +10,4 @@ # the COPYING file in the top-level directory. # -LINUXINCLUDE += -I$(src)/arch/arm/include +LINUXINCLUDE += -I$(src)/arch/arm-common/include diff --git a/inmates/Makefile b/inmates/Makefile index c66cb2f..21a37b6 100644 --- a/inmates/Makefile +++ b/inmates/Makefile @@ -17,8 +17,8 @@ INCLUDES := -I$(INMATES_LIB) \ -I$(src)/../hypervisor/arch/$(SRCARCH)/include \ -I$(src)/../hypervisor/include -ifeq ($(SRCARCH),arm64) -INCLUDES += -I$(src)/../hypervisor/arch/arm/include +ifeq ($(subst arm64,arm,$(SRCARCH)),arm) +INCLUDES += -I$(src)/../hypervisor/arch/arm-common/include endif LINUXINCLUDE := diff --git a/scripts/header_check b/scripts/header_check index 6ac54b4..76d637b 100755 --- a/scripts/header_check +++ b/scripts/header_check @@ -15,15 +15,15 @@ if [ "$ARCH" == "" ]; then ARCH=x86 fi -INCLUDE_ARM64= -if [ "$ARCH" == "arm64" ]; then - INCLUDE_ARM64=-Ihypervisor/arch/arm/include +INCLUDE_ARM_COMMON= +if [ "$ARCH" == "arm" ] || [ "$ARCH" == "arm64" ]; then + INCLUDE_ARM_COMMON=-Ihypervisor/arch/arm-common/include fi CFLAGS="-fno-builtin-ffsl -Wall -Wstrict-prototypes -Wtype-limits \ -Wmissing-declarations -Wmissing-prototypes \ -Ihypervisor/arch/$ARCH/include -Ihypervisor/include \ - $INCLUDE_ARM64 $EXTRA_CFLAGS" + $INCLUDE_ARM_COMMON $EXTRA_CFLAGS" test_compile() { -- 2.1.4 -- 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.
