aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>2025-03-03 12:11:04 +0100
committerThomas Gleixner <tglx@linutronix.de>2025-03-08 14:37:39 +0100
commitb69b47a6b5f67ac1074e0a6baac7f07bdc3dceed (patch)
treeb2d5f12a808bcd148c50cabd8b71539377994ac5
parentvdso: Introduce vdso/cache.h (diff)
downloadwireguard-linux-b69b47a6b5f67ac1074e0a6baac7f07bdc3dceed.tar.xz
wireguard-linux-b69b47a6b5f67ac1074e0a6baac7f07bdc3dceed.zip
arm64: Make asm/cache.h compatible with vDSO
asm/cache.h can be used during the vDSO build through vdso/cache.h. Not all definitions in it are compatible with the vDSO, especially the compat vDSO. Hide the more complex definitions from the vDSO build. Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20250303-vdso-clock-v1-2-c1b5c69a166f@linutronix.de
-rw-r--r--arch/arm64/include/asm/cache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h
index 06a4670bdb0b..99cd6546e72e 100644
--- a/arch/arm64/include/asm/cache.h
+++ b/arch/arm64/include/asm/cache.h
@@ -35,7 +35,7 @@
#define ARCH_DMA_MINALIGN (128)
#define ARCH_KMALLOC_MINALIGN (8)
-#ifndef __ASSEMBLY__
+#if !defined(__ASSEMBLY__) && !defined(BUILD_VDSO)
#include <linux/bitops.h>
#include <linux/kasan-enabled.h>
@@ -118,6 +118,6 @@ static inline u32 __attribute_const__ read_cpuid_effective_cachetype(void)
return ctr;
}
-#endif /* __ASSEMBLY__ */
+#endif /* !defined(__ASSEMBLY__) && !defined(BUILD_VDSO) */
#endif