ia64/xen-unstable

changeset 19262:310c85c9cb86

ia64: fix build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Mar 02 16:24:50 2009 +0000 (2009-03-02)
parents c62b453f27d5
children bb281d11fa99
files xen/arch/x86/hvm/vmsi.c xen/drivers/passthrough/io.c
line diff
     1.1 --- a/xen/arch/x86/hvm/vmsi.c	Mon Mar 02 14:09:21 2009 +0000
     1.2 +++ b/xen/arch/x86/hvm/vmsi.c	Mon Mar 02 16:24:50 2009 +0000
     1.3 @@ -378,13 +378,12 @@ static void del_msixtbl_entry(struct msi
     1.4      call_rcu(&entry->rcu, free_msixtbl_entry);
     1.5  }
     1.6  
     1.7 -int msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable)
     1.8 +void msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable)
     1.9  {
    1.10      irq_desc_t *irq_desc;
    1.11      struct msi_desc *msi_desc;
    1.12      struct pci_dev *pdev;
    1.13      struct msixtbl_entry *entry;
    1.14 -    int r = -EINVAL;
    1.15  
    1.16      /* pcidevs_lock already held */
    1.17      irq_desc = domain_spin_lock_irq_desc(d, pirq, NULL);
    1.18 @@ -418,8 +417,6 @@ found:
    1.19  
    1.20  out:
    1.21      spin_unlock_irq(&irq_desc->lock);
    1.22 -    return r;
    1.23 -
    1.24  }
    1.25  
    1.26  void msixtbl_pt_unregister(struct domain *d, int pirq)
    1.27 @@ -461,6 +458,7 @@ found:
    1.28      spin_unlock(&d->arch.hvm_domain.msixtbl_list_lock);
    1.29      spin_unlock(&irq_desc->lock);
    1.30  }
    1.31 +
    1.32  void msixtbl_pt_cleanup(struct domain *d, int pirq)
    1.33  {
    1.34      struct msixtbl_entry *entry, *temp;
     2.1 --- a/xen/drivers/passthrough/io.c	Mon Mar 02 14:09:21 2009 +0000
     2.2 +++ b/xen/drivers/passthrough/io.c	Mon Mar 02 16:24:50 2009 +0000
     2.3 @@ -58,8 +58,13 @@ static void pt_irq_time_out(void *data)
     2.4      pirq_guest_eoi(irq_map->dom, machine_gsi);
     2.5  }
     2.6  
     2.7 -extern int msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable);
     2.8 -extern int msixtbl_pt_unregister(struct domain *d, int pirq);
     2.9 +#ifdef CONFIG_X86
    2.10 +extern void msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable);
    2.11 +extern void msixtbl_pt_unregister(struct domain *d, int pirq);
    2.12 +#else
    2.13 +#define msixtbl_pt_register(d, p, g) ((void)0)
    2.14 +#define msixtbl_pt_unregister(d, p)  ((void)0)
    2.15 +#endif
    2.16  
    2.17  int pt_irq_create_bind_vtd(
    2.18      struct domain *d, xen_domctl_bind_pt_irq_t *pt_irq_bind)