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

Commit 3ef8fd7f authored by Andi Kleen's avatar Andi Kleen
Browse files

Fix migration.c compilation on s390 



31bit s390 doesn't have huge pages and failed with:

> mm/migrate.c: In function 'remove_migration_pte':
> mm/migrate.c:143:3: error: implicit declaration of function 'pte_mkhuge'
> mm/migrate.c:143:7: error: incompatible types when assigning to type 'pte_t' from type 'int'

Put that code into a ifdef.

Reported by Heiko Carstens

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent f672b49b

mm/migrate.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -139,8 +139,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, 
	pte = pte_mkold(mk_pte(new, vma->vm_page_prot));

	pte = pte_mkold(mk_pte(new, vma->vm_page_prot));

	if (is_write_migration_entry(entry))

	if (is_write_migration_entry(entry))

		pte = pte_mkwrite(pte);

		pte = pte_mkwrite(pte);

#ifdef CONFIG_HUGETLB_PAGE

	if (PageHuge(new))

	if (PageHuge(new))

		pte = pte_mkhuge(pte);

		pte = pte_mkhuge(pte);

#endif

	flush_cache_page(vma, addr, pte_pfn(pte));

	flush_cache_page(vma, addr, pte_pfn(pte));

	set_pte_at(mm, addr, ptep, pte);

	set_pte_at(mm, addr, ptep, pte);