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

Commit be7517d6 authored Feb 04, 2013 by Tony Lu Committed by Linus Torvalds Feb 05, 2013

mm/hugetlb: set PTE as huge in hugetlb_change_protection and remove_migration_pte



When setting a huge PTE, besides calling pte_mkhuge(), we also need to
call arch_make_huge_pte(), which we indeed do in make_huge_pte(), but we
forget to do in hugetlb_change_protection() and remove_migration_pte().

Signed-off-by: Zhigang Lu <zlu@tilera.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Hillf Danton <dhillf@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3bdf8cd3

mm/hugetlb.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
		if (!huge_pte_none(huge_ptep_get(ptep))) {
		pte = huge_ptep_get_and_clear(mm, address, ptep);
		pte = pte_mkhuge(pte_modify(pte, newprot));
		pte = arch_make_huge_pte(pte, vma, NULL, 0);
		set_huge_pte_at(mm, address, ptep, pte);
		pages++;
		}

mm/migrate.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -160,8 +160,10 @@ static int remove_migration_pte(struct page new, struct vm_area_struct vma,
		if (is_write_migration_entry(entry))
		pte = pte_mkwrite(pte);
		#ifdef CONFIG_HUGETLB_PAGE
		if (PageHuge(new))
		if (PageHuge(new)) {
		pte = pte_mkhuge(pte);
		pte = arch_make_huge_pte(pte, vma, new, 0);
		}
		#endif
		flush_cache_page(vma, addr, pte_pfn(pte));
		set_pte_at(mm, addr, ptep, pte);