Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 26 Jun 2019 05:36:00 -0700
From:   tip-bot for Catalin Marinas <tipbot@zytor.com>
Message-ID: <tip-6a5b78b32d10cd7901f639870eca304b270769f9@git.kernel.org>
Cc:     will.deacon@arm.com, linux-kernel@vger.kernel.org,
        huw@codeweavers.com, vincenzo.frascino@arm.com, shuah@kernel.org,
        linux@armlinux.org.uk, paul.burton@mips.com, arnd@arndb.de,
        pcc@google.com, andre.przywara@arm.com, tglx@linutronix.de,
        ralf@linux-mips.org, linux@rasmusvillemoes.dk,
        daniel.lezcano@linaro.org, mingo@kernel.org, sthotton@marvell.com,
        salyzyn@android.com, catalin.marinas@arm.com, hpa@zytor.com,
        0x7f454c46@gmail.com
Reply-To: huw@codeweavers.com, linux-kernel@vger.kernel.org,
          vincenzo.frascino@arm.com, shuah@kernel.org, will.deacon@arm.com,
          andre.przywara@arm.com, paul.burton@mips.com, arnd@arndb.de,
          pcc@google.com, linux@armlinux.org.uk, ralf@linux-mips.org,
          linux@rasmusvillemoes.dk, tglx@linutronix.de,
          catalin.marinas@arm.com, salyzyn@android.com,
          0x7f454c46@gmail.com, hpa@zytor.com, sthotton@marvell.com,
          mingo@kernel.org, daniel.lezcano@linaro.org
In-Reply-To: <20190624140018.GD29120@arrakis.emea.arm.com>
References: <20190624140018.GD29120@arrakis.emea.arm.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:timers/vdso] arm64: compat: No need for pre-ARMv7 barriers on
 an ARMv8 system
Git-Commit-ID: 6a5b78b32d10cd7901f639870eca304b270769f9
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  6a5b78b32d10cd7901f639870eca304b270769f9
Gitweb:     https://git.kernel.org/tip/6a5b78b32d10cd7901f639870eca304b270769f9
Author:     Catalin Marinas <catalin.marinas@arm.com>
AuthorDate: Mon, 24 Jun 2019 15:00:19 +0100
Committer:  Thomas Gleixner <tglx@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.marinas@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@vger.kernel.org
Cc: linux-kselftest@vger.kernel.org
Cc: Will Deacon <will.deacon@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Mark Salyzyn <salyzyn@android.com>
Cc: Peter Collingbourne <pcc@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Huw Davies <huw@codeweavers.com>
Cc: Shijith Thotton <sthotton@marvell.com>
Cc: Andre Przywara <andre.przywara@arm.com>
Link: https://lkml.kernel.org/r/20190624140018.GD29120@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)