[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <878wwryw64.fsf@skyscraper.fehenstaub.lan>
Date: Fri, 27 Jun 2008 13:06:11 +0200
From: Johannes Weiner <hannes@...urebad.de>
To: Andrew Morton <akpm@...ux-foundation.org>
CC: linux-kernel@...r.kernel.org
Subject: [PATCH -mmotm] Remove ->nopfn check from use_zero_page
Hi Andrew,
The get_user_pages fix from Linus came to -mm through -next as it seems,
but -mm has Nick's nopfn removal patches already and so use_zero_page
checks for a non-existant vm_op.
This patch is needed to at least compile.
Signed-off-by: Johannes Weiner <hannes@...urebad.de>
---
diff --git a/mm/memory.c b/mm/memory.c
index 08cd653..5d7e705 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1082,11 +1082,10 @@ static inline int use_zero_page(struct vm_area_struct *vma)
if (vma->vm_flags & (VM_LOCKED | VM_SHARED))
return 0;
/*
- * And if we have a fault or a nopfn routine, it's not an
- * anonymous region.
+ * And if we have a fault routine, it's not an anonymous
+ * region.
*/
- return !vma->vm_ops ||
- (!vma->vm_ops->fault && !vma->vm_ops->nopfn);
+ return !vma->vm_ops || !vma->vm_ops->fault;
}
int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists