diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-07-08 09:51:56 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 10:01:52 +0200 |
| commit | bde78a79a6eb015f33aa4660df1b06f5135def20 (patch) | |
| tree | eaf517054fa73cd871e0dba198852e32b136a7bd /arch/x86/kernel/pci-calgary_64.c | |
| parent | 0c072bb452f0cfd4959bc01ff3627d6385255b20 (diff) | |
| download | linux-bde78a79a6eb015f33aa4660df1b06f5135def20.tar.gz linux-bde78a79a6eb015f33aa4660df1b06f5135def20.tar.bz2 linux-bde78a79a6eb015f33aa4660df1b06f5135def20.zip | |
x86: use WARN() in arch/x86/kernel
Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.
This also allowed the folding of some if()'s into the WARN()
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: akpm@linux-foundation.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-calgary_64.c')
| -rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 363a74ec7a76..dcdac6c826e9 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -343,9 +343,8 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, /* were we called with bad_dma_address? */ badend = bad_dma_address + (EMERGENCY_PAGES * PAGE_SIZE); if (unlikely((dma_addr >= bad_dma_address) && (dma_addr < badend))) { - printk(KERN_ERR "Calgary: driver tried unmapping bad DMA " + WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA " "address 0x%Lx\n", dma_addr); - WARN_ON(1); return; } |