Commit 3cfa210b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

xen: don't include <xen/xen.h> from <asm/io.h> and <asm/dma-mapping.h>

Nothing Xen specific in these headers, which get included from a lot
of code in the kernel.  So prune the includes and move them to the
Xen-specific files that actually use them instead.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c39ae60d
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/memory.h> #include <asm/memory.h>
#include <asm-generic/pci_iomap.h> #include <asm-generic/pci_iomap.h>
#include <xen/xen.h>
/* /*
* ISA I/O bus memory addresses are 1:1 with the physical address. * ISA I/O bus memory addresses are 1:1 with the physical address.
......
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#include <xen/xen.h>
/* /*
* Generic IO read/write. These perform native-endian accesses. * Generic IO read/write. These perform native-endian accesses.
*/ */
......
...@@ -369,10 +369,6 @@ extern void __iomem *ioremap_wt(resource_size_t offset, unsigned long size); ...@@ -369,10 +369,6 @@ extern void __iomem *ioremap_wt(resource_size_t offset, unsigned long size);
extern bool is_early_ioremap_ptep(pte_t *ptep); extern bool is_early_ioremap_ptep(pte_t *ptep);
#ifdef CONFIG_XEN
#include <xen/xen.h>
#endif /* CONFIG_XEN */
#define IO_SPACE_LIMIT 0xffff #define IO_SPACE_LIMIT 0xffff
#include <asm-generic/io.h> #include <asm-generic/io.h>
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#ifndef _ASM_X86_XEN_EVENTS_H #ifndef _ASM_X86_XEN_EVENTS_H
#define _ASM_X86_XEN_EVENTS_H #define _ASM_X86_XEN_EVENTS_H
#include <xen/xen.h>
enum ipi_vector { enum ipi_vector {
XEN_RESCHEDULE_VECTOR, XEN_RESCHEDULE_VECTOR,
XEN_CALL_FUNCTION_VECTOR, XEN_CALL_FUNCTION_VECTOR,
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <linux/kexec.h> #include <linux/kexec.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <xen/xen.h>
#include <xen/features.h> #include <xen/features.h>
#include <xen/page.h> #include <xen/page.h>
#include <xen/interface/memory.h> #include <xen/interface/memory.h>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <asm/xen/interface.h> #include <asm/xen/interface.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
#include <xen/xen.h>
#include <xen/interface/memory.h> #include <xen/interface/memory.h>
#include <xen/interface/hvm/start_info.h> #include <xen/interface/hvm/start_info.h>
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/export.h> #include <linux/export.h>
#include <xen/xen.h>
#include <xen/platform_pci.h> #include <xen/platform_pci.h>
#include "xen-ops.h" #include "xen-ops.h"
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
#include <xen/xen.h>
#include <xen/page.h> #include <xen/page.h>
#include <xen/interface/xen.h> #include <xen/interface/xen.h>
#include <xen/interface/vcpu.h> #include <xen/interface/vcpu.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <xen/xen.h>
#include <xen/interface/version.h> #include <xen/interface/version.h>
#include <xen/xen-ops.h> #include <xen/xen-ops.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment