From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751185AbdEaJp5 (ORCPT ); Wed, 31 May 2017 05:45:57 -0400 Received: from terminus.zytor.com ([65.50.211.136]:38901 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751057AbdEaJpz (ORCPT ); Wed, 31 May 2017 05:45:55 -0400 Date: Wed, 31 May 2017 02:40:10 -0700 From: tip-bot for Arnd Bergmann Message-ID: Cc: linux-kernel@vger.kernel.org, keescook@chromium.org, tglx@linutronix.de, thgarnie@google.com, torvalds@linux-foundation.org, mingo@kernel.org, arnd@arndb.de, peterz@infradead.org, hpa@zytor.com, bhe@redhat.com, dave.jiang@intel.com Reply-To: dave.jiang@intel.com, bhe@redhat.com, hpa@zytor.com, peterz@infradead.org, arnd@arndb.de, mingo@kernel.org, torvalds@linux-foundation.org, thgarnie@google.com, tglx@linutronix.de, keescook@chromium.org, linux-kernel@vger.kernel.org In-Reply-To: <20170530091446.1000183-1-arnd@arndb.de> References: <20170530091446.1000183-1-arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/KASLR: Use the right memcpy() implementation Git-Commit-ID: 5b8b9cf76add98e19ff8ceb4247c2920687591a0 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: 5b8b9cf76add98e19ff8ceb4247c2920687591a0 Gitweb: http://git.kernel.org/tip/5b8b9cf76add98e19ff8ceb4247c2920687591a0 Author: Arnd Bergmann AuthorDate: Tue, 30 May 2017 11:14:17 +0200 Committer: Ingo Molnar CommitDate: Wed, 31 May 2017 07:59:45 +0200 x86/KASLR: Use the right memcpy() implementation The decompressor has its own implementation of the string functions, but has to include the right header to get those, while implicitly including linux/string.h may result in a link error: arch/x86/boot/compressed/kaslr.o: In function `choose_random_location': kaslr.c:(.text+0xf51): undefined reference to `_mmx_memcpy' This has appeared now as KASLR started using memcpy(), via: d52e7d5a952c ("x86/KASLR: Parse all 'memmap=' boot option entries") Other files in the decompressor already do the same thing. Signed-off-by: Arnd Bergmann Acked-by: Baoquan He Cc: Dave Jiang Cc: Kees Cook Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Garnier Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20170530091446.1000183-1-arnd@arndb.de Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/kaslr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index e0eba12..fe318b4 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -30,6 +30,7 @@ #include "misc.h" #include "error.h" +#include "../string.h" #include #include