Commit-ID: 6a5b78b32d10cd7901f639870eca304b270769f9 Gitweb: https://git.kernel.org/tip/6a5b78b32d10cd7901f639870eca304b270769f9 Author: Catalin Marinas <catalin.mari...@arm.com> AuthorDate: Mon, 24 Jun 2019 15:00:19 +0100 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Wed, 26 Jun 2019 07:28:10 +0200
arm64: compat: No need for pre-ARMv7 barriers on an ARMv8 system Remove the deprecated (pre-ARMv7) compat barriers as they would not be used on an ARMv8 system. Fixes: a7f71a2c8903 ("arm64: compat: Add vDSO") Signed-off-by: Catalin Marinas <catalin.mari...@arm.com> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: Vincenzo Frascino <vincenzo.frasc...@arm.com> Cc: linux-a...@vger.kernel.org Cc: linux-arm-ker...@lists.infradead.org Cc: linux-m...@vger.kernel.org Cc: linux-kselft...@vger.kernel.org Cc: Will Deacon <will.dea...@arm.com> Cc: Arnd Bergmann <a...@arndb.de> Cc: Russell King <li...@armlinux.org.uk> Cc: Ralf Baechle <r...@linux-mips.org> Cc: Paul Burton <paul.bur...@mips.com> Cc: Daniel Lezcano <daniel.lezc...@linaro.org> Cc: Mark Salyzyn <saly...@android.com> Cc: Peter Collingbourne <p...@google.com> Cc: Shuah Khan <sh...@kernel.org> Cc: Dmitry Safonov <0x7f454...@gmail.com> Cc: Rasmus Villemoes <li...@rasmusvillemoes.dk> Cc: Huw Davies <h...@codeweavers.com> Cc: Shijith Thotton <sthot...@marvell.com> Cc: Andre Przywara <andre.przyw...@arm.com> Link: https://lkml.kernel.org/r/20190624140018.gd29...@arrakis.emea.arm.com --- arch/arm64/include/asm/vdso/compat_barrier.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm64/include/asm/vdso/compat_barrier.h b/arch/arm64/include/asm/vdso/compat_barrier.h index ea24ea856b07..fb60a88b5ed4 100644 --- a/arch/arm64/include/asm/vdso/compat_barrier.h +++ b/arch/arm64/include/asm/vdso/compat_barrier.h @@ -18,14 +18,7 @@ #undef dmb #endif -#if __LINUX_ARM_ARCH__ >= 7 #define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory") -#elif __LINUX_ARM_ARCH__ == 6 -#define dmb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \ - : : "r" (0) : "memory") -#else -#define dmb(x) __asm__ __volatile__ ("" : : : "memory") -#endif #if __LINUX_ARM_ARCH__ >= 8 #define aarch32_smp_mb() dmb(ish)