Commit-ID: 0f02daed4e089c7a380a0ffdc9d93a5989043cf4 Gitweb: https://git.kernel.org/tip/0f02daed4e089c7a380a0ffdc9d93a5989043cf4 Author: Baoquan He <b...@redhat.com> AuthorDate: Mon, 4 Mar 2019 13:55:46 +0800 Committer: Borislav Petkov <b...@suse.de> CommitDate: Wed, 27 Mar 2019 14:00:51 +0100
x86/boot: Fix incorrect ifdeffery scope The declarations related to immovable memory handling are out of the BOOT_COMPRESSED_MISC_H #ifdef scope, wrap them inside. Signed-off-by: Baoquan He <b...@redhat.com> Signed-off-by: Borislav Petkov <b...@suse.de> Cc: Chao Fan <fanc.f...@cn.fujitsu.com> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Juergen Gross <jgr...@suse.com> Cc: "Kirill A. Shutemov" <kirill.shute...@linux.intel.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Tom Lendacky <thomas.lenda...@amd.com> Cc: x86-ml <x...@kernel.org> Link: https://lkml.kernel.org/r/20190304055546.18566-1-...@redhat.com --- arch/x86/boot/compressed/misc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index fd13655e0f9b..d2f184165934 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -120,8 +120,6 @@ static inline void console_init(void) void set_sev_encryption_mask(void); -#endif - /* acpi.c */ #ifdef CONFIG_ACPI acpi_physical_address get_rsdp_addr(void); @@ -135,3 +133,5 @@ int count_immovable_mem_regions(void); #else static inline int count_immovable_mem_regions(void) { return 0; } #endif + +#endif /* BOOT_COMPRESSED_MISC_H */
