• Linus Torvalds's avatar
    Merge branch 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 269af9a1
    Linus Torvalds authored
    Pull exception table generation updates from Ingo Molnar:
     "The biggest change here is to allow the build-time sorting of the
      exception table, to speed up booting.  This is achieved by the
      architecture enabling BUILDTIME_EXTABLE_SORT.  This option is enabled
      for x86 and MIPS currently.
    
      On x86 a number of fixes and changes were needed to allow build-time
      sorting of the exception table, in particular a relocation invariant
      exception table format was needed.  This required the abstracting out
      of exception table protocol and the removal of 20 years of accumulated
      assumptions about the x86 exception table format.
    
      While at it, this tree also cleans up various other aspects of
      exception handling, such as early(er) exception handling for
      rdmsr_safe() et al.
    
      All in one, as the result of these changes the x86 exception code is
      now pretty nice and modern.  As an added bonus any regressions in this
      code will be early and violent crashes, so if you see any of those,
      you'll know whom to blame!"
    
    Fix up trivial conflicts in arch/{mips,x86}/Kconfig files due to nearby
    modifications of other core architecture options.
    
    * 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (35 commits)
      Revert "x86, extable: Disable presorted exception table for now"
      scripts/sortextable: Handle relative entries, and other cleanups
      x86, extable: Switch to relative exception table entries
      x86, extable: Disable presorted exception table for now
      x86, extable: Add _ASM_EXTABLE_EX() macro
      x86, extable: Remove open-coded exception table entries in arch/x86/ia32/ia32entry.S
      x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/xsave.h
      x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/kvm_host.h
      x86, extable: Remove the now-unused __ASM_EX_SEC macros
      x86, extable: Remove open-coded exception table entries in arch/x86/xen/xen-asm_32.S
      x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S
      x86, extable: Remove open-coded exception table entries in arch/x86/lib/usercopy_32.c
      x86, extable: Remove open-coded exception table entries in arch/x86/lib/putuser.S
      x86, extable: Remove open-coded exception table entries in arch/x86/lib/getuser.S
      x86, extable: Remove open-coded exception table entries in arch/x86/lib/csum-copy_64.S
      x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_nocache_64.S
      x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_64.S
      x86, extable: Remove open-coded exception table entries in arch/x86/lib/checksum_32.S
      x86, extable: Remove open-coded exception table entries in arch/x86/kernel/test_rodata.c
      x86, extable: Remove open-coded exception table entries in arch/x86/kernel/entry_64.S
      ...
    269af9a1