summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-21 10:41:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-21 10:41:19 -0700
commit0a6109fd1b605cbfa58ae9ae9d571d0f4140b727 (patch)
treeecb3be1ce7bab9fe8821a9c40c8ba22fbee1f32d /arch/blackfin
parent921edf312a6a20be16cf2b60e0dec3dce35e5cb9 (diff)
parent325cdacd03c12629aa5f9ee2ace49b1f3dc184a8 (diff)
downloadlinux-stable-0a6109fd1b605cbfa58ae9ae9d571d0f4140b727.tar.gz
linux-stable-0a6109fd1b605cbfa58ae9ae9d571d0f4140b727.tar.bz2
linux-stable-0a6109fd1b605cbfa58ae9ae9d571d0f4140b727.zip
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar: "A fix to WARN_ON_ONCE() done by modules, plus a MAINTAINERS update" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: debug: Fix WARN_ON_ONCE() for modules MAINTAINERS: Update the PTRACE entry
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/include/asm/bug.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/bug.h b/arch/blackfin/include/asm/bug.h
index 8d9b1eba89c4..76b2e82ee730 100644
--- a/arch/blackfin/include/asm/bug.h
+++ b/arch/blackfin/include/asm/bug.h
@@ -21,7 +21,7 @@
#define _BUG_OR_WARN(flags) \
asm volatile( \
"1: .hword %0\n" \
- " .section __bug_table,\"a\",@progbits\n" \
+ " .section __bug_table,\"aw\",@progbits\n" \
"2: .long 1b\n" \
" .long %1\n" \
" .short %2\n" \
@@ -38,7 +38,7 @@
#define _BUG_OR_WARN(flags) \
asm volatile( \
"1: .hword %0\n" \
- " .section __bug_table,\"a\",@progbits\n" \
+ " .section __bug_table,\"aw\",@progbits\n" \
"2: .long 1b\n" \
" .short %1\n" \
" .org 2b + %2\n" \