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/mn10300/include | |
| 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/mn10300/include')
| -rw-r--r-- | arch/mn10300/include/asm/bug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/bug.h b/arch/mn10300/include/asm/bug.h index aa6a38886391..811414fb002d 100644 --- a/arch/mn10300/include/asm/bug.h +++ b/arch/mn10300/include/asm/bug.h @@ -21,7 +21,7 @@ do { \ asm volatile( \ " syscall 15 \n" \ "0: \n" \ - " .section __bug_table,\"a\" \n" \ + " .section __bug_table,\"aw\" \n" \ " .long 0b,%0,%1 \n" \ " .previous \n" \ : \ |