From b1c0f304e177795ce349bc080af3d06273f7aa20 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 17 Dec 2008 16:36:44 +0100 Subject: [PATCH] --- yaml --- r: 119995 b: refs/heads/master c: 84df81759590ad16b0024cf46b3423cca76b2e07 h: refs/heads/master i: 119993: 58fb73ca2dd349e1ebf439075af4badbd67fb942 119991: 756420851964cf215e1cf49edafa30b9254b4d84 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca100557e632..7798d390d3fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf558d25e5c9f70fa0279c9b7b8b4aed7cae9bd4 +refs/heads/master: 84df81759590ad16b0024cf46b3423cca76b2e07 diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c index a7b6dec6fc3f..0a60d60ed036 100644 --- a/trunk/arch/x86/kernel/amd_iommu.c +++ b/trunk/arch/x86/kernel/amd_iommu.c @@ -235,8 +235,9 @@ static int iommu_completion_wait(struct amd_iommu *iommu) status &= ~MMIO_STATUS_COM_WAIT_INT_MASK; writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET); - if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit())) - printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n"); + if (unlikely(i == EXIT_LOOP_COUNT)) + panic("AMD IOMMU: Completion wait loop failed\n"); + out: spin_unlock_irqrestore(&iommu->lock, flags);