On 03/14/2013 10:50 AM, Kirill A. Shutemov wrote:
> +     if (filp)
> +             info.align_mask = mapping_can_have_hugepages(filp->f_mapping) ?
> +                     PAGE_MASK & ~HPAGE_MASK : get_align_mask();
> +     else
> +             info.align_mask = 0;
>       info.align_offset = pgoff << PAGE_SHIFT;
>       return vm_unmapped_area(&info);
>  }
> @@ -174,7 +179,11 @@ arch_get_unmapped_area_topdown(struct file *filp, const 
> unsigned long addr0,
>       info.length = len;
>       info.low_limit = PAGE_SIZE;
>       info.high_limit = mm->mmap_base;
> -     info.align_mask = filp ? get_align_mask() : 0;
> +     if (filp)
> +             info.align_mask = mapping_can_have_hugepages(filp->f_mapping) ?
> +                     PAGE_MASK & ~HPAGE_MASK : get_align_mask();
> +     else
> +             info.align_mask = 0;
>       info.align_offset = pgoff << PAGE_SHIFT;
>       addr = vm_unmapped_area(&info);
>       if (!(addr & ~PAGE_MASK))

how about

static inline
unsigned long mapping_align_mask(struct address_space *mapping)
{
        if (mapping_can_have_hugepages(filp->f_mapping))
                return PAGE_MASK & ~HPAGE_MASK;
        return get_align_mask();
}

to replace these two open-coded versions?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to