Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'irq-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip

* 'irq-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  x86, iommu: Mark DMAR IRQ as non-threaded
  genirq: Make irq_shutdown() symmetric vs. irq_startup again
Linus Torvalds 13 years ago
parent
50f2d407c0 477694e711
commit
9d037a7776
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      drivers/iommu/dmar.c
  2. 1 1
      kernel/irq/chip.c

+ 1 - 1
drivers/iommu/dmar.c
View File 

@@ -1388,7 +1388,7 @@ int dmar_set_interrupt(struct intel_iommu *iommu)
 
 		return ret;
 
 		return ret;
 
 	}
 
 	}
 
 
 
-	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);
 
+	ret = request_irq(irq, dmar_fault, IRQF_NO_THREAD, iommu->name, iommu);
 
 	if (ret)
 
 	if (ret)
 
 		printk(KERN_ERR "IOMMU: can't request irq\n");
 
 		printk(KERN_ERR "IOMMU: can't request irq\n");
 
 	return ret;
 
 	return ret;

+ 1 - 1
kernel/irq/chip.c
View File 

@@ -178,7 +178,7 @@ void irq_shutdown(struct irq_desc *desc)
 
 	desc->depth = 1;
 
 	desc->depth = 1;
 
 	if (desc->irq_data.chip->irq_shutdown)
 
 	if (desc->irq_data.chip->irq_shutdown)
 
 		desc->irq_data.chip->irq_shutdown(&desc->irq_data);
 
 		desc->irq_data.chip->irq_shutdown(&desc->irq_data);
 
-	if (desc->irq_data.chip->irq_disable)
 
+	else if (desc->irq_data.chip->irq_disable)
 
 		desc->irq_data.chip->irq_disable(&desc->irq_data);
 
 		desc->irq_data.chip->irq_disable(&desc->irq_data);
 
 	else
 
 	else
 
 		desc->irq_data.chip->irq_mask(&desc->irq_data);
 
 		desc->irq_data.chip->irq_mask(&desc->irq_data);