diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-20 09:09:20 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-20 09:09:20 -0800 |
| commit | d43b1135a6f695417d8f1424ac71985f263c30cc (patch) | |
| tree | e7fbac144b500376d128a07a275b02a9973ad9aa /drivers/xen | |
| parent | 34f26b231d5de2ba0c388fe2a34bbd7db7520442 (diff) | |
| parent | 428ff7d9ce1f7e35b0dcf65c4ec0b429cbc2240b (diff) | |
Merge remote branch 'konrad-xen/stable/bootup-fixes' into upstream/xen
* konrad-xen/stable/bootup-fixes:
xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs.
xen: implement XENMEM_machphys_mapping
xen: set IO permission early (before early_cpu_init())
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index d6d4f76ed500..2811bb988ea0 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -755,7 +755,7 @@ int xen_destroy_irq(int irq) goto out; if (xen_initial_domain()) { - unmap_irq.pirq = info->u.pirq.gsi; + unmap_irq.pirq = info->u.pirq.pirq; unmap_irq.domid = DOMID_SELF; rc = HYPERVISOR_physdev_op(PHYSDEVOP_unmap_pirq, &unmap_irq); if (rc) { |