Skip to contentSkip to conversation

x86/boot/KASLR: Fix unused variable warning

PATCH In review Zhenzhong Duan 2 participants 3 messages Jan 10, 2020 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/boot/KASLR: Fix unused variable warning

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")
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>

---
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(-)
arch/x86/boot/compressed/kaslr.c +1 -1
index d7408af55738..62bc46684581 100644
@@ -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.
Signature · 1 line
2.17.1
#1 lore raw

I mean [PATCH v3]

Quoted 49 lines · Zhenzhong Duan

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")
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>

---
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(-)
arch/x86/boot/compressed/kaslr.c +1 -2
index d7408af55738..62bc46684581 100644
@@ -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

maintainer
#2 lore raw
In reply to Zhenzhong Duan
Quoted 5 lines · Zhenzhong Duan

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.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette