Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <mingo@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
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 <mingo@kernel.org>

authored by

Kees Cook and committed by
Ingo Molnar
8665e6ff ed09acde

+9 -11
+9 -11
arch/x86/include/asm/boot.h
··· 12 12 13 13 /* Minimum kernel alignment, as a power of two */ 14 14 #ifdef CONFIG_X86_64 15 - #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 15 + # define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 16 16 #else 17 - #define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_SIZE_ORDER) 17 + # define MIN_KERNEL_ALIGN_LG2 (PAGE_SHIFT + THREAD_SIZE_ORDER) 18 18 #endif 19 19 #define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2) 20 20 21 21 #if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \ 22 22 (CONFIG_PHYSICAL_ALIGN < MIN_KERNEL_ALIGN) 23 - #error "Invalid value for CONFIG_PHYSICAL_ALIGN" 23 + # error "Invalid value for CONFIG_PHYSICAL_ALIGN" 24 24 #endif 25 25 26 26 #ifdef CONFIG_KERNEL_BZIP2 27 - #define BOOT_HEAP_SIZE 0x400000 27 + # define BOOT_HEAP_SIZE 0x400000 28 28 #else /* !CONFIG_KERNEL_BZIP2 */ 29 - 30 - #define BOOT_HEAP_SIZE 0x10000 31 - 32 - #endif /* !CONFIG_KERNEL_BZIP2 */ 29 + # define BOOT_HEAP_SIZE 0x10000 30 + #endif 33 31 34 32 #ifdef CONFIG_X86_64 35 - #define BOOT_STACK_SIZE 0x4000 36 - #else 37 - #define BOOT_STACK_SIZE 0x1000 33 + # define BOOT_STACK_SIZE 0x4000 34 + #else /* !CONFIG_X86_64 */ 35 + # define BOOT_STACK_SIZE 0x1000 38 36 #endif 39 37 40 38 #endif /* _ASM_X86_BOOT_H */