]> git.hungrycats.org Git - linux/commitdiff
powerpc: Fix build error in stable/3.9
authorGuenter Roeck <linux@roeck-us.net>
Sat, 8 Jun 2013 14:23:47 +0000 (07:23 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Jun 2013 17:49:38 +0000 (10:49 -0700)
Commit e71c42189 (powerpc/tm: Abort on emulation and alignment faults)
introduced a powerpc build error in 3.9.5.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/kernel/traps.c

index 1c22b2d580b55a68aedfdf35a62e8bbf67689d67..29857c6b6afa066a4e565b5495ef44d1d042ff94 100644 (file)
@@ -1151,7 +1151,7 @@ void alignment_exception(struct pt_regs *regs)
                local_irq_enable();
 
        if (tm_abort_check(regs, TM_CAUSE_ALIGNMENT | TM_CAUSE_PERSISTENT))
-               goto bail;
+               return;
 
        /* we don't implement logging of alignment exceptions */
        if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS))