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

Commit 100873d7 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds
Browse files

hugetlb: rename hugepage_migration_support() to ..._supported() 



We already have a function named hugepages_supported(), and the similar
name hugepage_migration_support() is a bit unconfortable, so let's rename
it hugepage_migration_supported().

Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1fdb412b

include/linux/hugetlb.h

+2 −2
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static inline pgoff_t basepage_index(struct page *page) 


extern void dissolve_free_huge_pages(unsigned long start_pfn,

				     unsigned long end_pfn);

static inline int hugepage_migration_support(struct hstate *h)

static inline int hugepage_migration_supported(struct hstate *h)

{

#ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION

	return huge_page_shift(h) == PMD_SHIFT;
@@ -453,7 +453,7 @@ static inline pgoff_t basepage_index(struct page *page) 
	return page->index;

}

#define dissolve_free_huge_pages(s, e)	do {} while (0)

#define hugepage_migration_support(h)	0

#define hugepage_migration_supported(h)	0



static inline spinlock_t *huge_pte_lockptr(struct hstate *h,

					   struct mm_struct *mm, pte_t *pte)

mm/hugetlb.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static struct page *dequeue_huge_page_node(struct hstate *h, int nid) 
/* Movability of hugepages depends on migration support. */

static inline gfp_t htlb_alloc_mask(struct hstate *h)

{

	if (hugepages_treat_as_movable || hugepage_migration_support(h))

	if (hugepages_treat_as_movable || hugepage_migration_supported(h))

		return GFP_HIGHUSER_MOVABLE;

	else

		return GFP_HIGHUSER;

mm/migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, 
	 * tables or check whether the hugepage is pmd-based or not before

	 * kicking migration.

	 */

	if (!hugepage_migration_support(page_hstate(hpage))) {

	if (!hugepage_migration_supported(page_hstate(hpage))) {

		putback_active_hugepage(hpage);

		return -ENOSYS;

	}