diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-07-26 18:39:07 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-07-26 18:39:07 -0400 |
| commit | 78acea381d6eb1c67b155e7e2638ba3b1728eb07 (patch) | |
| tree | 323b89e2f43f5f177223aeb61a6a18fe12eda011 /arch/arm/include/asm/bug.h | |
| parent | 67022227ffb1f588e70deeccc9246ec93e26f980 (diff) | |
| parent | e6742e1021a5cec55fab50a0b115c65217488eda (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge drm-next with -rc2 in it to pull in a couple stm patches that
were previously incorrectly applied to -misc-next. By picking them up in
the correct manner, git will hopefully fix any errant trees that are out
in the wild.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'arch/arm/include/asm/bug.h')
| -rw-r--r-- | arch/arm/include/asm/bug.h | 2 |
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" \ |