From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759085AbcEGGhn (ORCPT ); Sat, 7 May 2016 02:37:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44354 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754533AbcEGGhk (ORCPT ); Sat, 7 May 2016 02:37:40 -0400 Date: Fri, 6 May 2016 23:36:31 -0700 From: tip-bot for Kees Cook Message-ID: Cc: dvlasenk@redhat.com, tglx@linutronix.de, hpa@zytor.com, vgoyal@redhat.com, yinghai@kernel.org, bhe@redhat.com, bp@suse.de, dyoung@redhat.com, luto@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org, bp@alien8.de, luto@amacapital.net, keescook@chromium.org, torvalds@linux-foundation.org, peterz@infradead.org, brgerst@gmail.com Reply-To: bp@suse.de, bhe@redhat.com, dyoung@redhat.com, tglx@linutronix.de, dvlasenk@redhat.com, hpa@zytor.com, vgoyal@redhat.com, yinghai@kernel.org, keescook@chromium.org, luto@amacapital.net, peterz@infradead.org, torvalds@linux-foundation.org, brgerst@gmail.com, akpm@linux-foundation.org, luto@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de In-Reply-To: <1462572095-11754-2-git-send-email-keescook@chromium.org> References: <1462572095-11754-2-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot: Clean up indenting for asm/boot.h Git-Commit-ID: 8665e6ff2107204f981ba8f9ee37085a003fc9e9 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: 8665e6ff2107204f981ba8f9ee37085a003fc9e9 Gitweb: http://git.kernel.org/tip/8665e6ff2107204f981ba8f9ee37085a003fc9e9 Author: Kees Cook AuthorDate: Fri, 6 May 2016 15:01:33 -0700 Committer: Ingo Molnar CommitDate: Sat, 7 May 2016 07:38:39 +0200 x86/boot: Clean up indenting for asm/boot.h Before adding more defines to asm/boot.h, this cleans up the existing indenting for readability. Suggested-by: Ingo Molnar 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/1462572095-11754-2-git-send-email-keescook@chromium.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/boot.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h index 6b8d6e8..52e6ca6 100644 --- a/arch/x86/include/asm/boot.h +++ b/arch/x86/include/asm/boot.h @@ -12,29 +12,27 @@ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 -#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT +# define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT #else -#define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_SIZE_ORDER) +# define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_SIZE_ORDER) #endif #define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2) #if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \ (CONFIG_PHYSICAL_ALIGN < MIN_KERNEL_ALIGN) -#error "Invalid value for CONFIG_PHYSICAL_ALIGN" +# error "Invalid value for CONFIG_PHYSICAL_ALIGN" #endif #ifdef CONFIG_KERNEL_BZIP2 -#define BOOT_HEAP_SIZE 0x400000 +# define BOOT_HEAP_SIZE 0x400000 #else /* !CONFIG_KERNEL_BZIP2 */ - -#define BOOT_HEAP_SIZE 0x10000 - -#endif /* !CONFIG_KERNEL_BZIP2 */ +# define BOOT_HEAP_SIZE 0x10000 +#endif #ifdef CONFIG_X86_64 -#define BOOT_STACK_SIZE 0x4000 -#else -#define BOOT_STACK_SIZE 0x1000 +# define BOOT_STACK_SIZE 0x4000 +#else /* !CONFIG_X86_64 */ +# define BOOT_STACK_SIZE 0x1000 #endif #endif /* _ASM_X86_BOOT_H */