ia64/xen-unstable

changeset 9981:874661fc2d42

[IA64] compilation fix of ia64 hypervisor.c

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author awilliam@xenbuild.aw
date Tue May 09 12:42:44 2006 -0600 (2006-05-09)
parents 23694acabb72
children 6e979aa0e6d2
files linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Tue May 09 11:50:27 2006 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Tue May 09 12:42:44 2006 -0600
     1.3 @@ -38,14 +38,20 @@
     1.4  //XXX xen/ia64 copy_from_guest() is broken.
     1.5  //    This is a temporal work around until it is fixed.
     1.6  //    used by balloon.c netfront.c
     1.7 +
     1.8 +// get_xen_guest_handle is defined only when __XEN_TOOLS__ is defined
     1.9 +// if the definition in arch-ia64.h is changed, this must be updated.
    1.10 +#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
    1.11 +
    1.12  int
    1.13  ia64_xenmem_reservation_op(unsigned long op,
    1.14  			   struct xen_memory_reservation* reservation__)
    1.15  {
    1.16  	struct xen_memory_reservation reservation = *reservation__;
    1.17 -	unsigned long* frame_list = reservation__->extent_start;
    1.18 +	unsigned long* frame_list;
    1.19  	unsigned long nr_extents = reservation__->nr_extents;
    1.20  	int ret = 0;
    1.21 +	get_xen_guest_handle(frame_list, reservation__->extent_start);
    1.22  
    1.23  	BUG_ON(op != XENMEM_increase_reservation &&
    1.24  	       op != XENMEM_decrease_reservation &&
    1.25 @@ -55,7 +61,7 @@ ia64_xenmem_reservation_op(unsigned long
    1.26  		int tmp_ret;
    1.27  		volatile unsigned long dummy;
    1.28  
    1.29 -		reservation.extent_start = frame_list;
    1.30 +		set_xen_guest_handle(reservation.extent_start, frame_list);
    1.31  		reservation.nr_extents = nr_extents;
    1.32  
    1.33  		dummy = frame_list[0];// re-install tlb entry before hypercall