From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888AbcEJImb (ORCPT ); Tue, 10 May 2016 04:42:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46836 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbcEJIm2 (ORCPT ); Tue, 10 May 2016 04:42:28 -0400 Date: Tue, 10 May 2016 01:41:14 -0700 From: tip-bot for Kees Cook Message-ID: Cc: keescook@chromium.org, luto@amacapital.net, peterz@infradead.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, yinghai@kernel.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de, bp@suse.de, luto@kernel.org, bhe@redhat.com, dyoung@redhat.com, vgoyal@redhat.com, brgerst@gmail.com, bp@alien8.de, hpa@zytor.com Reply-To: torvalds@linux-foundation.org, yinghai@kernel.org, linux-kernel@vger.kernel.org, keescook@chromium.org, luto@amacapital.net, akpm@linux-foundation.org, peterz@infradead.org, bhe@redhat.com, vgoyal@redhat.com, dyoung@redhat.com, brgerst@gmail.com, bp@alien8.de, hpa@zytor.com, dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de, bp@suse.de, luto@kernel.org In-Reply-To: <1462825332-10505-3-git-send-email-keescook@chromium.org> References: <1462825332-10505-3-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot: Add missing file header comments Git-Commit-ID: cb18ef0da259db611fbf52806592fde5f469ae67 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: cb18ef0da259db611fbf52806592fde5f469ae67 Gitweb: http://git.kernel.org/tip/cb18ef0da259db611fbf52806592fde5f469ae67 Author: Kees Cook AuthorDate: Mon, 9 May 2016 13:22:05 -0700 Committer: Ingo Molnar CommitDate: Tue, 10 May 2016 10:12:03 +0200 x86/boot: Add missing file header comments There were some files with missing header comments. Since they are included from both compressed and regular kernels, make note of that. Also corrects a typo in the mem_avoid comments. Signed-off-by: Kees Cook Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Baoquan He Cc: Borislav Petkov Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Young Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Vivek Goyal Cc: Yinghai Lu Cc: kernel-hardening@lists.openwall.com Cc: lasse.collin@tukaani.org Link: http://lkml.kernel.org/r/1462825332-10505-3-git-send-email-keescook@chromium.org Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/kaslr.c | 2 +- arch/x86/boot/early_serial_console.c | 4 ++++ arch/x86/mm/ident_map.c | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index f5a138c..f15d7b8 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -163,7 +163,7 @@ static bool mem_overlaps(struct mem_vector *one, struct mem_vector *two) * memory ranges lead to really hard to debug boot failures. * * The initrd, cmdline, and boot_params are trivial to identify for - * avoiding. The are MEM_AVOID_INITRD, MEM_AVOID_CMDLINE, and + * avoiding. They are MEM_AVOID_INITRD, MEM_AVOID_CMDLINE, and * MEM_AVOID_BOOTPARAMS respectively below. * * What is not obvious how to avoid is the range of memory that is used diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c index 45a0768..f0b8d6d 100644 --- a/arch/x86/boot/early_serial_console.c +++ b/arch/x86/boot/early_serial_console.c @@ -1,3 +1,7 @@ +/* + * Serial port routines for use during early boot reporting. This code is + * included from both the compressed kernel and the regular kernel. + */ #include "boot.h" #define DEFAULT_SERIAL_PORT 0x3f8 /* ttyS0 */ diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c index 751ca92..ec21796 100644 --- a/arch/x86/mm/ident_map.c +++ b/arch/x86/mm/ident_map.c @@ -1,3 +1,7 @@ +/* + * Helper routines for building identity mapping page tables. This is + * included by both the compressed kernel and the regular kernel. + */ static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page, unsigned long addr, unsigned long end) @@ -10,6 +14,7 @@ static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page, set_pmd(pmd, __pmd(addr | pmd_flag)); } } + static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, unsigned long addr, unsigned long end) {