From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752153AbdGYNwo (ORCPT ); Tue, 25 Jul 2017 09:52:44 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36365 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751843AbdGYNwm (ORCPT ); Tue, 25 Jul 2017 09:52:42 -0400 Date: Tue, 25 Jul 2017 06:47:03 -0700 From: tip-bot for Michael Davidson Message-ID: Cc: keescook@chromium.org, md@google.com, mka@chromium.org, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, ghackmann@google.com, tglx@linutronix.de, peterz@infradead.org, arnd@arndb.de, ndesaulniers@google.com, mingo@kernel.org Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, md@google.com, keescook@chromium.org, mka@chromium.org, arnd@arndb.de, ndesaulniers@google.com, mingo@kernel.org, ghackmann@google.com, torvalds@linux-foundation.org, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <20170724235155.79255-1-mka@chromium.org> References: <20170724235155.79255-1-mka@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/boot: #undef memcpy() et al in string.c Git-Commit-ID: 18d5e6c34a8eda438d5ad8b3b15f42dab01bf05d 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: 18d5e6c34a8eda438d5ad8b3b15f42dab01bf05d Gitweb: http://git.kernel.org/tip/18d5e6c34a8eda438d5ad8b3b15f42dab01bf05d Author: Michael Davidson AuthorDate: Mon, 24 Jul 2017 16:51:55 -0700 Committer: Ingo Molnar CommitDate: Tue, 25 Jul 2017 11:13:55 +0200 x86/boot: #undef memcpy() et al in string.c undef memcpy() and friends in boot/string.c so that the functions defined here will have the correct names, otherwise we end up up trying to redefine __builtin_memcpy() etc. Surprisingly, GCC allows this (and, helpfully, discards the __builtin_ prefix from the function name when compiling it), but clang does not. Adding these #undef's appears to preserve what I assume was the original intent of the code. Signed-off-by: Michael Davidson Signed-off-by: Matthias Kaehlcke Acked-by: H. Peter Anvin Cc: Arnd Bergmann Cc: Bernhard.Rosenkranzer@linaro.org Cc: Greg Hackmann Cc: Kees Cook Cc: Linus Torvalds Cc: Nick Desaulniers Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20170724235155.79255-1-mka@chromium.org Signed-off-by: Ingo Molnar --- arch/x86/boot/string.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c index 630e366..16f4912 100644 --- a/arch/x86/boot/string.c +++ b/arch/x86/boot/string.c @@ -16,6 +16,15 @@ #include "ctype.h" #include "string.h" +/* + * Undef these macros so that the functions that we provide + * here will have the correct names regardless of how string.h + * may have chosen to #define them. + */ +#undef memcpy +#undef memset +#undef memcmp + int memcmp(const void *s1, const void *s2, size_t len) { bool diff;