# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1183667191 21600
# Node ID a52d392e18e758f5f6ae05b2deef90794c07b5e7
# Parent 7357f635cc41b806aa18696bde56bc31df91e3e0
[IA64] linux header inclusion clean up.
With this patch dma-mapping.h and processor.h become unmodified.
privops.h overrides gcc/intel intrinsics methods so it should be
included from intrinsics.h
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
arch/ia64/kernel/gate.S | 3 ---
arch/ia64/xen/hypercall.S | 2 +-
arch/ia64/xen/xenhpski.c | 4 ++--
include/asm-ia64/dma-mapping.h | 23 +----------------------
include/asm-ia64/hypercall.h | 3 ---
include/asm-ia64/hypervisor.h | 16 ++++++++++++++++
include/asm-ia64/intrinsics.h | 1 +
include/asm-ia64/io.h | 2 --
include/asm-ia64/processor.h | 1 -
include/asm-ia64/xen/privop.h | 4 +++-
10 files changed, 24 insertions(+), 35 deletions(-)
diff -r 7357f635cc41 -r a52d392e18e7 arch/ia64/kernel/gate.S
--- a/arch/ia64/kernel/gate.S Thu Jul 05 14:24:26 2007 -0600
+++ b/arch/ia64/kernel/gate.S Thu Jul 05 14:26:31 2007 -0600
@@ -13,9 +13,6 @@
#include <asm/sigcontext.h>
#include <asm/system.h>
#include <asm/unistd.h>
-#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
-# include <asm/privop.h>
-#endif
/*
* We can't easily refer to symbols inside the kernel. To avoid full runtime
relocation,
diff -r 7357f635cc41 -r a52d392e18e7 arch/ia64/xen/hypercall.S
--- a/arch/ia64/xen/hypercall.S Thu Jul 05 14:24:26 2007 -0600
+++ b/arch/ia64/xen/hypercall.S Thu Jul 05 14:26:31 2007 -0600
@@ -4,8 +4,8 @@
* Copyright (C) 2005 Dan Magenheimer <dan.magenheimer@xxxxxx>
*/
-#include <asm/processor.h>
#include <asm/asmmacro.h>
+#include <asm/intrinsics.h>
GLOBAL_ENTRY(xen_get_psr)
XEN_HYPER_GET_PSR
diff -r 7357f635cc41 -r a52d392e18e7 arch/ia64/xen/xenhpski.c
--- a/arch/ia64/xen/xenhpski.c Thu Jul 05 14:24:26 2007 -0600
+++ b/arch/ia64/xen/xenhpski.c Thu Jul 05 14:26:31 2007 -0600
@@ -1,5 +1,5 @@
-
-extern unsigned long xen_get_cpuid(int);
+#include <linux/kernel.h>
+#include <asm/hypervisor.h>
int
running_on_sim(void)
diff -r 7357f635cc41 -r a52d392e18e7 include/asm-ia64/dma-mapping.h
--- a/include/asm-ia64/dma-mapping.h Thu Jul 05 14:24:26 2007 -0600
+++ b/include/asm-ia64/dma-mapping.h Thu Jul 05 14:26:31 2007 -0600
@@ -6,12 +6,6 @@
* David Mosberger-Tang <davidm@xxxxxxxxxx>
*/
#include <asm/machvec.h>
-#ifdef CONFIG_XEN
-/* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
-#include <asm/hypervisor.h>
-/* Needed for arch/i386/kernel/swiotlb.c */
-#include <asm/swiotlb.h>
-#endif
#define dma_alloc_coherent platform_dma_alloc_coherent
#define dma_alloc_noncoherent platform_dma_alloc_coherent /* coherent
mem. is cheap */
@@ -26,6 +20,7 @@
#define dma_sync_single_for_device platform_dma_sync_single_for_device
#define dma_sync_sg_for_device platform_dma_sync_sg_for_device
#define dma_mapping_error platform_dma_mapping_error
+
#define dma_map_page(dev, pg, off, size, dir) \
dma_map_single(dev, page_address(pg) + (off), (size), (dir))
#define dma_unmap_page(dev, dma_addr, size, dir) \
@@ -66,20 +61,4 @@ dma_cache_sync (void *vaddr, size_t size
#define dma_is_consistent(dma_handle) (1) /* all we do is coherent
memory... */
-#ifdef CONFIG_XEN
-static inline int
-range_straddles_page_boundary(void *p, size_t size)
-{
- extern unsigned long *contiguous_bitmap;
-
- if (!is_running_on_xen())
- return 0;
-
- return (((((unsigned long)p & ~PAGE_MASK) + size) > PAGE_SIZE) &&
- !test_bit(__pa(p) >> PAGE_SHIFT, contiguous_bitmap));
-}
-#else
-#define range_straddles_page_boundary(addr, size) (0)
-#endif
-
#endif /* _ASM_IA64_DMA_MAPPING_H */
diff -r 7357f635cc41 -r a52d392e18e7 include/asm-ia64/hypercall.h
--- a/include/asm-ia64/hypercall.h Thu Jul 05 14:24:26 2007 -0600
+++ b/include/asm-ia64/hypercall.h Thu Jul 05 14:26:31 2007 -0600
@@ -238,9 +238,6 @@ static inline void exit_idle(void) {}
})
#include <linux/err.h>
-#ifdef CONFIG_XEN
-#include <asm/xen/privop.h>
-#endif /* CONFIG_XEN */
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
#include <xen/platform-compat.h>
#endif
diff -r 7357f635cc41 -r a52d392e18e7 include/asm-ia64/hypervisor.h
--- a/include/asm-ia64/hypervisor.h Thu Jul 05 14:24:26 2007 -0600
+++ b/include/asm-ia64/hypervisor.h Thu Jul 05 14:26:31 2007 -0600
@@ -225,4 +225,20 @@ asmlinkage int xprintk(const char *fmt,
#define is_initial_xendomain() 0
#endif
+#ifdef CONFIG_XEN
+static inline int
+range_straddles_page_boundary(void *p, size_t size)
+{
+ extern unsigned long *contiguous_bitmap;
+
+ if (!is_running_on_xen())
+ return 0;
+
+ return (((((unsigned long)p & ~PAGE_MASK) + size) > PAGE_SIZE) &&
+ !test_bit(__pa(p) >> PAGE_SHIFT, contiguous_bitmap));
+}
+#else
+#define range_straddles_page_boundary(addr, size) (0)
+#endif
+
#endif /* __HYPERVISOR_H__ */
diff -r 7357f635cc41 -r a52d392e18e7 include/asm-ia64/intrinsics.h
--- a/include/asm-ia64/intrinsics.h Thu Jul 05 14:24:26 2007 -0600
+++ b/include/asm-ia64/intrinsics.h Thu Jul 05 14:26:31 2007 -0600
@@ -177,4 +177,5 @@ extern long ia64_cmpxchg_called_with_bad
#endif /* !CONFIG_IA64_DEBUG_CMPXCHG */
#endif
+#include <asm/privop.h>
#endif /* _ASM_IA64_INTRINSICS_H */
diff -r 7357f635cc41 -r a52d392e18e7 include/asm-ia64/io.h
--- a/include/asm-ia64/io.h Thu Jul 05 14:24:26 2007 -0600
+++ b/include/asm-ia64/io.h Thu Jul 05 14:26:31 2007 -0600
@@ -66,11 +66,9 @@ extern unsigned int num_io_spaces;
#define PIO_RESERVED __IA64_UNCACHED_OFFSET
#define HAVE_ARCH_PIO_SIZE
-#include <asm/hypervisor.h>
#include <asm/intrinsics.h>
#include <asm/machvec.h>
#include <asm/page.h>
-#include <asm/privop.h>
#include <asm/system.h>
#include <asm-generic/iomap.h>
diff -r 7357f635cc41 -r a52d392e18e7 include/asm-ia64/processor.h
--- a/include/asm-ia64/processor.h Thu Jul 05 14:24:26 2007 -0600
+++ b/include/asm-ia64/processor.h Thu Jul 05 14:26:31 2007 -0600
@@ -18,7 +18,6 @@
#include <asm/kregs.h>
#include <asm/ptrace.h>
#include <asm/ustack.h>
-#include <asm/privop.h>
#define IA64_NUM_DBG_REGS 8
/*
diff -r 7357f635cc41 -r a52d392e18e7 include/asm-ia64/xen/privop.h
--- a/include/asm-ia64/xen/privop.h Thu Jul 05 14:24:26 2007 -0600
+++ b/include/asm-ia64/xen/privop.h Thu Jul 05 14:26:31 2007 -0600
@@ -9,7 +9,9 @@
*
*/
-
+#ifndef __ASSEMBLY__
+#include <linux/types.h> /* arch-ia64.h requires uint64_t */
+#endif
#include <xen/interface/arch-ia64.h>
#define IA64_PARAVIRTUALIZED
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home