diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/um/include/asm/common.lds.S | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/um/include/asm/common.lds.S')
| -rw-r--r-- | arch/um/include/asm/common.lds.S | 2 |
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 @@ | |||
| 81 | .altinstr_replacement : { *(.altinstr_replacement) } | 81 | .altinstr_replacement : { *(.altinstr_replacement) } |
| 82 | /* .exit.text is discard at runtime, not link time, to deal with references | 82 | /* .exit.text is discard at runtime, not link time, to deal with references |
| 83 | from .altinstructions and .eh_frame */ | 83 | from .altinstructions and .eh_frame */ |
| 84 | .exit.text : { *(.exit.text) } | 84 | .exit.text : { EXIT_TEXT } |
| 85 | .exit.data : { *(.exit.data) } | 85 | .exit.data : { *(.exit.data) } |
| 86 | 86 | ||
| 87 | .preinit_array : { | 87 | .preinit_array : { |