[Xen-changelog] [IA64] compilation fix of ia64 hypervisor.c

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 874661fc2d42195c52b619d4be76e7231a62a8ff
# Parent  23694acabb72999a1390d0c96136734503f0df13
[IA64] compilation fix of ia64 hypervisor.c

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff -r 23694acabb72 -r 874661fc2d42 
linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c   Tue May 09 11:50:27 
2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c   Tue May 09 12:42:44 
2006 -0600
@@ -38,14 +38,20 @@
 //XXX xen/ia64 copy_from_guest() is broken.
 //    This is a temporal work around until it is fixed.
 //    used by balloon.c netfront.c
+
+// get_xen_guest_handle is defined only when __XEN_TOOLS__ is defined
+// if the definition in arch-ia64.h is changed, this must be updated.
+#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
+
 int
 ia64_xenmem_reservation_op(unsigned long op,
                           struct xen_memory_reservation* reservation__)
 {
        struct xen_memory_reservation reservation = *reservation__;
-       unsigned long* frame_list = reservation__->extent_start;
+       unsigned long* frame_list;
        unsigned long nr_extents = reservation__->nr_extents;
        int ret = 0;
+       get_xen_guest_handle(frame_list, reservation__->extent_start);
 
        BUG_ON(op != XENMEM_increase_reservation &&
               op != XENMEM_decrease_reservation &&
@@ -55,7 +61,7 @@ ia64_xenmem_reservation_op(unsigned long
                int tmp_ret;
                volatile unsigned long dummy;
 
-               reservation.extent_start = frame_list;
+               set_xen_guest_handle(reservation.extent_start, frame_list);
                reservation.nr_extents = nr_extents;
 
                dummy = frame_list[0];// re-install tlb entry before hypercall

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