• Linus Torvalds's avatar
    Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · bdb0ae6a
    Linus Torvalds authored
    Pull x86 fixes from Peter Anvin:
     "This is a collection of miscellaneous fixes, the most important one is
      the fix for the Samsung laptop bricking issue (auto-blacklisting the
      samsung-laptop driver); the efi_enabled() changes you see below are
      prerequisites for that fix.
    
      The other issues fixed are booting on OLPC XO-1.5, an UV fix, NMI
      debugging, and requiring CAP_SYS_RAWIO for MSR references, just as
      with I/O port references."
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      samsung-laptop: Disable on EFI hardware
      efi: Make 'efi_enabled' a function to query EFI facilities
      smp: Fix SMP function call empty cpu mask race
      x86/msr: Add capabilities check
      x86/dma-debug: Bump PREALLOC_DMA_DEBUG_ENTRIES
      x86/olpc: Fix olpc-xo1-sci.c build errors
      arch/x86/platform/uv: Fix incorrect tlb flush all issue
      x86-64: Fix unwind annotations in recent NMI changes
      x86-32: Start out cr0 clean, disable paging before modifying cr3/4
    bdb0ae6a
main.c 21.6 KB