Merge 3.11-rc3 into driver-core-next

We want these fixes in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 7b3cbde8c783..721c0586b284 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -287,6 +287,9 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs)
         unsigned long *savep;
         struct rtas_error_log *h, *errhdr = NULL;
 
+        /* Mask top two bits */
+        regs->gpr[3] &= ~(0x3UL << 62);
+
         if (!VALID_FWNMI_BUFFER(regs->gpr[3])) {
                 printk(KERN_ERR "FWNMI: corrupt r3 0x%016lx\n", regs->gpr[3]);
                 return NULL;