Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 331c5841 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9d993ccb 673c2c34

arch/tile/lib/memcpy_user_64.c

+2 −2
Original line number Diff line number Diff line
@@ -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;"					\

scripts/mod/modpost.c

+2 −1
Original line number Diff line number Diff line
@@ -886,7 +886,8 @@ static void check_section(const char *modname, struct elf_info *elf, 
#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \

		".kprobes.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 MEM_INIT_SECTIONS  ".meminit.*"