The declarations related to immovable memory handling are put out of
the BOOT_COMPRESSED_MISC_H #ifdef scope, wrap them inside.
Signed-off-by: Baoquan He <[email protected]>
---
v1->v2:
Add the lost line which could be made by git.
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..8bbaf362855c 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
--
2.17.2
On Mon, Mar 04, 2019 at 01:37:56PM +0800, Baoquan He wrote:
>The declarations related to immovable memory handling are put out of
>the BOOT_COMPRESSED_MISC_H #ifdef scope, wrap them inside.
>
>Signed-off-by: Baoquan He <[email protected]>
>---
>v1->v2:
> Add the lost line which could be made by git.
>
> 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..8bbaf362855c 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
If it will look better:
+#endif /* BOOT_COMPRESSED_MISC_H */
I am sorry that I should say that in your V1 version, but I really
forgot it after noticing that PATCH log.
Thanks,
Chao Fan
>--
>2.17.2
>
>
>
On 03/04/19 at 01:47pm, Chao Fan wrote:
> +#endif /* BOOT_COMPRESSED_MISC_H */
>
> I am sorry that I should say that in your V1 version, but I really
> forgot it after noticing that PATCH log.
Yes, that's better. Can note us better where the ifdeffery ends.
Will send v3. thx.