Eric Lee / smarc-ti-linux-kernel

2
Download as
Browse Code ยป

Commit 10dc4155c7714f508fe2e4667164925ea971fb25

Authored by Bob Liu
Committed by Linus Torvalds
1 parent 0151e3d6d9
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

mm: thp: cleanup: mv alloc_hugepage to better place 

Move alloc_hugepage() to a better place, no need for a seperate #ifndef
CONFIG_NUMA

Signed-off-by: Bob Liu <bob.liu@oracle.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andrew Davidoff <davidoff@qedmf.net>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 8 deletions Side-by-side Diff

... ... @@ -759,14 +759,6 @@
759 759 HPAGE_PMD_ORDER, vma, haddr, nd);
760 760 }
761 761  
762   -#ifndef CONFIG_NUMA
763   -static inline struct page *alloc_hugepage(int defrag)
764   -{
765   - return alloc_pages(alloc_hugepage_gfpmask(defrag, 0),
766   - HPAGE_PMD_ORDER);
767   -}
768   -#endif
769   -
770 762 static bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,
771 763 struct vm_area_struct *vma, unsigned long haddr, pmd_t *pmd,
772 764 struct page *zero_page)
... ... @@ -2251,6 +2243,12 @@
2251 2243 return *hpage;
2252 2244 }
2253 2245 #else
  2246 +static inline struct page *alloc_hugepage(int defrag)
  2247 +{
  2248 + return alloc_pages(alloc_hugepage_gfpmask(defrag, 0),
  2249 + HPAGE_PMD_ORDER);
  2250 +}
  2251 +
2254 2252 static struct page *khugepaged_alloc_hugepage(bool *wait)
2255 2253 {
2256 2254 struct page *hpage;