Use "__ARM32_ASM_BITOPS__" to avoid redefine functions declared in hypervisor/arch/arm/include/asm/bitops.h when building for AArch32.
Signed-off-by: Alice Guo <[email protected]> --- hypervisor/arch/arm/include/asm/bitops.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hypervisor/arch/arm/include/asm/bitops.h b/hypervisor/arch/arm/include/asm/bitops.h index 67aee781..2940ae16 100644 --- a/hypervisor/arch/arm/include/asm/bitops.h +++ b/hypervisor/arch/arm/include/asm/bitops.h @@ -13,6 +13,10 @@ */ /* also include from arm-common */ + +#ifndef __ARM32_ASM_BITOPS__ +#define __ARM32_ASM_BITOPS__ + #include_next <asm/bitops.h> static inline int atomic_test_and_set_bit(int nr, volatile unsigned long *addr) @@ -42,3 +46,4 @@ static inline int atomic_test_and_set_bit(int nr, volatile unsigned long *addr) return !!(test); } +#endif -- 2.17.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]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/20200811181641.7282-4-alice.guo%40nxp.com.
