| From 8ce3edac0a86f103bd1037110662d5d80a42dd5b Mon Sep 17 00:00:00 2001 |
| From: Guenter Roeck <linux@roeck-us.net> |
| Date: Sat, 8 Jun 2013 07:23:47 -0700 |
| Subject: powerpc: Fix build error in stable/3.9 |
| |
| From: Guenter Roeck <linux@roeck-us.net> |
| |
| 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/powerpc/kernel/traps.c |
| +++ b/arch/powerpc/kernel/traps.c |
| @@ -1151,7 +1151,7 @@ void alignment_exception(struct pt_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)) |
