ia64/xen-unstable

changeset 7664:7d81d6b8c302

Fix domU (by Kevin Tian)
author djm@kirby.fc.hp.com
date Tue Nov 08 12:15:55 2005 -0600 (2005-11-08)
parents 66dd96e90be4
children d3594980a8f1
files linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c	Mon Nov 07 20:40:31 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c	Tue Nov 08 12:15:55 2005 -0600
     1.3 @@ -36,14 +36,6 @@ int bind_virq_to_irq(int virq, int cpu)
     1.4  	while(1);
     1.5  }
     1.6  
     1.7 -#if 0
     1.8 -void notify_remote_via_irq(int virq)
     1.9 -{
    1.10 -	printk("notify_remote_via_irq called... FIXME??\n");
    1.11 -	while(1);
    1.12 -}
    1.13 -#endif
    1.14 -
    1.15  void unbind_virq_from_evtchn(int virq)
    1.16  {
    1.17      evtchn_op_t op;
    1.18 @@ -91,10 +83,9 @@ void unbind_evtchn_from_irq(unsigned int
    1.19  
    1.20  void notify_remote_via_irq(int irq)
    1.21  {
    1.22 -	int evtchn = virq_to_evtchn[irq];	// FIXME... is this right??
    1.23 -
    1.24 -	if (VALID_EVTCHN(evtchn))
    1.25 -		notify_remote_via_evtchn(evtchn);
    1.26 +	/* IA64 has same irq value as event channel vector */
    1.27 +	if (VALID_EVTCHN(irq))
    1.28 +		notify_remote_via_evtchn(irq);
    1.29  }
    1.30  
    1.31  irqreturn_t evtchn_interrupt(int irq, void *dev_id, struct pt_regs *regs)
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Mon Nov 07 20:40:31 2005 -0600
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Tue Nov 08 12:15:55 2005 -0600
     2.3 @@ -51,6 +51,12 @@ static int map_frontend_page(blkif_t *bl
     2.4  	blkif->shmem_ref = shared_page;
     2.5  	blkif->shmem_handle = op.handle;
     2.6  
     2.7 +#ifdef __ia64__
     2.8 +	/* on some arch's, map_grant_ref behaves like mmap, in that the
     2.9 +	 * passed address is a hint and a different address may be returned */
    2.10 +	blkif->blk_ring_area->addr = gnttab_map_vaddr(op);
    2.11 +#endif
    2.12 +
    2.13  	return 0;
    2.14  }
    2.15