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/platforms/powernv/opal.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/platforms/powernv/opal.c')
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index 8b4fc68cebcb..6c9a65b52e63 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c | |||
| @@ -399,6 +399,7 @@ static int opal_recover_mce(struct pt_regs *regs, | |||
| 399 | 399 | ||
| 400 | if (!(regs->msr & MSR_RI)) { | 400 | if (!(regs->msr & MSR_RI)) { |
| 401 | /* If MSR_RI isn't set, we cannot recover */ | 401 | /* If MSR_RI isn't set, we cannot recover */ |
| 402 | pr_err("Machine check interrupt unrecoverable: MSR(RI=0)\n"); | ||
| 402 | recovered = 0; | 403 | recovered = 0; |
| 403 | } else if (evt->disposition == MCE_DISPOSITION_RECOVERED) { | 404 | } else if (evt->disposition == MCE_DISPOSITION_RECOVERED) { |
| 404 | /* Platform corrected itself */ | 405 | /* Platform corrected itself */ |