diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
| commit | 329f0a8a35a664fb33f58f10538f5440ee19c54e (patch) | |
| tree | 270e7764e6fe54c982626bd2af294cedf4afbc5f /arch/mn10300 | |
| parent | a5fa2660d787d8416f426cd622778a5d8851ac36 (diff) | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
| download | talos-obmc-linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.gz talos-obmc-linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.zip | |
Merge 4.13-rc2 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mn10300')
| -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" \ : \ |
