Messages in this thread Patch in this message |  | | From | Zhenzhong Duan <> | Subject | [PATCH] x86/boot/KASLR: Fix unused variable warning | Date | Fri, 10 Jan 2020 17:43:04 +0800 |
| |
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
|  |