diff options
author | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> | 2014-06-04 19:05:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:53:51 -0400 |
commit | c177c81e09e517bbf75b67762cdab1b83aba6976 (patch) | |
tree | 569aed2a30badb1ce3e5393de74b43eeeb22e376 /arch/x86/mm | |
parent | 7f39dda9d86fb4f4f17af0de170decf125726f8c (diff) |
hugetlb: restrict hugepage_migration_support() to x86_64
Currently hugepage migration is available for all archs which support
pmd-level hugepage, but testing is done only for x86_64 and there're
bugs for other archs. So to avoid breaking such archs, this patch
limits the availability strictly to x86_64 until developers of other
archs get interested in enabling this feature.
Simply disabling hugepage migration on non-x86_64 archs is not enough to
fix the reported problem where sys_move_pages() hits the BUG_ON() in
follow_page(FOLL_GET), so let's fix this by checking if hugepage
migration is supported in vma_migratable().
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reported-by: Michael Ellerman <mpe@ellerman.id.au>
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Hugh Dickins <hughd@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Miller <davem@davemloft.net>
Cc: <stable@vger.kernel.org> [3.12+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/hugetlbpage.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c index 8c9f647ff9e1..8b977ebf9388 100644 --- a/arch/x86/mm/hugetlbpage.c +++ b/arch/x86/mm/hugetlbpage.c | |||
@@ -58,11 +58,6 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address, | |||
58 | { | 58 | { |
59 | return NULL; | 59 | return NULL; |
60 | } | 60 | } |
61 | |||
62 | int pmd_huge_support(void) | ||
63 | { | ||
64 | return 0; | ||
65 | } | ||
66 | #else | 61 | #else |
67 | 62 | ||
68 | struct page * | 63 | struct page * |
@@ -80,11 +75,6 @@ int pud_huge(pud_t pud) | |||
80 | { | 75 | { |
81 | return !!(pud_val(pud) & _PAGE_PSE); | 76 | return !!(pud_val(pud) & _PAGE_PSE); |
82 | } | 77 | } |
83 | |||
84 | int pmd_huge_support(void) | ||
85 | { | ||
86 | return 1; | ||
87 | } | ||
88 | #endif | 78 | #endif |
89 | 79 | ||
90 | #ifdef CONFIG_HUGETLB_PAGE | 80 | #ifdef CONFIG_HUGETLB_PAGE |