1 files changed, 10 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index ee5b690a0bed..52e5758ea368 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -764,6 +764,16 @@ int fix_alignment(struct pt_regs *regs)
         nb = aligninfo[instr].len;
         flags = aligninfo[instr].flags;
 
+        /* ldbrx/stdbrx overlap lfs/stfs in the DSISR unfortunately */
+        if (IS_XFORM(instruction) && ((instruction >> 1) & 0x3ff) == 532) {
+                nb = 8;
+                flags = LD+SW;
+        } else if (IS_XFORM(instruction) &&
+                   ((instruction >> 1) & 0x3ff) == 660) {
+                nb = 8;
+                flags = ST+SW;
+        }
+
         /* Byteswap little endian loads and stores */
         swiz = 0;
         if (regs->msr & MSR_LE) {