ia64/xen-unstable

changeset 7163:d443f03f8be0

Merged.
author emellor@ewan
date Sun Oct 02 18:24:41 2005 +0100 (2005-10-02)
parents 70d5bfbf23d4 9d047fb99e38
children 5fbc42383481 5db9a237f8ce
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c	Sun Oct 02 18:22:22 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c	Sun Oct 02 18:24:41 2005 +0100
     1.3 @@ -65,7 +65,8 @@ static int __xencons_ring_send(
     1.4  int xencons_ring_send(const char *data, unsigned len)
     1.5  {
     1.6  	int sent = __xencons_ring_send(outring(), data, len);
     1.7 -	notify_remote_via_irq(xencons_irq);
     1.8 +	/* Use evtchn: this is called early, before irq is set up. */
     1.9 +	notify_remote_via_evtchn(xen_start_info->console_evtchn);
    1.10  	return sent;
    1.11  }	
    1.12  
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c	Sun Oct 02 18:22:22 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c	Sun Oct 02 18:24:41 2005 +0100
     2.3 @@ -147,7 +147,7 @@ int xb_write(const void *data, unsigned 
     2.4  		data += avail;
     2.5  		len -= avail;
     2.6  		update_output_chunk(out, avail);
     2.7 -		notify_remote_via_irq(xenbus_irq);
     2.8 +		notify_remote_via_evtchn(xen_start_info->store_evtchn);
     2.9  	} while (len != 0);
    2.10  
    2.11  	return 0;
    2.12 @@ -192,7 +192,7 @@ int xb_read(void *data, unsigned len)
    2.13  		pr_debug("Finished read of %i bytes (%i to go)\n", avail, len);
    2.14  		/* If it was full, tell them we've taken some. */
    2.15  		if (was_full)
    2.16 -			notify_remote_via_irq(xenbus_irq);
    2.17 +			notify_remote_via_evtchn(xen_start_info->store_evtchn);
    2.18  	}
    2.19  
    2.20  	/* If we left something, wake watch thread to deal with it. */