From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 11 Sep 2008 08:59:15 +0000 (+0200)
Subject: AMD IOMMU: replace memset with __GFP_ZERO in alloc_coherent
X-Git-Tag: MMI-PSA29.97-13-9~30899^2~3^2~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c97ac5359e6897abe22770740294dda185bac30d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

AMD IOMMU: replace memset with __GFP_ZERO in alloc_coherent

Remove the memset and use __GFP_ZERO at allocation time instead.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index e4866660463e..f405a61f61fc 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1176,11 +1176,11 @@ static void *alloc_coherent(struct device *dev, size_t size,
 	if (!get_device_resources(dev, &iommu, &domain, &devid))
 		flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
 
+	flag |= __GFP_ZERO;
 	virt_addr = (void *)__get_free_pages(flag, get_order(size));
 	if (!virt_addr)
 		return 0;
 
-	memset(virt_addr, 0, size);
 	paddr = virt_to_phys(virt_addr);
 
 	if (!iommu || !domain) {