From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937152AbdDXVR6 (ORCPT ); Mon, 24 Apr 2017 17:17:58 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57713 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032616AbdDXVRv (ORCPT ); Mon, 24 Apr 2017 17:17:51 -0400 Date: Mon, 24 Apr 2017 14:16:42 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, mingo@kernel.org, tony.luck@intel.com, linux-kernel@vger.kernel.org Reply-To: tony.luck@intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools arch: Sync arch/x86/lib/memcpy_64.S with the kernel Git-Commit-ID: e883d09c9eb2ffddfd057c17e6a0cef446ec8c9b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e883d09c9eb2ffddfd057c17e6a0cef446ec8c9b Gitweb: http://git.kernel.org/tip/e883d09c9eb2ffddfd057c17e6a0cef446ec8c9b Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 24 Apr 2017 11:58:54 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 24 Apr 2017 13:43:36 -0300 tools arch: Sync arch/x86/lib/memcpy_64.S with the kernel Just a minor fix done in: Fixes: 26a37ab319a2 ("x86/mce: Fix copy/paste error in exception table entries") Cc: Tony Luck Link: http://lkml.kernel.org/n/tip-ni9jzdd5yxlail6pq8cuexw2@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/x86/lib/memcpy_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/arch/x86/lib/memcpy_64.S b/tools/arch/x86/lib/memcpy_64.S index 49e6eba..98dcc11 100644 --- a/tools/arch/x86/lib/memcpy_64.S +++ b/tools/arch/x86/lib/memcpy_64.S @@ -286,7 +286,7 @@ ENDPROC(memcpy_mcsafe_unrolled) _ASM_EXTABLE_FAULT(.L_copy_leading_bytes, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w0, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w1, .L_memcpy_mcsafe_fail) - _ASM_EXTABLE_FAULT(.L_cache_w3, .L_memcpy_mcsafe_fail) + _ASM_EXTABLE_FAULT(.L_cache_w2, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w3, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w4, .L_memcpy_mcsafe_fail) _ASM_EXTABLE_FAULT(.L_cache_w5, .L_memcpy_mcsafe_fail)