Commit-ID: 85be07c32496dc264661308e4d9d4e9ccaff8072
Gitweb: http://git.kernel.org/tip/85be07c32496dc264661308e4d9d4e9ccaff8072
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Wed, 5 Nov 2014 17:28:06 +0100
Committer: Borislav Petkov <bp@xxxxxxx>
CommitDate: Wed, 5 Nov 2014 17:28:06 +0100
x86, microcode: Fix accessing dis_ucode_ldr on 32-bit
We should be accessing it through a pointer, like on the BSP.
Tested-by: Richard Hendershot <rshendershot@xxxxxxxxx>
Fixes: 65cef1311d5d ("x86, microcode: Add a disable chicken bit")
Cc: <stable@xxxxxxxxxxxxxxx> # v3.15+
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
---
arch/x86/kernel/cpu/microcode/core_early.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/microcode/core_early.c b/arch/x86/kernel/cpu/microcode/core_early.c
index 5f28a64..2c017f2 100644
--- a/arch/x86/kernel/cpu/microcode/core_early.c
+++ b/arch/x86/kernel/cpu/microcode/core_early.c
@@ -124,7 +124,7 @@ void __init load_ucode_bsp(void)
static bool check_loader_disabled_ap(void)
{
#ifdef CONFIG_X86_32
- return __pa_nodebug(dis_ucode_ldr);
+ return *((bool *)__pa_nodebug(&dis_ucode_ldr));
#else
return dis_ucode_ldr;
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|