---

yaml --- r: 112609 b: refs/heads/master c: c97ac53 h: refs/heads/master i: 112607: b19ac93 v: v3
git-mirror · Sep 19, 2008 · 904d3e3 · 904d3e3
1 parent 4ed352a
commit 904d3e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13d9fead3daa0efa1b8bb6ae59650e4453b39128
+refs/heads/master: c97ac5359e6897abe22770740294dda185bac30d
diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/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) {