From 6e89928f04a31ed1189e73d9040ed5e0a7d95ac1 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Mon, 8 Dec 2008 14:40:26 +0100 Subject: [PATCH] --- yaml --- r: 119745 b: refs/heads/master c: b8d9905d025d80a2357e8ce4704fde2923f6a1bd h: refs/heads/master i: 119743: a13ffbe0369010a4795b3d30fd102b60753a8942 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cad447acad5f..a29eff01c281 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ad909c4c1b91bd35ba6a2af5e7ab3fc8d9fe283 +refs/heads/master: b8d9905d025d80a2357e8ce4704fde2923f6a1bd diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c index 3133a0ea09ff..a7b6dec6fc3f 100644 --- a/trunk/arch/x86/kernel/amd_iommu.c +++ b/trunk/arch/x86/kernel/amd_iommu.c @@ -983,7 +983,8 @@ static void __unmap_single(struct amd_iommu *iommu, dma_addr_t i, start; unsigned int pages; - if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size)) + if ((dma_addr == bad_dma_address) || + (dma_addr + size > dma_dom->aperture_size)) return; pages = iommu_num_pages(dma_addr, size, PAGE_SIZE);