diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-06 19:03:35 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-11 19:19:34 +0200 |
| commit | 97ffab1f14638d2c95ad986ce735481d164a0bd2 (patch) | |
| tree | ed5c5c072d5b7dbb5c087dcb682072ff3075dbf2 /arch/x86/pci/xen.c | |
| parent | xen/pci: Remove 'xen_allocate_pirq_gsi'. (diff) | |
| download | linux-97ffab1f14638d2c95ad986ce735481d164a0bd2.tar.xz linux-97ffab1f14638d2c95ad986ce735481d164a0bd2.zip | |
xen/pci: Use 'acpi_gsi_to_irq' value unconditionally.
In the past we would only use the function's value if the
returned value was not equal to 'acpi_sci_override_gsi'. Meaning
that the INT_SRV_OVR values for global and source irq were different.
But it is OK to use the function's value even when the global
and source irq are the same.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/pci/xen.c')
| -rw-r--r-- | arch/x86/pci/xen.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index f07c419a616c..1017c7bee388 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -407,10 +407,9 @@ static __init void xen_setup_acpi_sci(void) * the ACPI interpreter and keels over since IRQ 9 has not been * setup as we had setup IRQ 20 for it). */ - /* Check whether the GSI != IRQ */ if (acpi_gsi_to_irq(gsi, &irq) == 0) { - if (irq >= 0 && irq != gsi) - /* Bugger, we MUST have that IRQ. */ + /* Use the provided value if it's valid. */ + if (irq >= 0) gsi_override = irq; } |