summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-12 12:39:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-12 12:39:02 -0700
commit0e1117b2572b82ddc329d570f7c9bab355e4dc3b (patch)
treeece82dede09c11725409f0b5f6dd1a8b21855174 /arch
parent99091700659f4df965e138b38b4fa26a29b7eade (diff)
parent6862e6ad95e984991a6ceec592cf67831658f928 (diff)
downloadlinux-stable-0e1117b2572b82ddc329d570f7c9bab355e4dc3b.tar.gz
linux-stable-0e1117b2572b82ddc329d570f7c9bab355e4dc3b.tar.bz2
linux-stable-0e1117b2572b82ddc329d570f7c9bab355e4dc3b.zip
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar: "A fix for EFI capsules and an SGI UV platform fix" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/capsule: Allocate whole capsule into virtual memory x86/platform/uv: Skip UV runtime services mapping in the efi_runtime_disabled case
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/platform/uv/bios_uv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 66b2166ea4a1..0df8a0370d32 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -187,7 +187,8 @@ EXPORT_SYMBOL_GPL(uv_bios_set_legacy_vga_target);
void uv_bios_init(void)
{
uv_systab = NULL;
- if ((efi.uv_systab == EFI_INVALID_TABLE_ADDR) || !efi.uv_systab) {
+ if ((efi.uv_systab == EFI_INVALID_TABLE_ADDR) ||
+ !efi.uv_systab || efi_runtime_disabled()) {
pr_crit("UV: UVsystab: missing\n");
return;
}