From aebe4cafebd33b9b55ab7bc102e351774539200d Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Date: Wed, 3 Aug 2011 19:33:00 +0300
Subject: [PATCH] xen: asm/io.h should not include xen.h if XEN is disabled

kernel-devel package with kernel headers have no <include/xen> directory
if XEN is disabled. Modules which inclide asm/io.h won't compile.

XEN related content is behind the CONFIG_XEN flag in the io.h.
And <xen/xen.h> should be also behind CONFIG_XEN flag.

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 arch/x86/include/asm/io.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index d02804d650c4..de8202cf7859 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -40,7 +40,9 @@
 #include <linux/compiler.h>
 #include <asm/page.h>
 
+#ifdef CONFIG_XEN
 #include <xen/xen.h>
+#endif
 
 #define build_mmio_read(name, size, type, reg, barrier) \
 static inline type name(const volatile void __iomem *addr) \
-- 
2.39.5