Skip to content

Commit b69b47a

Browse files
t-8chKAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent 0704bf4 commit b69b47a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm64/include/asm/cache.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define ARCH_DMA_MINALIGN (128)
3636
#define ARCH_KMALLOC_MINALIGN (8)
3737

38-
#ifndef __ASSEMBLY__
38+
#if !defined(__ASSEMBLY__) && !defined(BUILD_VDSO)
3939

4040
#include <linux/bitops.h>
4141
#include <linux/kasan-enabled.h>
@@ -118,6 +118,6 @@ static inline u32 __attribute_const__ read_cpuid_effective_cachetype(void)
118118
return ctr;
119119
}
120120

121-
#endif /* __ASSEMBLY__ */
121+
#endif /* !defined(__ASSEMBLY__) && !defined(BUILD_VDSO) */
122122

123123
#endif

0 commit comments

Comments
 (0)