From 33f35f2a4ee3abfc0f87990058aa1b6b5092f725 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 3 Aug 2011 22:00:38 -1000 Subject: x86: don't include xen/xen.h in unless XEN is enabled Dmitry Kasatkin reports: "kernel-devel package with kernel headers have no 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 should be also behind CONFIG_XEN flag." So move the include of down into the section that is conditional on CONFIG_XEN. Reported-by: Dmitry Kasatkin Signed-off-by: Linus Torvalds --- arch/x86/include/asm/io.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index d02804d650c4..d8e8eefbe24c 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -40,8 +40,6 @@ #include #include -#include - #define build_mmio_read(name, size, type, reg, barrier) \ static inline type name(const volatile void __iomem *addr) \ { type ret; asm volatile("mov" size " %1,%0":reg (ret) \ @@ -334,6 +332,7 @@ extern void fixup_early_ioremap(void); extern bool is_early_ioremap_ptep(pte_t *ptep); #ifdef CONFIG_XEN +#include struct bio_vec; extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, -- cgit v1.2.3-59-g8ed1b