From: Ingo Molnar Date: Tue, 27 Oct 2015 17:40:47 +0000 (+0100) Subject: Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi... X-Git-Tag: KARO-TX6UL-2015-11-03~56^2~22^2~2 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=06ef431ab8060aa8ef51b36f56773d01f6a53f24 Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into core/efi Pull EFI fix from Matt Fleming: - Fix a kernel panic by not passing EFI virtual mapping addresses to __pa() in the x86 pageattr code. Since these virtual addreses are not part of the direct mapping or kernel text mapping, passing them to __pa() will trigger a BUG_ON() when CONFIG_DEBUG_VIRTUAL is enabled. (Sai Praneeth Prakhya) Signed-off-by: Ingo Molnar --- 06ef431ab8060aa8ef51b36f56773d01f6a53f24