lkml.org 
[lkml]   [2008]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] x86/iommu: use __GFP_ZERO instead of memset for GART
    Date
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kernel/pci-gart_64.c | 11 ++++-------
    1 files changed, 4 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
    index aecea06..84d541f 100644
    --- a/arch/x86/kernel/pci-gart_64.c
    +++ b/arch/x86/kernel/pci-gart_64.c
    @@ -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,18 +788,15 @@ 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
    printk(KERN_DEBUG
    "PCI-DMA: Cannot allocate leak trace area\n");
    --
    1.5.6.4



    \
     
     \ /
      Last update: 2008-09-25 12:17    [W:0.022 / U:13.420 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site