projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55a0d3f d3768d8)
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jul 2013 23:25:50 +0000 (16:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jul 2013 23:25:50 +0000 (16:25 -0700)
Pull x86 EFI changes from Ingo Molnar:
 "Two fixes that should in principle increase robustness of our
  interaction with the EFI firmware, and a cleanup"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: retry ExitBootServices() on failure
  efi: Convert runtime services function ptrs
  UEFI: Don't pass boot services regions to SetVirtualAddressMap()

1  2 
arch/x86/boot/compressed/eboot.c patch | diff1 | diff2 | blob | history
arch/x86/include/asm/efi.h patch | diff1 | diff2 | blob | history
arch/x86/platform/efi/efi.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/boot/compressed/eboot.c
Simple merge
diff --cc arch/x86/include/asm/efi.h
Simple merge
diff --cc arch/x86/platform/efi/efi.c
Simple merge
Domain: System / Uncategorized;