From c67d06ef087d1dccbe85470c490eccfd6184fcbc Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 8 Jun 2013 07:23:47 -0700 Subject: [PATCH] powerpc: Fix build error in stable/3.9 Commit e71c42189 (powerpc/tm: Abort on emulation and alignment faults) introduced a powerpc build error in 3.9.5. Signed-off-by: Guenter Roeck Acked-by: Michael Neuling Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 1c22b2d580b5..29857c6b6afa 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -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)) -- 2.47.3