tree 98b2ecf1b606bd843356a8df7826a2e1c78d1eca
parent 4c4ce3022dc7352d05de4d8e1602c9a2a14458bf
parent 945fd17ab6bab8a4d05da6c3170519fbcfe62ddb
author Linus Torvalds <torvalds@linux-foundation.org> 1520192416 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1520192416 -0800

Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/pti fixes from Thomas Gleixner:
 "Three fixes related to melted spectrum:

   - Sync the cpu_entry_area page table to initial_page_table on 32 bit.

     Otherwise suspend/resume fails because resume uses
     initial_page_table and triggers a triple fault when accessing the
     cpu entry area.

   - Zero the SPEC_CTL MRS on XEN before suspend to address a
     shortcoming in the hypervisor.

   - Fix another switch table detection issue in objtool"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu_entry_area: Sync cpu_entry_area to initial_page_table
  objtool: Fix another switch table detection issue
  x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend