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

Commit 4935e04e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 94ef71a9 dad22328

arch/um/include/asm/common.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -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 : {