From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753551AbcDSJcj (ORCPT ); Tue, 19 Apr 2016 05:32:39 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56308 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752296AbcDSJci (ORCPT ); Tue, 19 Apr 2016 05:32:38 -0400 Date: Tue, 19 Apr 2016 02:31:15 -0700 From: tip-bot for Kees Cook Message-ID: Cc: aryabinin@virtuozzo.com, torvalds@linux-foundation.org, yinghai@kernel.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, bp@alien8.de, bp@suse.de, peterz@infradead.org, dvlasenk@redhat.com, jpoimboe@redhat.com, dvyukov@google.com, hjl.tools@gmail.com, luto@amacapital.net, luto@kernel.org, tglx@linutronix.de, bhe@redhat.com, mingo@kernel.org, hpa@zytor.com, keescook@chromium.org, akpm@linux-foundation.org Reply-To: bp@alien8.de, bp@suse.de, peterz@infradead.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, yinghai@kernel.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, aryabinin@virtuozzo.com, keescook@chromium.org, akpm@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, bhe@redhat.com, jpoimboe@redhat.com, dvyukov@google.com, hjl.tools@gmail.com, luto@amacapital.net, luto@kernel.org In-Reply-To: <1460997735-24785-2-git-send-email-keescook@chromium.org> References: <1460997735-24785-2-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/KASLR: Rename aslr.c to kaslr.c Git-Commit-ID: 9b238748cb6e9fadab0e761f6d30ba311b4ac470 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: 9b238748cb6e9fadab0e761f6d30ba311b4ac470 Gitweb: http://git.kernel.org/tip/9b238748cb6e9fadab0e761f6d30ba311b4ac470 Author: Kees Cook AuthorDate: Mon, 18 Apr 2016 09:42:10 -0700 Committer: Ingo Molnar CommitDate: Tue, 19 Apr 2016 10:30:50 +0200 x86/KASLR: Rename aslr.c to kaslr.c In order to avoid confusion over what this file provides, rename it to kaslr.c since it is used exclusively for the kernel ASLR, not userspace ASLR. Suggested-by: Ingo Molnar 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/1460997735-24785-2-git-send-email-keescook@chromium.org Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/Makefile | 2 +- arch/x86/boot/compressed/{aslr.c => kaslr.c} | 0 arch/x86/boot/compressed/misc.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 8774cb2..542c92f 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -62,7 +62,7 @@ vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ $(obj)/piggy.o $(obj)/cpuflags.o vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o -vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o +vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/kaslr.c similarity index 100% rename from arch/x86/boot/compressed/aslr.c rename to arch/x86/boot/compressed/kaslr.c diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 3783dc3..a8c4e08 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -66,7 +66,7 @@ int cmdline_find_option_bool(const char *option); #if CONFIG_RANDOMIZE_BASE -/* aslr.c */ +/* kaslr.c */ unsigned char *choose_kernel_location(struct boot_params *boot_params, unsigned char *input, unsigned long input_size,