aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-10 10:16:30 +0200
committerBen Hutchings <ben@decadent.org.uk>2013-11-28 14:02:03 +0000
commit8b7a25d8eb7889d7492333a28cb0a00e6e570438 (patch)
tree9642bb889567017ef1083791005fa6b41b05c9ba /arch/powerpc
parentc12558716007837227b962caa4299b355870fed6 (diff)
downloadkernel_samsung_smdk4412-8b7a25d8eb7889d7492333a28cb0a00e6e570438.zip
kernel_samsung_smdk4412-8b7a25d8eb7889d7492333a28cb0a00e6e570438.tar.gz
kernel_samsung_smdk4412-8b7a25d8eb7889d7492333a28cb0a00e6e570438.tar.bz2
compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
commit 3f0116c3238a96bc18ad4b4acefe4e7be32fa861 upstream. Fengguang Wu, Oleg Nesterov and Peter Zijlstra tracked down a kernel crash to a GCC bug: GCC miscompiles certain 'asm goto' constructs, as outlined here: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 Implement a workaround suggested by Jakub Jelinek. Reported-and-tested-by: Fengguang Wu <fengguang.wu@intel.com> Reported-by: Oleg Nesterov <oleg@redhat.com> Reported-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Suggested-by: Jakub Jelinek <jakub@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> [bwh: Backported to 3.2: - Drop inapplicable changes - Adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/jump_label.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h
index 938986e..ee33888 100644
--- a/arch/powerpc/include/asm/jump_label.h
+++ b/arch/powerpc/include/asm/jump_label.h
@@ -19,7 +19,7 @@
static __always_inline bool arch_static_branch(struct jump_label_key *key)
{
- asm goto("1:\n\t"
+ asm_volatile_goto("1:\n\t"
"nop\n\t"
".pushsection __jump_table, \"aw\"\n\t"
JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"