direct-io.hg

changeset 11098:04e5e80be909

[IA64] Fix IA64 build.

This patch gets ia64 building again on xen-unstable.hg due to the
addition of the uint64_t type in public/arch-ia64.h. I also cleaned
up directly including this file versus public/xen.h as ia64 seems to be
the only arch using it directly.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author kfraser@localhost.localdomain
date Mon Aug 14 18:38:28 2006 +0100 (2006-08-14)
parents d6783fd456ed
children b53b154a5126 3109eaa648e5
files xen/arch/ia64/vmx/mmio.c xen/arch/ia64/vmx/vlsapic.c xen/arch/ia64/vmx/vmx_init.c xen/arch/ia64/vmx/vmx_vcpu.c xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/hyperprivop.S xen/arch/ia64/xen/vcpu.c xen/arch/ia64/xen/xenasm.S xen/include/asm-ia64/domain.h xen/include/asm-ia64/event.h xen/include/asm-ia64/linux-xen/asm/ptrace.h xen/include/asm-ia64/privop_stat.h xen/include/asm-ia64/vcpu.h xen/include/asm-ia64/vmx_platform.h xen/include/asm-ia64/vmx_vpd.h
line diff
     1.1 --- a/xen/arch/ia64/vmx/mmio.c	Mon Aug 14 17:57:37 2006 +0100
     1.2 +++ b/xen/arch/ia64/vmx/mmio.c	Mon Aug 14 18:38:28 2006 +0100
     1.3 @@ -33,7 +33,7 @@
     1.4  #include <asm/mm.h>
     1.5  #include <asm/vmx.h>
     1.6  #include <public/event_channel.h>
     1.7 -#include <public/arch-ia64.h>
     1.8 +#include <public/xen.h>
     1.9  #include <linux/event.h>
    1.10  #include <xen/domain.h>
    1.11  /*
     2.1 --- a/xen/arch/ia64/vmx/vlsapic.c	Mon Aug 14 17:57:37 2006 +0100
     2.2 +++ b/xen/arch/ia64/vmx/vlsapic.c	Mon Aug 14 18:38:28 2006 +0100
     2.3 @@ -21,7 +21,7 @@
     2.4   */
     2.5  
     2.6  #include <linux/sched.h>
     2.7 -#include <public/arch-ia64.h>
     2.8 +#include <public/xen.h>
     2.9  #include <asm/ia64_int.h>
    2.10  #include <asm/vcpu.h>
    2.11  #include <asm/regionreg.h>
     3.1 --- a/xen/arch/ia64/vmx/vmx_init.c	Mon Aug 14 17:57:37 2006 +0100
     3.2 +++ b/xen/arch/ia64/vmx/vmx_init.c	Mon Aug 14 18:38:28 2006 +0100
     3.3 @@ -41,15 +41,14 @@
     3.4  #include <asm/vmx_vcpu.h>
     3.5  #include <xen/lib.h>
     3.6  #include <asm/vmmu.h>
     3.7 -#include <public/arch-ia64.h>
     3.8 +#include <public/xen.h>
     3.9  #include <public/hvm/ioreq.h>
    3.10 +#include <public/event_channel.h>
    3.11  #include <asm/vmx_phy_mode.h>
    3.12  #include <asm/processor.h>
    3.13  #include <asm/vmx.h>
    3.14  #include <xen/mm.h>
    3.15 -#include <public/arch-ia64.h>
    3.16  #include <asm/hvm/vioapic.h>
    3.17 -#include <public/event_channel.h>
    3.18  #include <xen/event.h>
    3.19  #include <asm/vlsapic.h>
    3.20  
     4.1 --- a/xen/arch/ia64/vmx/vmx_vcpu.c	Mon Aug 14 17:57:37 2006 +0100
     4.2 +++ b/xen/arch/ia64/vmx/vmx_vcpu.c	Mon Aug 14 18:38:28 2006 +0100
     4.3 @@ -24,7 +24,7 @@
     4.4   */
     4.5  
     4.6  #include <xen/sched.h>
     4.7 -#include <public/arch-ia64.h>
     4.8 +#include <public/xen.h>
     4.9  #include <asm/ia64_int.h>
    4.10  #include <asm/vmx_vcpu.h>
    4.11  #include <asm/regionreg.h>
     5.1 --- a/xen/arch/ia64/xen/domain.c	Mon Aug 14 17:57:37 2006 +0100
     5.2 +++ b/xen/arch/ia64/xen/domain.c	Mon Aug 14 18:38:28 2006 +0100
     5.3 @@ -35,14 +35,13 @@
     5.4  #include <asm/pgalloc.h>
     5.5  #include <asm/offsets.h>  /* for IA64_THREAD_INFO_SIZE */
     5.6  #include <asm/vcpu.h>   /* for function declarations */
     5.7 -#include <public/arch-ia64.h>
     5.8 +#include <public/xen.h>
     5.9  #include <xen/domain.h>
    5.10  #include <asm/vmx.h>
    5.11  #include <asm/vmx_vcpu.h>
    5.12  #include <asm/vmx_vpd.h>
    5.13  #include <asm/vmx_phy_mode.h>
    5.14  #include <asm/vhpt.h>
    5.15 -#include <public/arch-ia64.h>
    5.16  #include <asm/tlbflush.h>
    5.17  #include <asm/regionreg.h>
    5.18  #include <asm/dom_fw.h>
     6.1 --- a/xen/arch/ia64/xen/hyperprivop.S	Mon Aug 14 17:57:37 2006 +0100
     6.2 +++ b/xen/arch/ia64/xen/hyperprivop.S	Mon Aug 14 18:38:28 2006 +0100
     6.3 @@ -14,7 +14,7 @@
     6.4  #include <asm/system.h>
     6.5  #include <asm/debugger.h>
     6.6  #include <asm/asm-xsi-offsets.h>
     6.7 -#include <public/arch-ia64.h>
     6.8 +#include <public/xen.h>
     6.9  
    6.10  
    6.11  #define	_PAGE_PPN_MASK	0x0003fffffffff000 //asm/pgtable.h doesn't do assembly
     7.1 --- a/xen/arch/ia64/xen/vcpu.c	Mon Aug 14 17:57:37 2006 +0100
     7.2 +++ b/xen/arch/ia64/xen/vcpu.c	Mon Aug 14 18:38:28 2006 +0100
     7.3 @@ -7,7 +7,7 @@
     7.4   */
     7.5  
     7.6  #include <linux/sched.h>
     7.7 -#include <public/arch-ia64.h>
     7.8 +#include <public/xen.h>
     7.9  #include <asm/ia64_int.h>
    7.10  #include <asm/vcpu.h>
    7.11  #include <asm/regionreg.h>
     8.1 --- a/xen/arch/ia64/xen/xenasm.S	Mon Aug 14 17:57:37 2006 +0100
     8.2 +++ b/xen/arch/ia64/xen/xenasm.S	Mon Aug 14 18:38:28 2006 +0100
     8.3 @@ -11,7 +11,7 @@
     8.4  #include <asm/pgtable.h>
     8.5  #include <asm/vhpt.h>
     8.6  #include <asm/asm-xsi-offsets.h>
     8.7 -#include <public/arch-ia64.h>
     8.8 +#include <public/xen.h>
     8.9  	
    8.10  // Change rr7 to the passed value while ensuring
    8.11  // Xen is mapped into the new region.
     9.1 --- a/xen/include/asm-ia64/domain.h	Mon Aug 14 17:57:37 2006 +0100
     9.2 +++ b/xen/include/asm-ia64/domain.h	Mon Aug 14 18:38:28 2006 +0100
     9.3 @@ -6,7 +6,7 @@
     9.4  #include <asm/vmx_vpd.h>
     9.5  #include <asm/vmmu.h>
     9.6  #include <asm/regionreg.h>
     9.7 -#include <public/arch-ia64.h>
     9.8 +#include <public/xen.h>
     9.9  #include <asm/vmx_platform.h>
    9.10  #include <xen/list.h>
    9.11  #include <xen/cpumask.h>
    10.1 --- a/xen/include/asm-ia64/event.h	Mon Aug 14 17:57:37 2006 +0100
    10.2 +++ b/xen/include/asm-ia64/event.h	Mon Aug 14 18:38:28 2006 +0100
    10.3 @@ -9,7 +9,7 @@
    10.4  #ifndef __ASM_EVENT_H__
    10.5  #define __ASM_EVENT_H__
    10.6  
    10.7 -#include <public/arch-ia64.h>
    10.8 +#include <public/xen.h>
    10.9  #include <asm/vcpu.h>
   10.10  
   10.11  static inline void vcpu_kick(struct vcpu *v)
    11.1 --- a/xen/include/asm-ia64/linux-xen/asm/ptrace.h	Mon Aug 14 17:57:37 2006 +0100
    11.2 +++ b/xen/include/asm-ia64/linux-xen/asm/ptrace.h	Mon Aug 14 18:38:28 2006 +0100
    11.3 @@ -96,7 +96,8 @@
    11.4   *
    11.5   */
    11.6  #ifdef XEN
    11.7 -#include <public/arch-ia64.h>
    11.8 +#include <xen/types.h>
    11.9 +#include <public/xen.h>
   11.10  #define pt_regs cpu_user_regs
   11.11  
   11.12  /*  User regs at placed at the end of the vcpu area.
    12.1 --- a/xen/include/asm-ia64/privop_stat.h	Mon Aug 14 17:57:37 2006 +0100
    12.2 +++ b/xen/include/asm-ia64/privop_stat.h	Mon Aug 14 18:38:28 2006 +0100
    12.3 @@ -1,6 +1,7 @@
    12.4  #ifndef _XEN_UA64_PRIVOP_STAT_H
    12.5  #define _XEN_UA64_PRIVOP_STAT_H
    12.6 -#include <public/arch-ia64.h>
    12.7 +#include <xen/types.h>
    12.8 +#include <public/xen.h>
    12.9  
   12.10  extern int dump_privop_counts_to_user(char *, int);
   12.11  extern int zero_privop_counts_to_user(char *, int);
    13.1 --- a/xen/include/asm-ia64/vcpu.h	Mon Aug 14 17:57:37 2006 +0100
    13.2 +++ b/xen/include/asm-ia64/vcpu.h	Mon Aug 14 18:38:28 2006 +0100
    13.3 @@ -7,7 +7,8 @@
    13.4  #include <asm/fpu.h>
    13.5  #include <asm/tlb.h>
    13.6  #include <asm/ia64_int.h>
    13.7 -#include <public/arch-ia64.h>
    13.8 +#include <xen/types.h>
    13.9 +#include <public/xen.h>
   13.10  typedef	unsigned long UINT64;
   13.11  typedef	unsigned int UINT;
   13.12  typedef	int BOOLEAN;
    14.1 --- a/xen/include/asm-ia64/vmx_platform.h	Mon Aug 14 17:57:37 2006 +0100
    14.2 +++ b/xen/include/asm-ia64/vmx_platform.h	Mon Aug 14 18:38:28 2006 +0100
    14.3 @@ -21,7 +21,6 @@
    14.4  
    14.5  #include <public/xen.h>
    14.6  #include <public/hvm/params.h>
    14.7 -#include <public/arch-ia64.h>
    14.8  #include <asm/hvm/vioapic.h>
    14.9  struct mmio_list;
   14.10  typedef struct virtual_platform_def {
    15.1 --- a/xen/include/asm-ia64/vmx_vpd.h	Mon Aug 14 17:57:37 2006 +0100
    15.2 +++ b/xen/include/asm-ia64/vmx_vpd.h	Mon Aug 14 18:38:28 2006 +0100
    15.3 @@ -26,7 +26,7 @@
    15.4  
    15.5  #include <asm/vtm.h>
    15.6  #include <asm/vmx_platform.h>
    15.7 -#include <public/arch-ia64.h>
    15.8 +#include <public/xen.h>
    15.9  
   15.10  #define VPD_SHIFT	17	/* 128K requirement */
   15.11  #define VPD_SIZE	(1 << VPD_SHIFT)