Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0114267b authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86/iommu: use __GFP_ZERO instead of memset for GART 



Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3610f211

arch/x86/kernel/pci-gart_64.c

+5 −8
Original line number Diff line number Diff line
@@ -674,13 +674,13 @@ static __init int init_k8_gatt(struct agp_kern_info *info) 
	info->aper_size = aper_size >> 20;



	gatt_size = (aper_size >> PAGE_SHIFT) * sizeof(u32);

	gatt = (void *)__get_free_pages(GFP_KERNEL, get_order(gatt_size));

	gatt = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,

					get_order(gatt_size));

	if (!gatt)

		panic("Cannot allocate GATT table");

	if (set_memory_uc((unsigned long)gatt, gatt_size >> PAGE_SHIFT))

		panic("Could not set GART PTEs to uncacheable pages");



	memset(gatt, 0, gatt_size);

	agp_gatt_table = gatt;



	enable_gart_translations();
@@ -788,19 +788,16 @@ void __init gart_iommu_init(void) 
	iommu_size = check_iommu_size(info.aper_base, aper_size);

	iommu_pages = iommu_size >> PAGE_SHIFT;



	iommu_gart_bitmap = (void *) __get_free_pages(GFP_KERNEL,

	iommu_gart_bitmap = (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,

						      get_order(iommu_pages/8));

	if (!iommu_gart_bitmap)

		panic("Cannot allocate iommu bitmap\n");

	memset(iommu_gart_bitmap, 0, iommu_pages/8);



#ifdef CONFIG_IOMMU_LEAK

	if (leak_trace) {

		iommu_leak_tab = (void *)__get_free_pages(GFP_KERNEL,

		iommu_leak_tab = (void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,

				  get_order(iommu_pages*sizeof(void *)));

		if (iommu_leak_tab)

			memset(iommu_leak_tab, 0, iommu_pages * 8);

		else

		if (!iommu_leak_tab)

			printk(KERN_DEBUG

			       "PCI-DMA: Cannot allocate leak trace area\n");

	}