diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2013-06-08 07:23:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-13 10:49:38 -0700 |
| commit | c67d06ef087d1dccbe85470c490eccfd6184fcbc (patch) | |
| tree | f3b7af8412227f946ac15ddfb9593ab430defc25 /arch | |
| parent | 3e9ef737770227e1f7c01851d239a3db10263bbb (diff) | |
| download | lwn-c67d06ef087d1dccbe85470c490eccfd6184fcbc.tar.gz lwn-c67d06ef087d1dccbe85470c490eccfd6184fcbc.zip | |
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 <linux@roeck-us.net>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |