Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/include/asm/io.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <asm/byteorder.h>

#include <asm/memory.h>

#include <asm-generic/pci_iomap.h>

#include <xen/xen.h>



/*

 * ISA I/O bus memory addresses are 1:1 with the physical address.

arch/arm64/include/asm/io.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include <asm/alternative.h>

#include <asm/cpufeature.h>



#include <xen/xen.h>



/*

 * Generic IO read/write.  These perform native-endian accesses.

 */

arch/x86/include/asm/io.h

+0 −4
Original line number Diff line number Diff line
@@ -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);



#ifdef CONFIG_XEN

#include <xen/xen.h>

#endif	/* CONFIG_XEN */



#define IO_SPACE_LIMIT 0xffff



#include <asm-generic/io.h>

arch/x86/include/asm/xen/events.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef _ASM_X86_XEN_EVENTS_H

#define _ASM_X86_XEN_EVENTS_H



#include <xen/xen.h>



enum ipi_vector {

	XEN_RESCHEDULE_VECTOR,

	XEN_CALL_FUNCTION_VECTOR,

arch/x86/xen/enlighten.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/kexec.h>

#include <linux/slab.h>



#include <xen/xen.h>

#include <xen/features.h>

#include <xen/page.h>

#include <xen/interface/memory.h>