Skip to contentSkip to conversation

Remove ->nopfn check from use_zero_page

PATCH In review Johannes Weiner 2 participants 2 messages Jun 27, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

mm/memory.c +3 -4
index 08cd653..5d7e705 100644
@@ -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,
#1 lore raw
Quoted 9 lines · Johannes Weiner

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.

Please try yesterday's .DATE=2008-06-26-14-32 mmotm, I sent Andrew a similar fix and it should be okay now. Also includes fix to endless bad page states once you boot.

Hugh

Quoted 27 lines

---

mm/memory.c +3 -5
index 08cd653..5d7e705 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/