diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 19:41:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 19:41:19 +0200 |
| commit | 0a6109fd1b605cbfa58ae9ae9d571d0f4140b727 (patch) | |
| tree | ecb3be1ce7bab9fe8821a9c40c8ba22fbee1f32d /arch/sh | |
| parent | ide: avoid warning for timings calculation (diff) | |
| parent | debug: Fix WARN_ON_ONCE() for modules (diff) | |
| download | linux-0a6109fd1b605cbfa58ae9ae9d571d0f4140b727.tar.xz linux-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/sh')
| -rw-r--r-- | arch/sh/include/asm/bug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/bug.h b/arch/sh/include/asm/bug.h index c9828f785ca0..5b5086367639 100644 --- a/arch/sh/include/asm/bug.h +++ b/arch/sh/include/asm/bug.h @@ -24,14 +24,14 @@ */ #ifdef CONFIG_DEBUG_BUGVERBOSE #define _EMIT_BUG_ENTRY \ - "\t.pushsection __bug_table,\"a\"\n" \ + "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b, %O1\n" \ "\t.short %O2, %O3\n" \ "\t.org 2b+%O4\n" \ "\t.popsection\n" #else #define _EMIT_BUG_ENTRY \ - "\t.pushsection __bug_table,\"a\"\n" \ + "\t.pushsection __bug_table,\"aw\"\n" \ "2:\t.long 1b\n" \ "\t.short %O3\n" \ "\t.org 2b+%O4\n" \ |