diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/powerpc/kernel/mce.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/powerpc/kernel/mce.c')
| -rw-r--r-- | arch/powerpc/kernel/mce.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c index ef267fd9dd22..5e7ece0fda9f 100644 --- a/arch/powerpc/kernel/mce.c +++ b/arch/powerpc/kernel/mce.c | |||
| @@ -92,7 +92,8 @@ void save_mce_event(struct pt_regs *regs, long handled, | |||
| 92 | mce->in_use = 1; | 92 | mce->in_use = 1; |
| 93 | 93 | ||
| 94 | mce->initiator = MCE_INITIATOR_CPU; | 94 | mce->initiator = MCE_INITIATOR_CPU; |
| 95 | if (handled) | 95 | /* Mark it recovered if we have handled it and MSR(RI=1). */ |
| 96 | if (handled && (regs->msr & MSR_RI)) | ||
| 96 | mce->disposition = MCE_DISPOSITION_RECOVERED; | 97 | mce->disposition = MCE_DISPOSITION_RECOVERED; |
| 97 | else | 98 | else |
| 98 | mce->disposition = MCE_DISPOSITION_NOT_RECOVERED; | 99 | mce->disposition = MCE_DISPOSITION_NOT_RECOVERED; |