From 904d3e3e8812f0c8dfa691740825887018c28bb4 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 11 Sep 2008 10:59:15 +0200 Subject: [PATCH] --- yaml --- r: 112609 b: refs/heads/master c: c97ac5359e6897abe22770740294dda185bac30d h: refs/heads/master i: 112607: b19ac93ca02deeb0b5499347ef7ffb66fe88a6d0 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ec8ed8e576b..da78f1444d8a 100644 --- 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 index e4866660463e..f405a61f61fc 100644 --- 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) {