Merge branch into tip/master: 'x86/cleanups'

 # New commits in x86/cleanups:
    10b45e63a5b0 ("x86/cpu: Remove unnecessary __maybe_unused annotations")
    b096d79bc1ee ("x86/msr: Document the I/O-like write semantics in the msr driver")
    cdb4d57c3e49 ("x86/apic: Ensure ICR register write value is handled as 32 bits")
    7bdcb5b3a9c5 ("x86/boot/compressed/head_64.S: Clean up SEV-related comments")
    db55777feca8 ("Documentation/arch/x86/amd-memory-encryption.rst: Fix typo")
    edeed06c2ba0 ("x86/platform/quark: Fix kernel-doc warnings in imr.c")
    c8e412f79db6 ("x86/ras: Move contents from arch/x86/ras/Kconfig into drivers/ras/Kconfig")
    77d34d395093 ("x86/cpu: Move intel_get_platform_id() to cpu/intel.c")
    324549c06ead ("x86/mm: Fix typo in comment")
    b47748678c6c ("x86/fpu: Fix kernel-doc formatting above fpu_enable_guest_xfd_features()")
    0cfdf974f133 ("x86/cfi: Use symmetric SYM_START and SYM_END in __CFI_TYPE()")
    bed18bbbf9d9 ("x86/cfi: Add __init_or_module annotations for fineibt")

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d696da7387b3..e84ddf6bb10d 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1660,7 +1660,7 @@ static inline bool parse_set_clear_cpuid(char *arg, bool set)
 	int taint = 0;
 
 	while (arg) {
-		bool found __maybe_unused = false;
+		bool found = false;
 		unsigned int bit;
 
 		opt = strsep(&arg, ",");