From 407843654d31af57122103b01d93c05e61142322 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Tue, 12 Feb 2008 22:09:29 -0800 Subject: [PATCH] --- yaml --- r: 85855 b: refs/heads/master c: b83ebf566b64d3702c6b50dbee2052623cd55ce5 h: refs/heads/master i: 85853: 5847f7e12c500d1446cd6b18fa7b0100a4604943 85851: 80037122f5b3dae4c367d86c380a2033bdf5f03f 85847: 074be7d132d594f2b8a3556debfe3621aa80f402 85839: 21f8bb5398591bebbfa9131db856aa24bf5c39ba 85823: fe80c8b6b0ed711f50756e7d232a8229c793c037 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/iommu.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb870b368d18..0b4547abd246 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3dd5b82560eef53a537e409f50261d0b33c75ce +refs/heads/master: b83ebf566b64d3702c6b50dbee2052623cd55ce5 diff --git a/trunk/arch/sparc64/kernel/iommu.c b/trunk/arch/sparc64/kernel/iommu.c index d3276ebcfb47..0e347ff812a3 100644 --- a/trunk/arch/sparc64/kernel/iommu.c +++ b/trunk/arch/sparc64/kernel/iommu.c @@ -200,12 +200,11 @@ int iommu_table_init(struct iommu *iommu, int tsbsize, /* Allocate and initialize the dummy page which we * set inactive IO PTEs to point to. */ - iommu->dummy_page = __get_free_pages(GFP_KERNEL, 0); + iommu->dummy_page = get_zeroed_page(GFP_KERNEL); if (!iommu->dummy_page) { printk(KERN_ERR "IOMMU: Error, gfp(dummy_page) failed.\n"); goto out_free_map; } - memset((void *)iommu->dummy_page, 0, PAGE_SIZE); iommu->dummy_page_pa = (unsigned long) __pa(iommu->dummy_page); /* Now allocate and setup the IOMMU page table itself. */