diff options
| author | Will Deacon <will@kernel.org> | 2021-10-29 12:25:38 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-10-29 12:25:38 +0100 |
| commit | b2909a447ec3f3713b142bf8592733f51e4661fc (patch) | |
| tree | 1155ba3912a44b8194b1a135341e98a88c718e6b /arch/arm64/include/asm | |
| parent | e5f521021279dfc52c03c8a1c3f6159c2add1f74 (diff) | |
| parent | 3e6f8d1fa18457d54b20917bd9174d27daf09ab9 (diff) | |
Merge branch 'for-next/vdso' into for-next/core
* for-next/vdso:
arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd
arm64: vdso32: suppress error message for 'make mrproper'
arm64: vdso32: drop test for -march=armv8-a
arm64: vdso32: drop the test for dmb ishld
Diffstat (limited to 'arch/arm64/include/asm')
| -rw-r--r-- | arch/arm64/include/asm/vdso/compat_barrier.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm64/include/asm/vdso/compat_barrier.h b/arch/arm64/include/asm/vdso/compat_barrier.h index 3fd8fd6d8fc2..3ac35f4a667c 100644 --- a/arch/arm64/include/asm/vdso/compat_barrier.h +++ b/arch/arm64/include/asm/vdso/compat_barrier.h @@ -20,16 +20,9 @@ #define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory") -#if __LINUX_ARM_ARCH__ >= 8 && defined(CONFIG_AS_DMB_ISHLD) #define aarch32_smp_mb() dmb(ish) #define aarch32_smp_rmb() dmb(ishld) #define aarch32_smp_wmb() dmb(ishst) -#else -#define aarch32_smp_mb() dmb(ish) -#define aarch32_smp_rmb() aarch32_smp_mb() -#define aarch32_smp_wmb() dmb(ishst) -#endif - #undef smp_mb #undef smp_rmb |