ia64/xen-unstable

changeset 16862:1c826ea72a80

pv-on-hvm: Fix up linux code after hypercall-type-checking changes.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Jan 23 15:42:52 2008 +0000 (2008-01-23)
parents 5a3448506d9c
children 6496ad18c3e2
files unmodified_drivers/linux-2.6/platform-pci/evtchn.c unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c	Wed Jan 23 14:30:56 2008 +0000
     1.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c	Wed Jan 23 15:42:52 2008 +0000
     1.3 @@ -118,8 +118,8 @@ void unmask_evtchn(int port)
     1.4  	   ever bind event channels to vcpu 0 in HVM guests. */
     1.5  	if (unlikely(cpu != 0)) {
     1.6  		evtchn_unmask_t op = { .port = port };
     1.7 -		(void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask,
     1.8 -						  &op);
     1.9 +		VOID(HYPERVISOR_event_channel_op(EVTCHNOP_unmask,
    1.10 +						 &op));
    1.11  		put_cpu();
    1.12  		return;
    1.13  	}
    1.14 @@ -227,7 +227,8 @@ void unbind_from_irqhandler(unsigned int
    1.15  		mask_evtchn(evtchn);
    1.16  		if (irq_evtchn[irq].close) {
    1.17  			struct evtchn_close close = { .port = evtchn };
    1.18 -			HYPERVISOR_event_channel_op(EVTCHNOP_close, &close);
    1.19 +			if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close))
    1.20 +				BUG();
    1.21  		}
    1.22  	}
    1.23  
    1.24 @@ -310,7 +311,7 @@ static irqreturn_t evtchn_interrupt(int 
    1.25  
    1.26  void force_evtchn_callback(void)
    1.27  {
    1.28 -	(void)HYPERVISOR_xen_version(0, NULL);
    1.29 +	VOID(HYPERVISOR_xen_version(0, NULL));
    1.30  }
    1.31  EXPORT_SYMBOL(force_evtchn_callback);
    1.32  
     2.1 --- a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c	Wed Jan 23 14:30:56 2008 +0000
     2.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c	Wed Jan 23 15:42:52 2008 +0000
     2.3 @@ -58,7 +58,7 @@ static int bp_suspend(void)
     2.4  
     2.5  	BUG_ON(!irqs_disabled());
     2.6  
     2.7 -	suspend_cancelled = HYPERVISOR_shutdown(SHUTDOWN_suspend);
     2.8 +	suspend_cancelled = HYPERVISOR_suspend(0);
     2.9  
    2.10  	if (!suspend_cancelled) {
    2.11  		write_lock(&suspend_lock);