Commit 0f02daed authored Mar 04, 2019 by Baoquan He Committed by Borislav Petkov Mar 27, 2019

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 <bhe@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Chao Fan <fanc.fnst@cn.fujitsu.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190304055546.18566-1-bhe@redhat.com

parent 7f2daa96

arch/x86/boot/compressed/misc.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */