---

yaml --- r: 234187 b: refs/heads/master c: dc5f219 h: refs/heads/master i: 234185: 710c63b 234183: 50444d3 v: v3
git-mirror · Feb 8, 2011 · c27ace2 · c27ace2
1 parent f0d8f79
commit c27ace2
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 144 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f611f2da99420abc973c32cdbddbf5c365d0a20c
+refs/heads/master: dc5f219e88294b93009eef946251251ffffb6d60
diff --git a/trunk/arch/x86/pci/xen.c b/trunk/arch/x86/pci/xen.c
@@ -226,27 +226,21 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
 {
 	int rc;
 	int share = 1;
-	u8 gsi;
 
-	rc = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi);
-	if (rc < 0) {
-		dev_warn(&dev->dev, "Xen PCI: failed to read interrupt line: %d\n",
-			 rc);
-		return rc;
-	}
+	dev_info(&dev->dev, "Xen PCI enabling IRQ: %d\n", dev->irq);
 
-	if (gsi < NR_IRQS_LEGACY)
+	if (dev->irq < 0)
+		return -EINVAL;
+
+	if (dev->irq < NR_IRQS_LEGACY)
 		share = 0;
 
-	rc = xen_allocate_pirq(gsi, share, "pcifront");
+	rc = xen_allocate_pirq(dev->irq, share, "pcifront");
 	if (rc < 0) {
-		dev_warn(&dev->dev, "Xen PCI: failed to register GSI%d: %d\n",
-			 gsi, rc);
+		dev_warn(&dev->dev, "Xen PCI IRQ: %d, failed to register:%d\n",
+			 dev->irq, rc);
 		return rc;
 	}
-
-	dev->irq = rc;
-	dev_info(&dev->dev, "Xen PCI mapped GSI%d to IRQ%d\n", gsi, dev->irq);
 	return 0;
 }
 

diff --git a/trunk/arch/x86/xen/time.c b/trunk/arch/x86/xen/time.c
@@ -397,9 +397,7 @@ void xen_setup_timer(int cpu)
 		name = "<timer kasprintf failed>";
 
 	irq = bind_virq_to_irqhandler(VIRQ_TIMER, cpu, xen_timer_interrupt,
-				      IRQF_DISABLED|IRQF_PERCPU|
-				      IRQF_NOBALANCING|IRQF_TIMER|
-				      IRQF_FORCE_RESUME,
+				      IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING|IRQF_TIMER,
 				      name, NULL);
 
 	evt = &per_cpu(xen_clock_events, cpu);