[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@valinux.co.jp>

diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index e242e36b04d6d610c7af1f5e40d6ec746c55e490..f48f513145e5a46c3dc042d851b4c01f4b7204fb 100644 (file)
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -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 --git a/arch/ia64/xen/hypercall.S b/arch/ia64/xen/hypercall.S
index dc5977886e8c6db985db5293960f916c1fc365f2..e86d9d98e327b584a20116ae67248c0f84bd9185 100644 (file)
--- a/arch/ia64/xen/hypercall.S
+++ b/arch/ia64/xen/hypercall.S
@@ -4,8 +4,8 @@
  * Copyright (C) 2005 Dan Magenheimer <dan.magenheimer@hp.com>
  */
 
-#include <asm/processor.h>
 #include <asm/asmmacro.h>
+#include <asm/intrinsics.h>
 
 GLOBAL_ENTRY(xen_get_psr)
        XEN_HYPER_GET_PSR

diff --git a/arch/ia64/xen/xenhpski.c b/arch/ia64/xen/xenhpski.c
index 3bc6cdbf7ec7e78d7911644544bbd9b90495ac30..fa08b6a27c261334136796c642eaae47e6af2a7e 100644 (file)
--- a/arch/ia64/xen/xenhpski.c
+++ b/arch/ia64/xen/xenhpski.c
@@ -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 --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h
index 509110f34fae187f53d6a3aed06b2b4c14410347..99a8f8e1218c18283fbfe96baf1547d5e3b500d9 100644 (file)
--- a/include/asm-ia64/dma-mapping.h
+++ b/include/asm-ia64/dma-mapping.h
@@ -6,12 +6,6 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>
  */
 #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, enum dma_data_direction dir)
 
 #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 --git a/include/asm-ia64/hypercall.h b/include/asm-ia64/hypercall.h
index 9848b306fc2a13e7c2cba7f7a677d1a82a5e84f0..49a8287ec8f18b4fbebdad3ad228149d3e0738d6 100644 (file)
--- a/include/asm-ia64/hypercall.h
+++ b/include/asm-ia64/hypercall.h
@@ -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 --git a/include/asm-ia64/hypervisor.h b/include/asm-ia64/hypervisor.h
index 3b04529507c63dc578fa1c81e7a24d0e8b4b3b3e..16cc9b9dc36c0780d8da464164056ee76fc50602 100644 (file)
--- a/include/asm-ia64/hypervisor.h
+++ b/include/asm-ia64/hypervisor.h
@@ -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 --git a/include/asm-ia64/intrinsics.h b/include/asm-ia64/intrinsics.h
index 3a95aa432e99f839dc94da7ae0b2786629a8cbcf..626ceb7e00b0e10ae4cc769d13d163250ebfeaf5 100644 (file)
--- a/include/asm-ia64/intrinsics.h
+++ b/include/asm-ia64/intrinsics.h
@@ -177,4 +177,5 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void);
 #endif /* !CONFIG_IA64_DEBUG_CMPXCHG */
 
 #endif
+#include <asm/privop.h>
 #endif /* _ASM_IA64_INTRINSICS_H */

diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h
index cc48ed1954752133bf889d4b7712ab00df7bc535..aca0e8c82a20bc135ec7ce398e8df030acbdc2d7 100644 (file)
--- a/include/asm-ia64/io.h
+++ b/include/asm-ia64/io.h
@@ -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 --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 1837234c638d500fc09db8f631d0d138b15c0e04..265f4824db0e2e6ea04abc225f81758547a8de62 100644 (file)
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -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 --git a/include/asm-ia64/xen/privop.h b/include/asm-ia64/xen/privop.h
index 84e9e3e5a9eb17f2c4111aba167735be5f5f828a..294e6b2409c0116bbab8f8f41b2e98fd651e7081 100644 (file)
--- a/include/asm-ia64/xen/privop.h
+++ b/include/asm-ia64/xen/privop.h
@@ -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