* [PATCH v2] x86/boot: Fix incorrect ifdeffery scope
@ 2019-03-04 5:37 Baoquan He
2019-03-04 5:47 ` Chao Fan
0 siblings, 1 reply; 3+ messages in thread
From: Baoquan He @ 2019-03-04 5:37 UTC (permalink / raw)
To: linux-kernel; +Cc: fanc.fnst, bp, Baoquan He
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 <bhe@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] x86/boot: Fix incorrect ifdeffery scope
2019-03-04 5:37 [PATCH v2] x86/boot: Fix incorrect ifdeffery scope Baoquan He
@ 2019-03-04 5:47 ` Chao Fan
2019-03-04 5:54 ` Baoquan He
0 siblings, 1 reply; 3+ messages in thread
From: Chao Fan @ 2019-03-04 5:47 UTC (permalink / raw)
To: Baoquan He; +Cc: linux-kernel, bp
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 <bhe@redhat.com>
>---
>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
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] x86/boot: Fix incorrect ifdeffery scope
2019-03-04 5:47 ` Chao Fan
@ 2019-03-04 5:54 ` Baoquan He
0 siblings, 0 replies; 3+ messages in thread
From: Baoquan He @ 2019-03-04 5:54 UTC (permalink / raw)
To: Chao Fan; +Cc: linux-kernel, bp
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-04 5:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-04 5:37 [PATCH v2] x86/boot: Fix incorrect ifdeffery scope Baoquan He
2019-03-04 5:47 ` Chao Fan
2019-03-04 5:54 ` Baoquan He
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox