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

Commit f4598c8b authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] migration: make sure there is no attempt to migrate reserved pages. 



This ensures that reserved pages are not migrated.  Reserved pages
currently cause the WARN_ON to trigger in migrate_page_add()

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1bc691d3

mm/mempolicy.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -208,6 +208,8 @@ static int check_pte_range(struct vm_area_struct *vma, pmd_t *pmd, 
		page = vm_normal_page(vma, addr, *pte);

		page = vm_normal_page(vma, addr, *pte);

		if (!page)

		if (!page)

			continue;

			continue;

		if (PageReserved(page))

			continue;

		nid = page_to_nid(page);

		nid = page_to_nid(page);

		if (node_isset(nid, *nodes) == !!(flags & MPOL_MF_INVERT))

		if (node_isset(nid, *nodes) == !!(flags & MPOL_MF_INVERT))

			continue;

			continue;
@@ -290,7 +292,7 @@ static inline int check_pgd_range(struct vm_area_struct *vma, 
static inline int vma_migratable(struct vm_area_struct *vma)

static inline int vma_migratable(struct vm_area_struct *vma)

{

{

	if (vma->vm_flags & (

	if (vma->vm_flags & (

		VM_LOCKED|VM_IO|VM_HUGETLB|VM_PFNMAP))

		VM_LOCKED|VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED))

		return 0;

		return 0;

	return 1;

	return 1;

}

}