* [PATCH] x86/boot/KASLR: Fix unused variable warning
@ 2020-01-10 9:43 Zhenzhong Duan
2020-01-10 9:48 ` [PATCH v3] " Zhenzhong Duan
2020-01-10 9:52 ` [PATCH] " Borislav Petkov
0 siblings, 2 replies; 3+ messages in thread
From: Zhenzhong Duan @ 2020-01-10 9:43 UTC (permalink / raw)
To: linux-kernel
Cc: x86, Zhenzhong Duan, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, H. Peter Anvin, Dave Hansen, Rafael J. Wysocki
Local variable 'i' is referenced only when CONFIG_MEMORY_HOTREMOVE and
CONFIG_ACPI are defined, but definition of variable 'i' is out of guard.
If any of the two macros is undefined, below warning triggers during
build with 'make EXTRA_CFLAGS=-Wall binrpm-pkg', fix it by moving 'i'
in the guard.
arch/x86/boot/compressed/kaslr.c:698:6: warning: unused variable ‘i’ [-Wunused-variable]
Fixes: 690eaa532057 ("x86/boot/KASLR: Limit KASLR to extract the kernel in immovable memory only")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
---
v3: remove changes from 0/1 to false/true per Tglx
add the command details about triggering build warning per Boris
v2: update description per Boris.
arch/x86/boot/compressed/kaslr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index d7408af55738..62bc46684581 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -695,7 +695,6 @@ static bool process_mem_region(struct mem_vector *region,
unsigned long long minimum,
unsigned long long image_size)
{
- int i;
/*
* If no immovable memory found, or MEMORY_HOTREMOVE disabled,
* use @region directly.
@@ -711,6 +710,7 @@ static bool process_mem_region(struct mem_vector *region,
}
#if defined(CONFIG_MEMORY_HOTREMOVE) && defined(CONFIG_ACPI)
+ int i;
/*
* If immovable memory found, filter the intersection between
* immovable memory and @region.
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] x86/boot/KASLR: Fix unused variable warning
2020-01-10 9:43 [PATCH] x86/boot/KASLR: Fix unused variable warning Zhenzhong Duan
@ 2020-01-10 9:48 ` Zhenzhong Duan
2020-01-10 9:52 ` [PATCH] " Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: Zhenzhong Duan @ 2020-01-10 9:48 UTC (permalink / raw)
To: linux-kernel
Cc: x86, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
H. Peter Anvin, Dave Hansen, Rafael J. Wysocki
I mean [PATCH v3]
On Fri, Jan 10, 2020 at 5:43 PM Zhenzhong Duan <zhenzhong.duan@gmail.com> wrote:
>
> Local variable 'i' is referenced only when CONFIG_MEMORY_HOTREMOVE and
> CONFIG_ACPI are defined, but definition of variable 'i' is out of guard.
> If any of the two macros is undefined, below warning triggers during
> build with 'make EXTRA_CFLAGS=-Wall binrpm-pkg', fix it by moving 'i'
> in the guard.
>
> arch/x86/boot/compressed/kaslr.c:698:6: warning: unused variable ‘i’ [-Wunused-variable]
>
> Fixes: 690eaa532057 ("x86/boot/KASLR: Limit KASLR to extract the kernel in immovable memory only")
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@suse.de>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
> ---
> v3: remove changes from 0/1 to false/true per Tglx
> add the command details about triggering build warning per Boris
>
> v2: update description per Boris.
>
> arch/x86/boot/compressed/kaslr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
> index d7408af55738..62bc46684581 100644
> --- a/arch/x86/boot/compressed/kaslr.c
> +++ b/arch/x86/boot/compressed/kaslr.c
> @@ -695,7 +695,6 @@ static bool process_mem_region(struct mem_vector *region,
> unsigned long long minimum,
> unsigned long long image_size)
> {
> - int i;
> /*
> * If no immovable memory found, or MEMORY_HOTREMOVE disabled,
> * use @region directly.
> @@ -711,6 +710,7 @@ static bool process_mem_region(struct mem_vector *region,
> }
>
> #if defined(CONFIG_MEMORY_HOTREMOVE) && defined(CONFIG_ACPI)
> + int i;
> /*
> * If immovable memory found, filter the intersection between
> * immovable memory and @region.
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86/boot/KASLR: Fix unused variable warning
2020-01-10 9:43 [PATCH] x86/boot/KASLR: Fix unused variable warning Zhenzhong Duan
2020-01-10 9:48 ` [PATCH v3] " Zhenzhong Duan
@ 2020-01-10 9:52 ` Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2020-01-10 9:52 UTC (permalink / raw)
To: Zhenzhong Duan
Cc: linux-kernel, x86, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Dave Hansen, Rafael J. Wysocki
On Fri, Jan 10, 2020 at 05:43:04PM +0800, Zhenzhong Duan wrote:
> Local variable 'i' is referenced only when CONFIG_MEMORY_HOTREMOVE and
> CONFIG_ACPI are defined, but definition of variable 'i' is out of guard.
> If any of the two macros is undefined, below warning triggers during
> build with 'make EXTRA_CFLAGS=-Wall binrpm-pkg', fix it by moving 'i'
> in the guard.
Maybe I wasn't clear: save this patch for when it triggers in the normal
build, without additional build flags.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-10 9:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-10 9:43 [PATCH] x86/boot/KASLR: Fix unused variable warning Zhenzhong Duan
2020-01-10 9:48 ` [PATCH v3] " Zhenzhong Duan
2020-01-10 9:52 ` [PATCH] " Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).