Commit 100873d7a777b67ad35197c5a998b5e778f8bf3f
Committed by
Linus Torvalds
1 parent
1fdb412bd8
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
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: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Acked-by: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff
include/linux/hugetlb.h
... | ... | @@ -397,7 +397,7 @@ |
397 | 397 | |
398 | 398 | extern void dissolve_free_huge_pages(unsigned long start_pfn, |
399 | 399 | unsigned long end_pfn); |
400 | -static inline int hugepage_migration_support(struct hstate *h) | |
400 | +static inline int hugepage_migration_supported(struct hstate *h) | |
401 | 401 | { |
402 | 402 | #ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION |
403 | 403 | return huge_page_shift(h) == PMD_SHIFT; |
... | ... | @@ -453,7 +453,7 @@ |
453 | 453 | return page->index; |
454 | 454 | } |
455 | 455 | #define dissolve_free_huge_pages(s, e) do {} while (0) |
456 | -#define hugepage_migration_support(h) 0 | |
456 | +#define hugepage_migration_supported(h) 0 | |
457 | 457 | |
458 | 458 | static inline spinlock_t *huge_pte_lockptr(struct hstate *h, |
459 | 459 | struct mm_struct *mm, pte_t *pte) |
mm/hugetlb.c
... | ... | @@ -544,7 +544,7 @@ |
544 | 544 | /* Movability of hugepages depends on migration support. */ |
545 | 545 | static inline gfp_t htlb_alloc_mask(struct hstate *h) |
546 | 546 | { |
547 | - if (hugepages_treat_as_movable || hugepage_migration_support(h)) | |
547 | + if (hugepages_treat_as_movable || hugepage_migration_supported(h)) | |
548 | 548 | return GFP_HIGHUSER_MOVABLE; |
549 | 549 | else |
550 | 550 | return GFP_HIGHUSER; |
mm/migrate.c
... | ... | @@ -1039,7 +1039,7 @@ |
1039 | 1039 | * tables or check whether the hugepage is pmd-based or not before |
1040 | 1040 | * kicking migration. |
1041 | 1041 | */ |
1042 | - if (!hugepage_migration_support(page_hstate(hpage))) { | |
1042 | + if (!hugepage_migration_supported(page_hstate(hpage))) { | |
1043 | 1043 | putback_active_hugepage(hpage); |
1044 | 1044 | return -ENOSYS; |
1045 | 1045 | } |