Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752465AbcDVJrd (ORCPT ); Fri, 22 Apr 2016 05:47:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36704 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbcDVJrb (ORCPT ); Fri, 22 Apr 2016 05:47:31 -0400 Date: Fri, 22 Apr 2016 02:46:18 -0700 From: tip-bot for Kees Cook Message-ID: Cc: bp@suse.de, mingo@kernel.org, dvlasenk@redhat.com, jpoimboe@redhat.com, hpa@zytor.com, tglx@linutronix.de, yinghai@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, aryabinin@virtuozzo.com, luto@amacapital.net, brgerst@gmail.com, hjl.tools@gmail.com, bp@alien8.de, bhe@redhat.com, keescook@chromium.org, dvyukov@google.com, peterz@infradead.org, luto@kernel.org Reply-To: yinghai@kernel.org, jpoimboe@redhat.com, tglx@linutronix.de, hpa@zytor.com, akpm@linux-foundation.org, aryabinin@virtuozzo.com, brgerst@gmail.com, luto@amacapital.net, hjl.tools@gmail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, bp@suse.de, mingo@kernel.org, peterz@infradead.org, luto@kernel.org, bp@alien8.de, dvyukov@google.com, bhe@redhat.com, keescook@chromium.org In-Reply-To: <1461185746-8017-4-git-send-email-keescook@chromium.org> References: <1461185746-8017-4-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot: Clean up things used by decompressors Git-Commit-ID: 1f208de37d10bb9067f3b061d281363be0cd1805 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 Content-Length: 2306 Lines: 65 Commit-ID: 1f208de37d10bb9067f3b061d281363be0cd1805 Gitweb: http://git.kernel.org/tip/1f208de37d10bb9067f3b061d281363be0cd1805 Author: Kees Cook AuthorDate: Wed, 20 Apr 2016 13:55:44 -0700 Committer: Ingo Molnar CommitDate: Fri, 22 Apr 2016 10:00:50 +0200 x86/boot: Clean up things used by decompressors This rearranges the pieces needed to include the decompressor code in misc.c. It wasn't obvious why things were there, so a comment was added and definitions consolidated. Signed-off-by: Kees Cook Cc: Andrew Morton Cc: Andrey Ryabinin Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Baoquan He Cc: Borislav Petkov Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Dmitry Vyukov Cc: H. Peter Anvin Cc: H.J. Lu Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Yinghai Lu Link: http://lkml.kernel.org/r/1461185746-8017-4-git-send-email-keescook@chromium.org Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index e96829b..0381e25 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -21,19 +21,19 @@ * it is not safe to place pointers in static structures. */ +/* Macros used by the included decompressor code below. */ #define STATIC static -#undef memcpy - /* - * Use a normal definition of memset() from string.c. There are already + * Use normal definitions of mem*() from string.c. There are already * included header files which expect a definition of memset() and by * the time we define memset macro, it is too late. */ +#undef memcpy #undef memset #define memzero(s, n) memset((s), 0, (n)) - +/* Functions used by the included decompressor code below. */ static void error(char *m); /*