From 10bc322482ac99ac83d42bafcb66bfb912658916 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Thu, 12 Jan 2006 01:05:20 -0800 Subject: [PATCH] --- yaml --- r: 18045 b: refs/heads/master c: f4598c8b3678abd65be3be00ed3d046375a4777e h: refs/heads/master i: 18043: 9827ee3f8ab06692fad0df8e2bc4de5d746606ed v: v3 --- [refs] | 2 +- trunk/mm/mempolicy.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1dd2e5c9985f..e6a0f57b0037 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bc691d357c646700b9523d2aeca02847d3fb3f4 +refs/heads/master: f4598c8b3678abd65be3be00ed3d046375a4777e diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 1850d0aef4ac..b62cab575a84 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -208,6 +208,8 @@ static int check_pte_range(struct vm_area_struct *vma, pmd_t *pmd, page = vm_normal_page(vma, addr, *pte); if (!page) continue; + if (PageReserved(page)) + continue; nid = page_to_nid(page); if (node_isset(nid, *nodes) == !!(flags & MPOL_MF_INVERT)) 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) { 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 1; }