# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID a0a93337f9abfce7dae0da565e359ddd2cac5163
# Parent a67c1bcb5522de11bb367b5d694e66a3bea672e3
Define an architecture-specific 'long' type for ABI compatibility.
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
xen/include/public/arch-ia64.h | 2 ++
xen/include/public/arch-x86_32.h | 2 ++
xen/include/public/arch-x86_64.h | 2 ++
xen/include/public/memory.h | 12 ++++++------
4 files changed, 12 insertions(+), 6 deletions(-)
diff -r a67c1bcb5522 -r a0a93337f9ab xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h Thu Jun 29 14:30:41 2006 +0100
+++ b/xen/include/public/arch-ia64.h Thu Jun 29 14:37:32 2006 +0100
@@ -39,6 +39,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
#define MAX_VIRT_CPUS 64
#ifndef __ASSEMBLY__
+
+typedef unsigned long xen_ulong_t;
#define MAX_NR_SECTION 32 /* at most 32 memory holes */
struct mm_section {
diff -r a67c1bcb5522 -r a0a93337f9ab xen/include/public/arch-x86_32.h
--- a/xen/include/public/arch-x86_32.h Thu Jun 29 14:30:41 2006 +0100
+++ b/xen/include/public/arch-x86_32.h Thu Jun 29 14:37:32 2006 +0100
@@ -97,6 +97,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
#define MAX_VIRT_CPUS 32
#ifndef __ASSEMBLY__
+
+typedef unsigned long xen_ulong_t;
/*
* Send an array of these to HYPERVISOR_set_trap_table()
diff -r a67c1bcb5522 -r a0a93337f9ab xen/include/public/arch-x86_64.h
--- a/xen/include/public/arch-x86_64.h Thu Jun 29 14:30:41 2006 +0100
+++ b/xen/include/public/arch-x86_64.h Thu Jun 29 14:37:32 2006 +0100
@@ -104,6 +104,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
#define MAX_VIRT_CPUS 32
#ifndef __ASSEMBLY__
+
+typedef unsigned long xen_ulong_t;
/*
* int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base)
diff -r a67c1bcb5522 -r a0a93337f9ab xen/include/public/memory.h
--- a/xen/include/public/memory.h Thu Jun 29 14:30:41 2006 +0100
+++ b/xen/include/public/memory.h Thu Jun 29 14:37:32 2006 +0100
@@ -32,7 +32,7 @@ struct xen_memory_reservation {
XEN_GUEST_HANDLE(xen_pfn_t) extent_start;
/* Number of extents, and size/alignment of each (2^extent_order pages). */
- unsigned long nr_extents;
+ xen_ulong_t nr_extents;
unsigned int extent_order;
/*
@@ -90,7 +90,7 @@ struct xen_memory_exchange {
* command will be non-zero.
* 5. THIS FIELD MUST BE INITIALISED TO ZERO BY THE CALLER!
*/
- unsigned long nr_exchanged;
+ xen_ulong_t nr_exchanged;
};
typedef struct xen_memory_exchange xen_memory_exchange_t;
DEFINE_XEN_GUEST_HANDLE(xen_memory_exchange_t);
@@ -148,8 +148,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_machphys_mfn
*/
#define XENMEM_machphys_mapping 12
struct xen_machphys_mapping {
- unsigned long v_start, v_end; /* Start and end virtual addresses. */
- unsigned long max_mfn; /* Maximum MFN that can be looked up. */
+ xen_ulong_t v_start, v_end; /* Start and end virtual addresses. */
+ xen_ulong_t max_mfn; /* Maximum MFN that can be looked up. */
};
typedef struct xen_machphys_mapping xen_machphys_mapping_t;
DEFINE_XEN_GUEST_HANDLE(xen_machphys_mapping_t);
@@ -170,7 +170,7 @@ struct xen_add_to_physmap {
unsigned int space;
/* Index into source mapping space. */
- unsigned long idx;
+ xen_ulong_t idx;
/* GPFN where the source mapping page should appear. */
xen_pfn_t gpfn;
@@ -188,7 +188,7 @@ struct xen_translate_gpfn_list {
domid_t domid;
/* Length of list. */
- unsigned long nr_gpfns;
+ xen_ulong_t nr_gpfns;
/* List of GPFNs to translate. */
XEN_GUEST_HANDLE(xen_pfn_t) gpfn_list;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home