WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] [IA64] Fix IA64 build.

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 04e5e80be909c06737b84ce776028b5d60118406
# Parent  d6783fd456ed1c5547430aa3946354da99c69b37
[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@xxxxxx>
---
 xen/arch/ia64/vmx/mmio.c                    |    2 +-
 xen/arch/ia64/vmx/vlsapic.c                 |    2 +-
 xen/arch/ia64/vmx/vmx_init.c                |    5 ++---
 xen/arch/ia64/vmx/vmx_vcpu.c                |    2 +-
 xen/arch/ia64/xen/domain.c                  |    3 +--
 xen/arch/ia64/xen/hyperprivop.S             |    2 +-
 xen/arch/ia64/xen/vcpu.c                    |    2 +-
 xen/arch/ia64/xen/xenasm.S                  |    2 +-
 xen/include/asm-ia64/domain.h               |    2 +-
 xen/include/asm-ia64/event.h                |    2 +-
 xen/include/asm-ia64/linux-xen/asm/ptrace.h |    3 ++-
 xen/include/asm-ia64/privop_stat.h          |    3 ++-
 xen/include/asm-ia64/vcpu.h                 |    3 ++-
 xen/include/asm-ia64/vmx_platform.h         |    1 -
 xen/include/asm-ia64/vmx_vpd.h              |    2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/vmx/mmio.c
--- a/xen/arch/ia64/vmx/mmio.c  Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/vmx/mmio.c  Mon Aug 14 18:38:28 2006 +0100
@@ -33,7 +33,7 @@
 #include <asm/mm.h>
 #include <asm/vmx.h>
 #include <public/event_channel.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <linux/event.h>
 #include <xen/domain.h>
 /*
diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/vmx/vlsapic.c
--- a/xen/arch/ia64/vmx/vlsapic.c       Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/vmx/vlsapic.c       Mon Aug 14 18:38:28 2006 +0100
@@ -21,7 +21,7 @@
  */
 
 #include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>
diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/vmx/vmx_init.c
--- a/xen/arch/ia64/vmx/vmx_init.c      Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/vmx/vmx_init.c      Mon Aug 14 18:38:28 2006 +0100
@@ -41,15 +41,14 @@
 #include <asm/vmx_vcpu.h>
 #include <xen/lib.h>
 #include <asm/vmmu.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <public/hvm/ioreq.h>
+#include <public/event_channel.h>
 #include <asm/vmx_phy_mode.h>
 #include <asm/processor.h>
 #include <asm/vmx.h>
 #include <xen/mm.h>
-#include <public/arch-ia64.h>
 #include <asm/hvm/vioapic.h>
-#include <public/event_channel.h>
 #include <xen/event.h>
 #include <asm/vlsapic.h>
 
diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/vmx/vmx_vcpu.c
--- a/xen/arch/ia64/vmx/vmx_vcpu.c      Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c      Mon Aug 14 18:38:28 2006 +0100
@@ -24,7 +24,7 @@
  */
 
 #include <xen/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vmx_vcpu.h>
 #include <asm/regionreg.h>
diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/xen/domain.c        Mon Aug 14 18:38:28 2006 +0100
@@ -35,14 +35,13 @@
 #include <asm/pgalloc.h>
 #include <asm/offsets.h>  /* for IA64_THREAD_INFO_SIZE */
 #include <asm/vcpu.h>   /* for function declarations */
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <xen/domain.h>
 #include <asm/vmx.h>
 #include <asm/vmx_vcpu.h>
 #include <asm/vmx_vpd.h>
 #include <asm/vmx_phy_mode.h>
 #include <asm/vhpt.h>
-#include <public/arch-ia64.h>
 #include <asm/tlbflush.h>
 #include <asm/regionreg.h>
 #include <asm/dom_fw.h>
diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/xen/hyperprivop.S
--- a/xen/arch/ia64/xen/hyperprivop.S   Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/xen/hyperprivop.S   Mon Aug 14 18:38:28 2006 +0100
@@ -14,7 +14,7 @@
 #include <asm/system.h>
 #include <asm/debugger.h>
 #include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 
 
 #define        _PAGE_PPN_MASK  0x0003fffffffff000 //asm/pgtable.h doesn't do 
assembly
diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c  Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/xen/vcpu.c  Mon Aug 14 18:38:28 2006 +0100
@@ -7,7 +7,7 @@
  */
 
 #include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>
diff -r d6783fd456ed -r 04e5e80be909 xen/arch/ia64/xen/xenasm.S
--- a/xen/arch/ia64/xen/xenasm.S        Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/arch/ia64/xen/xenasm.S        Mon Aug 14 18:38:28 2006 +0100
@@ -11,7 +11,7 @@
 #include <asm/pgtable.h>
 #include <asm/vhpt.h>
 #include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
        
 // Change rr7 to the passed value while ensuring
 // Xen is mapped into the new region.
diff -r d6783fd456ed -r 04e5e80be909 xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h     Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/include/asm-ia64/domain.h     Mon Aug 14 18:38:28 2006 +0100
@@ -6,7 +6,7 @@
 #include <asm/vmx_vpd.h>
 #include <asm/vmmu.h>
 #include <asm/regionreg.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/vmx_platform.h>
 #include <xen/list.h>
 #include <xen/cpumask.h>
diff -r d6783fd456ed -r 04e5e80be909 xen/include/asm-ia64/event.h
--- a/xen/include/asm-ia64/event.h      Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/include/asm-ia64/event.h      Mon Aug 14 18:38:28 2006 +0100
@@ -9,7 +9,7 @@
 #ifndef __ASM_EVENT_H__
 #define __ASM_EVENT_H__
 
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/vcpu.h>
 
 static inline void vcpu_kick(struct vcpu *v)
diff -r d6783fd456ed -r 04e5e80be909 xen/include/asm-ia64/linux-xen/asm/ptrace.h
--- a/xen/include/asm-ia64/linux-xen/asm/ptrace.h       Mon Aug 14 17:57:37 
2006 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/ptrace.h       Mon Aug 14 18:38:28 
2006 +0100
@@ -96,7 +96,8 @@
  *
  */
 #ifdef XEN
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 #define pt_regs cpu_user_regs
 
 /*  User regs at placed at the end of the vcpu area.
diff -r d6783fd456ed -r 04e5e80be909 xen/include/asm-ia64/privop_stat.h
--- a/xen/include/asm-ia64/privop_stat.h        Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/include/asm-ia64/privop_stat.h        Mon Aug 14 18:38:28 2006 +0100
@@ -1,6 +1,7 @@
 #ifndef _XEN_UA64_PRIVOP_STAT_H
 #define _XEN_UA64_PRIVOP_STAT_H
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 
 extern int dump_privop_counts_to_user(char *, int);
 extern int zero_privop_counts_to_user(char *, int);
diff -r d6783fd456ed -r 04e5e80be909 xen/include/asm-ia64/vcpu.h
--- a/xen/include/asm-ia64/vcpu.h       Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/include/asm-ia64/vcpu.h       Mon Aug 14 18:38:28 2006 +0100
@@ -7,7 +7,8 @@
 #include <asm/fpu.h>
 #include <asm/tlb.h>
 #include <asm/ia64_int.h>
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 typedef        unsigned long UINT64;
 typedef        unsigned int UINT;
 typedef        int BOOLEAN;
diff -r d6783fd456ed -r 04e5e80be909 xen/include/asm-ia64/vmx_platform.h
--- a/xen/include/asm-ia64/vmx_platform.h       Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/include/asm-ia64/vmx_platform.h       Mon Aug 14 18:38:28 2006 +0100
@@ -21,7 +21,6 @@
 
 #include <public/xen.h>
 #include <public/hvm/params.h>
-#include <public/arch-ia64.h>
 #include <asm/hvm/vioapic.h>
 struct mmio_list;
 typedef struct virtual_platform_def {
diff -r d6783fd456ed -r 04e5e80be909 xen/include/asm-ia64/vmx_vpd.h
--- a/xen/include/asm-ia64/vmx_vpd.h    Mon Aug 14 17:57:37 2006 +0100
+++ b/xen/include/asm-ia64/vmx_vpd.h    Mon Aug 14 18:38:28 2006 +0100
@@ -26,7 +26,7 @@
 
 #include <asm/vtm.h>
 #include <asm/vmx_platform.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 
 #define VPD_SHIFT      17      /* 128K requirement */
 #define VPD_SIZE       (1 << VPD_SHIFT)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] [IA64] Fix IA64 build., Xen patchbot-unstable <=