On Sun, Sep 1, 2013 at 11:45 PM, Bob Liu <lliubbo@xxxxxxxxx> wrote:
> Move alloc_hugepage to better place, no need for a seperate #ifndef CONFIG_NUMA
>
> Signed-off-by: Bob Liu <bob.liu@xxxxxxxxxx>
Tested-by: Andrew Davidoff <davidoff@xxxxxxxxx>
> ---
> mm/huge_memory.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index a92012a..7448cf9 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -753,14 +753,6 @@ static inline struct page *alloc_hugepage_vma(int defrag,
> HPAGE_PMD_ORDER, vma, haddr, nd);
> }
>
> -#ifndef CONFIG_NUMA
> -static inline struct page *alloc_hugepage(int defrag)
> -{
> - return alloc_pages(alloc_hugepage_gfpmask(defrag, 0),
> - HPAGE_PMD_ORDER);
> -}
> -#endif
> -
> static bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,
> struct vm_area_struct *vma, unsigned long haddr, pmd_t *pmd,
> struct page *zero_page)
> @@ -2204,6 +2196,12 @@ static struct page
> return *hpage;
> }
> #else
> +static inline struct page *alloc_hugepage(int defrag)
> +{
> + return alloc_pages(alloc_hugepage_gfpmask(defrag, 0),
> + HPAGE_PMD_ORDER);
> +}
> +
> static struct page *khugepaged_alloc_hugepage(bool *wait)
> {
> struct page *hpage;
> --
> 1.7.10.4
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>