diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:44:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:44:53 -0700 |
| commit | 997271cf5e12c1b38aec0764187094663501c984 (patch) | |
| tree | 45760ec5aa3fd3da05f73b1e52190562fe286093 /drivers | |
| parent | 896d01796d33e50589c96bbef5f0017d3cfc4ee8 (diff) | |
| parent | 97ffab1f14638d2c95ad986ce735481d164a0bd2 (diff) | |
Merge branch 'stable/pci.cleanups.v1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/pci.cleanups.v1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/pci: Use 'acpi_gsi_to_irq' value unconditionally.
xen/pci: Remove 'xen_allocate_pirq_gsi'.
xen/pci: Retire unnecessary #ifdef CONFIG_ACPI
xen/pci: Move the allocation of IRQs when there are no IOAPIC's to the end
xen/pci: Squash pci_xen_initial_domain and xen_setup_pirqs together.
xen/pci: Use the xen_register_pirq for HVM and initial domain users
xen/pci: In xen_register_pirq bind the GSI to the IRQ after the hypercall.
xen/pci: Provide #ifdef CONFIG_ACPI to easy code squashing.
xen/pci: Update comments and fix empty spaces.
xen/pci: Shuffle code around.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/events.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 30df85d8fca8..da70f5c32eb9 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -615,11 +615,6 @@ static int find_irq_by_gsi(unsigned gsi) return -1; } -int xen_allocate_pirq_gsi(unsigned gsi) -{ - return gsi; -} - /* * Do not make any assumptions regarding the relationship between the * IRQ number returned here and the Xen pirq argument. @@ -1693,6 +1688,6 @@ void __init xen_init_IRQ(void) } else { irq_ctx_init(smp_processor_id()); if (xen_initial_domain()) - xen_setup_pirqs(); + pci_xen_initial_domain(); } } |