summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-09 03:15:55 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-09 03:15:55 +0300
commit331c5841ddbb4cf3034ffc425a70f42acc5cdaff (patch)
tree760d9e605c904a34aae64dad2c0b4f427c2bf64c /arch
parent9d993ccb004f93b745d1557ab034928d995dad59 (diff)
parent673c2c34f684e9d4328459e426ab54d51a5865c5 (diff)
downloadlinux-331c5841ddbb4cf3034ffc425a70f42acc5cdaff.tar.xz
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile fix from Chris Metcalf: "This fix eliminates a "section mismatch" warning caused by the new __ex_table checking code in modpost" * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: modpost: work correctly with tile coldtext sections
Diffstat (limited to 'arch')
-rw-r--r--arch/tile/lib/memcpy_user_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/lib/memcpy_user_64.c b/arch/tile/lib/memcpy_user_64.c
index 88c7016492c4..97bbb6060b25 100644
--- a/arch/tile/lib/memcpy_user_64.c
+++ b/arch/tile/lib/memcpy_user_64.c
@@ -28,7 +28,7 @@
#define _ST(p, inst, v) \
({ \
asm("1: " #inst " %0, %1;" \
- ".pushsection .coldtext.memcpy,\"ax\";" \
+ ".pushsection .coldtext,\"ax\";" \
"2: { move r0, %2; jrp lr };" \
".section __ex_table,\"a\";" \
".align 8;" \
@@ -41,7 +41,7 @@
({ \
unsigned long __v; \
asm("1: " #inst " %0, %1;" \
- ".pushsection .coldtext.memcpy,\"ax\";" \
+ ".pushsection .coldtext,\"ax\";" \
"2: { move r0, %2; jrp lr };" \
".section __ex_table,\"a\";" \
".align 8;" \