x86/microcode/amd: Fix two -Wunused-but-set-variable warnings
authorBorislav Petkov <bp@suse.de>
Sat, 28 Sep 2019 14:53:56 +0000 (16:53 +0200)
committerBorislav Petkov <bp@suse.de>
Tue, 1 Oct 2019 09:36:09 +0000 (11:36 +0200)
The dummy variable is the high part of the microcode revision MSR which
is defined as reserved. Mark it unused so that W=1 builds don't trigger
the above warning.

No functional changes.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20190928162559.26294-1-bp@alien8.de
arch/x86/kernel/cpu/microcode/amd.c

index a0e52bd00ecceeaed98f61b36fd51de6543f140d..3f6b137ef4e6e564bff9fe4e8fd5ad2913d5de2a 100644 (file)
@@ -567,7 +567,7 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax)
 void reload_ucode_amd(void)
 {
        struct microcode_amd *mc;
-       u32 rev, dummy;
+       u32 rev, dummy __always_unused;
 
        mc = (struct microcode_amd *)amd_ucode_patch;
 
@@ -673,7 +673,7 @@ static enum ucode_state apply_microcode_amd(int cpu)
        struct ucode_cpu_info *uci;
        struct ucode_patch *p;
        enum ucode_state ret;
-       u32 rev, dummy;
+       u32 rev, dummy __always_unused;
 
        BUG_ON(raw_smp_processor_id() != cpu);