Skip to content
  • Linus Torvalds's avatar
    Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 32c6cdf7
    Linus Torvalds authored
    Pull x86 fixes from Thomas Gleixner:
     "A set of small fixes for 4.15:
    
       - Fix vmapped stack synchronization on systems with 4-level paging
         and a large amount of memory caused by a missing 5-level folding
         which made the pgd synchronization logic to fail and causing double
         faults.
    
       - Add a missing sanity check in the vmalloc_fault() logic on 5-level
         paging systems.
    
       - Bring back protection against accessing a freed initrd in the
         microcode loader which was lost by a wrong merge conflict
         resolution.
    
       - Extend the Broadwell micro code loading sanity check.
    
       - Add a missing ENDPROC annotation in ftrace assembly code which
         makes ORC unhappy.
    
       - Prevent loading the AMD power module on !AMD platforms. The load
         itself is uncritical, but an unload attempt results in a kernel
         crash.
    
       - Update Peter Anvins role in the MAINTAINERS file"
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/ftrace: Add one more ENDPROC annotation
      x86: Mark hpa as a "Designated Reviewer" for the time being
      x86/mm/64: Tighten up vmalloc_fault() sanity checks on 5-level kernels
      x86/mm/64: Fix vmapped stack syncing on very-large-memory 4-level systems
      x86/microcode: Fix again accessing initrd after having been freed
      x86/microcode/intel: Extend BDW late-loading further with LLC size check
      perf/x86/amd/power: Do not load AMD power module on !AMD platforms
    32c6cdf7