summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-24 19:52:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-24 19:52:24 -0700
commitaa34e07e457ed13b44d680b5b605e3e5a585f611 (patch)
tree0c46cb911f52cb0f19082bf925758d7f1f4527c7 /arch
parent0d7317598214134d73da59990b846481a9527a00 (diff)
parentc251f15c7dbf2cb72e7b2b282020b41f4e4d3665 (diff)
downloadlinux-aa34e07e457ed13b44d680b5b605e3e5a585f611.tar.bz2
Merge tag 'for-linus-4.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from David Vrabel: - advertise control feature flags in xenstore - fix x86 build when XEN_PVHVM is disabled * tag 'for-linus-4.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xenbus: check return value of xenbus_scanf() xenbus: prefer list_for_each() x86: xen: move cpu_up functions out of ifdef xenbus: advertise control feature flags
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/enlighten.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index c0fdd57da7aa..bdd855685403 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1837,6 +1837,7 @@ static void __init init_hvm_pv_info(void)
xen_domain_type = XEN_HVM_DOMAIN;
}
+#endif
static int xen_cpu_up_prepare(unsigned int cpu)
{
@@ -1887,6 +1888,7 @@ static int xen_cpu_up_online(unsigned int cpu)
return 0;
}
+#ifdef CONFIG_XEN_PVHVM
#ifdef CONFIG_KEXEC_CORE
static void xen_hvm_shutdown(void)
{