diff --git a/[refs] b/[refs] index 972ff2960b4e..c20afa2868f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 821f0f68ca5fa93c757a892129392e751a7407a3 +refs/heads/master: 44229b13bd74514ace76f7df40b388820a237288 diff --git a/trunk/drivers/iommu/amd_iommu.c b/trunk/drivers/iommu/amd_iommu.c index ff16c5ece735..b4e525908e66 100644 --- a/trunk/drivers/iommu/amd_iommu.c +++ b/trunk/drivers/iommu/amd_iommu.c @@ -4061,7 +4061,6 @@ static int setup_ioapic_entry(int irq, struct IO_APIC_route_entry *entry, /* * Mask level triggered irqs. - * Use IRQ_DELAYED_DISABLE for edge triggered irqs. */ if (attr->trigger) entry->mask = 1;