summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-24 23:04:59 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-24 23:04:59 +0300
commit4935e04ef431c7980ba6e8145ad4c697abccf6b9 (patch)
tree42782178ada579cf88bdd48a1262a704b6cc4732 /arch
parent94ef71a99a60cb03eda550410bc0b4db77ea50cf (diff)
parentdad2232844073295c64e9cc2d734a0ade043e0f6 (diff)
downloadlinux-4935e04ef431c7980ba6e8145ad4c697abccf6b9.tar.xz
Merge branch 'for-linus-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fix from Richard Weinberger: "This contains a fix for a build regression introduced during the merge window" * 'for-linus-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: Don't discard .text.exit section
Diffstat (limited to 'arch')
-rw-r--r--arch/um/include/asm/common.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S
index 1dd5bd8a8c59..133055311dce 100644
--- a/arch/um/include/asm/common.lds.S
+++ b/arch/um/include/asm/common.lds.S
@@ -81,7 +81,7 @@
.altinstr_replacement : { *(.altinstr_replacement) }
/* .exit.text is discard at runtime, not link time, to deal with references
from .altinstructions and .eh_frame */
- .exit.text : { *(.exit.text) }
+ .exit.text : { EXIT_TEXT }
.exit.data : { *(.exit.data) }
.preinit_array : {