From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 29 Jan 2018 19:29:40 +0000 (-0500)
Subject: x86: Fix compile issues if CONFIG_XEN not defined
X-Git-Tag: v4.1.12-124.31.3~1230
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5e86fd5926c37f8250b71d3d5b0be277edb7ddb9;p=users%2Fjedix%2Flinux-maple.git

x86: Fix compile issues if CONFIG_XEN not defined

We added the usage of 'xen_initial_domain()' but forgot
to include the header file.

OraBug: 27477720
Reviewed-by: John Haxby <john.haxby@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index af1e5c8d7910..8cd8a7ae42de 100644
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -9,6 +9,8 @@
 #include <asm/spec_ctrl.h>
 #include <asm/apic.h>
 
+#include <xen/xen.h>
+
 struct cpuid_bit {
 	u16 feature;
 	u8 reg;
diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c
index 9946a34130d9..5863d9d2b34e 100644
--- a/arch/x86/mm/kaiser.c
+++ b/arch/x86/mm/kaiser.c
@@ -21,6 +21,8 @@
 #include <asm/desc.h>
 #include <asm/cmdline.h>
 
+#include <xen/xen.h>
+
 int kaiser_enabled __read_mostly = 1;
 EXPORT_SYMBOL(kaiser_enabled);	/* for inlined TLB flush functions */
 
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 3c1c011c17ec..d7328f42b0c9 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -20,6 +20,7 @@
 
 #include "asm/xen/vnuma.h"
 #include "numa_internal.h"
+#include <xen/xen.h>
 
 int __initdata numa_off;
 nodemask_t numa_nodes_parsed __initdata;