• Linus Torvalds's avatar
    Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7cc3afdf
    Linus Torvalds authored
    Pull x86 EFI changes from Ingo Molnar:
     "The main changes:
      - Add debug code to the dump EFI pagetable - Borislav Petkov
      - Make 1:1 runtime mapping robust when booting on machines with lots
        of memory - Borislav Petkov
      - Move the EFI facilities bits out of 'x86_efi_facility' and into
        efi.flags which is the standard architecture independent place to
        keep EFI state, by Matt Fleming.
      - Add 'EFI mixed mode' support: this allows 64-bit kernels to be
        booted from 32-bit firmware.  This needs a bootloader that supports
        the 'EFI handover protocol'.  By Matt Fleming"
    * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
      x86, efi: Abstract x86 efi_early calls
      x86/efi: Restore 'attr' argument to query_variable_info()
      x86/efi: Rip out phys_efi_get_time()
      x86/efi: Preserve segment registers in mixed mode
      x86/boot: Fix non-EFI build
      x86, tools: Fix up compiler warnings
      x86/efi: Re-disable interrupts after calling firmware services
      x86/boot: Don't overwrite cr4 when enabling PAE
      x86/efi: Wire up CONFIG_EFI_MIXED
      x86/efi: Add mixed runtime services support
      x86/efi: Firmware agnostic handover entry points
      x86/efi: Split the boot stub into 32/64 code paths
      x86/efi: Add early thunk code to go from 64-bit to 32-bit
      x86/efi: Build our own EFI services pointer table
      efi: Add separate 32-bit/64-bit definitions
      x86/efi: Delete dead code when checking for non-native
      x86/mm/pageattr: Always dump the right page table in an oops
      x86, tools: Consolidate #ifdef code
      x86/boot: Cleanup header.S by removing some #ifdefs
      efi: Use NULL instead of 0 for pointer
fault.c 31.2 KB