summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-21 20:41:19 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-21 20:41:19 +0300
commit0a6109fd1b605cbfa58ae9ae9d571d0f4140b727 (patch)
treeecb3be1ce7bab9fe8821a9c40c8ba22fbee1f32d /arch/arm
parent921edf312a6a20be16cf2b60e0dec3dce35e5cb9 (diff)
parent325cdacd03c12629aa5f9ee2ace49b1f3dc184a8 (diff)
downloadlinux-0a6109fd1b605cbfa58ae9ae9d571d0f4140b727.tar.xz
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/arm')
-rw-r--r--arch/arm/include/asm/bug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h
index 4e6e88a6b2f4..2244a94ed9c9 100644
--- a/arch/arm/include/asm/bug.h
+++ b/arch/arm/include/asm/bug.h
@@ -37,7 +37,7 @@ do { \
".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \
"2:\t.asciz " #__file "\n" \
".popsection\n" \
- ".pushsection __bug_table,\"a\"\n" \
+ ".pushsection __bug_table,\"aw\"\n" \
".align 2\n" \
"3:\t.word 1b, 2b\n" \
"\t.hword " #__line ", 0\n" \