* [PATCH v3] x86/boot: Fix incorrect ifdeffery scope
@ 2019-03-04 5:55 Baoquan He
2019-03-04 6:03 ` Chao Fan
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Baoquan He @ 2019-03-04 5:55 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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3] x86/boot: Fix incorrect ifdeffery scope
2019-03-04 5:55 [PATCH v3] x86/boot: Fix incorrect ifdeffery scope Baoquan He
@ 2019-03-04 6:03 ` Chao Fan
2019-03-04 10:17 ` Baoquan He
2019-03-27 13:16 ` [tip:x86/urgent] " tip-bot for Baoquan He
2 siblings, 0 replies; 5+ messages in thread
From: Chao Fan @ 2019-03-04 6:03 UTC (permalink / raw)
To: Baoquan He; +Cc: linux-kernel, bp
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 <bhe@redhat.com>
>---
>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
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] x86/boot: Fix incorrect ifdeffery scope
2019-03-04 5:55 [PATCH v3] x86/boot: Fix incorrect ifdeffery scope Baoquan He
2019-03-04 6:03 ` Chao Fan
@ 2019-03-04 10:17 ` Baoquan He
2019-03-04 13:28 ` Baoquan He
2019-03-27 13:16 ` [tip:x86/urgent] " tip-bot for Baoquan He
2 siblings, 1 reply; 5+ messages in thread
From: Baoquan He @ 2019-03-04 10:17 UTC (permalink / raw)
To: linux-kernel, tglx, mingo, x86; +Cc: fanc.fnst, bp
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 <bhe@redhat.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] x86/boot: Fix incorrect ifdeffery scope
2019-03-04 10:17 ` Baoquan He
@ 2019-03-04 13:28 ` Baoquan He
0 siblings, 0 replies; 5+ messages in thread
From: Baoquan He @ 2019-03-04 13:28 UTC (permalink / raw)
To: linux-kernel, tglx, mingo, x86; +Cc: fanc.fnst, bp
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 <bhe@redhat.com>
> > ---
> > 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
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:x86/urgent] x86/boot: Fix incorrect ifdeffery scope
2019-03-04 5:55 [PATCH v3] x86/boot: Fix incorrect ifdeffery scope Baoquan He
2019-03-04 6:03 ` Chao Fan
2019-03-04 10:17 ` Baoquan He
@ 2019-03-27 13:16 ` tip-bot for Baoquan He
2 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Baoquan He @ 2019-03-27 13:16 UTC (permalink / raw)
To: linux-tip-commits
Cc: x86, tglx, hpa, thomas.lendacky, jgross, linux-kernel, mingo, bp,
mingo, fanc.fnst, bhe, kirill.shutemov
Commit-ID: 0f02daed4e089c7a380a0ffdc9d93a5989043cf4
Gitweb: https://git.kernel.org/tip/0f02daed4e089c7a380a0ffdc9d93a5989043cf4
Author: Baoquan He <bhe@redhat.com>
AuthorDate: Mon, 4 Mar 2019 13:55:46 +0800
Committer: Borislav Petkov <bp@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 <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
---
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 */
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-27 13:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-04 5:55 [PATCH v3] x86/boot: Fix incorrect ifdeffery scope Baoquan He
2019-03-04 6:03 ` Chao Fan
2019-03-04 10:17 ` Baoquan He
2019-03-04 13:28 ` Baoquan He
2019-03-27 13:16 ` [tip:x86/urgent] " tip-bot for Baoquan He
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.