[tip: x86/microcode] x86/microcode/amd: Fix two -Wunused-but-set-variable warnings

tip-bot2 for Borislav Petkov
2019-10-01T09:46:36Z

The following commit has been merged into the x86/microcode branch of tip:

Commit-ID: 2b730952066cd022d1f46e801f06ca6ca9878823
Gitweb: https://git.kernel.org/tip/2b730952066cd022d1f46e801f06ca6ca9878823
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Sat, 28 Sep 2019 16:53:56 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Tue, 01 Oct 2019 11:36:09 +02:00

x86/microcode/amd: Fix two -Wunused-but-set-variable warnings

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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index a0e52bd..3f6b137 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -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);