The following commit has been merged into the ras/core branch of tip:
Commit-ID: 5d7f7d1d5e01c22894dee7c9c9266500478dca99
Gitweb: https://git.kernel.org/tip/5d7f7d1d5e01c22894dee7c9c9266500478dca99
Author: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxx>
AuthorDate: Thu, 11 Jun 2020 10:32:38 +08:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Mon, 15 Jun 2020 13:38:55 +02:00
x86/mce/inject: Fix a wrong assignment of i_mce.status
The original code is a nop as i_mce.status is or'ed with part of itself,
fix it.
Fixes: a1300e505297 ("x86/ras/mce_amd_inj: Trigger deferred and thresholding errors interrupts")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Acked-by: Yazen Ghannam <yazen.ghannam@xxxxxxx>
Link: https://lkml.kernel.org/r/20200611023238.3830-1-zhenzhong.duan@xxxxxxxxx
---
arch/x86/kernel/cpu/mce/inject.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c
index 0593b19..7843ab3 100644
--- a/arch/x86/kernel/cpu/mce/inject.c
+++ b/arch/x86/kernel/cpu/mce/inject.c
@@ -511,7 +511,7 @@ static void do_inject(void)
*/
if (inj_type == DFR_INT_INJ) {
i_mce.status |= MCI_STATUS_DEFERRED;
- i_mce.status |= (i_mce.status & ~MCI_STATUS_UC);
+ i_mce.status &= ~MCI_STATUS_UC;
}
/*
|