2019-03-04 05:56:37

by Baoquan He

Subject: [PATCH v3] x86/boot: Fix incorrect ifdeffery scope

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]>
---
v2->v3:
Add code comment to clearly note the end of the ifdeffery for better
code reading.
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..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 */
--
2.17.2

2019-03-04 06:04:22

by Chao Fan

Subject: Re: [PATCH v3] x86/boot: Fix incorrect ifdeffery scope

On Mon, Mar 04, 2019 at 01:55:46PM +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.

Looks good, thank you for the fix.

Thanks,
Chao Fan

>
>Signed-off-by: Baoquan He <[email protected]>
>---
>v2->v3:
> Add code comment to clearly note the end of the ifdeffery for better
> code reading.
>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..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 */
>--
>2.17.2
>
>
>

2019-03-04 10:18:01

by Baoquan He

Subject: Re: [PATCH v3] x86/boot: Fix incorrect ifdeffery scope

Add Thomas and Ingo to CC, and x86 ML.

On 03/04/19 at 01:55pm, 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]>
> ---
> v2->v3:
> Add code comment to clearly note the end of the ifdeffery for better
> code reading.
> 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..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 */
> --
> 2.17.2
>

2019-03-04 13:53:42

by Baoquan He

Subject: Re: [PATCH v3] x86/boot: Fix incorrect ifdeffery scope

On 03/04/19 at 06:17pm, Baoquan He wrote:
> Add Thomas and Ingo to CC, and x86 ML.

Sorry, forgot saying this is on tip/x86/boot branch.

>
> On 03/04/19 at 01:55pm, 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]>
> > ---
> > v2->v3:
> > Add code comment to clearly note the end of the ifdeffery for better
> > code reading.
> > 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..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 */
> > --
> > 2.17.2
> >

2019-03-27 13:17:53

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/urgent] x86/boot: Fix incorrect ifdeffery scope

Commit-ID: 0f02daed4e089c7a380a0ffdc9d93a5989043cf4
Gitweb: https://git.kernel.org/tip/0f02daed4e089c7a380a0ffdc9d93a5989043cf4
Author: Baoquan He <[email protected]>
AuthorDate: Mon, 4 Mar 2019 13:55:46 +0800
Committer: Borislav Petkov <[email protected]>
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 <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Chao Fan <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: "Kirill A. Shutemov" <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Tom Lendacky <[email protected]>
Cc: x86-ml <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
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 */