korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Browse Source 
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
This commit is contained in:
Linus Torvalds 2015-07-08 17:15:55 -07:00
commit 331c5841dd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/tile/lib/memcpy_user_64.c
View File

@ -28,7 +28,7 @@
#define _ST(p, inst, v) \ #define _ST(p, inst, v) \
({ \ ({ \
asm("1: " #inst " %0, %1;" \ asm("1: " #inst " %0, %1;" \
".pushsection .coldtext.memcpy,\"ax\";" \ ".pushsection .coldtext,\"ax\";" \
"2: { move r0, %2; jrp lr };" \ "2: { move r0, %2; jrp lr };" \
".section __ex_table,\"a\";" \ ".section __ex_table,\"a\";" \
".align 8;" \ ".align 8;" \
@ -41,7 +41,7 @@
({ \ ({ \
unsigned long __v; \ unsigned long __v; \
asm("1: " #inst " %0, %1;" \ asm("1: " #inst " %0, %1;" \
".pushsection .coldtext.memcpy,\"ax\";" \ ".pushsection .coldtext,\"ax\";" \
"2: { move r0, %2; jrp lr };" \ "2: { move r0, %2; jrp lr };" \
".section __ex_table,\"a\";" \ ".section __ex_table,\"a\";" \
".align 8;" \ ".align 8;" \

3
scripts/mod/modpost.c
View File

@ -886,7 +886,8 @@ static void check_section(const char *modname, struct elf_info *elf,
#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ #define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \
".kprobes.text" ".kprobes.text"
#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
".fixup", ".entry.text", ".exception.text", ".text.*" ".fixup", ".entry.text", ".exception.text", ".text.*", \
".coldtext"
#define INIT_SECTIONS ".init.*" #define INIT_SECTIONS ".init.*"
#define MEM_INIT_SECTIONS ".meminit.*" #define MEM_INIT_SECTIONS ".meminit.*"