From b96712c91daffa39533720448e3dbc09245a7e93 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 18 Feb 2011 16:43:30 +0000 Subject: [PATCH] --- yaml --- r: 234203 b: refs/heads/master c: 9a626612c2010699d9909a4c3141d3a38660f3b3 h: refs/heads/master i: 234201: c170bad9256fbbccb4a4b132c7178dd44565e345 234199: fa2dd8f38c714fc3c97d60de1859286feab2a334 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/xen.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 698ff59f1b21..568ef93ea177 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b41df7f6e0b5684378d9155773c42a4577e8582 +refs/heads/master: 9a626612c2010699d9909a4c3141d3a38660f3b3 diff --git a/trunk/arch/x86/pci/xen.c b/trunk/arch/x86/pci/xen.c index 6fd695b06faa..0d5087eeced8 100644 --- a/trunk/arch/x86/pci/xen.c +++ b/trunk/arch/x86/pci/xen.c @@ -20,7 +20,8 @@ #include #ifdef CONFIG_ACPI -static int xen_hvm_register_pirq(u32 gsi, int triggering) +static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi, + int trigger, int polarity) { int rc, irq; struct physdev_map_pirq map_irq; @@ -41,7 +42,7 @@ static int xen_hvm_register_pirq(u32 gsi, int triggering) return -1; } - if (triggering == ACPI_EDGE_SENSITIVE) { + if (trigger == ACPI_EDGE_SENSITIVE) { shareable = 0; name = "ioapic-edge"; } else { @@ -55,12 +56,6 @@ static int xen_hvm_register_pirq(u32 gsi, int triggering) return irq; } - -static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi, - int trigger, int polarity) -{ - return xen_hvm_register_pirq(gsi, trigger); -} #endif #if defined(CONFIG_PCI_MSI)