The patch titled
Add NOPFN_REFAULT result from vm_ops->nopfn()
has been removed from the -mm tree. Its filename was
add-nopfn_refault-result-from-vm_ops-nopfn.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Add NOPFN_REFAULT result from vm_ops->nopfn()
From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Add a NOPFN_REFAULT return code for vm_ops->nopfn() equivalent to
NOPAGE_REFAULT for vmops->nopage() indicating that the handler requests a
re-execution of the faulting instruction
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd.bergmann@xxxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm.h | 1 +
mm/memory.c | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff -puN include/linux/mm.h~add-nopfn_refault-result-from-vm_ops-nopfn include/linux/mm.h
--- a/include/linux/mm.h~add-nopfn_refault-result-from-vm_ops-nopfn
+++ a/include/linux/mm.h
@@ -637,6 +637,7 @@ static inline int page_mapped(struct pag
*/
#define NOPFN_SIGBUS ((unsigned long) -1)
#define NOPFN_OOM ((unsigned long) -2)
+#define NOPFN_REFAULT ((unsigned long) -3)
/*
* Different kinds of faults, as returned by handle_mm_fault().
diff -puN mm/memory.c~add-nopfn_refault-result-from-vm_ops-nopfn mm/memory.c
--- a/mm/memory.c~add-nopfn_refault-result-from-vm_ops-nopfn
+++ a/mm/memory.c
@@ -2355,10 +2355,12 @@ static noinline int do_no_pfn(struct mm_
BUG_ON(is_cow_mapping(vma->vm_flags));
pfn = vma->vm_ops->nopfn(vma, address & PAGE_MASK);
- if (pfn == NOPFN_OOM)
+ if (unlikely(pfn == NOPFN_OOM))
return VM_FAULT_OOM;
- if (pfn == NOPFN_SIGBUS)
+ else if (unlikely(pfn == NOPFN_SIGBUS))
return VM_FAULT_SIGBUS;
+ else if (unlikely(pfn == NOPFN_REFAULT))
+ return VM_FAULT_MINOR;
page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
_
Patches currently in -mm which might be from benh@xxxxxxxxxxxxxxxxxxx are
origin.patch
make-aout-executables-work-again.patch
macintosh-mangle-caps-lock-events-on-adb-keyboards.patch
powerpc-rtas-msi-support.patch
sysctl-mac_hid-remove-unnecessary-insert_at_head-flag.patch
sysctl-ipmi-remove-unnecessary-insert_at_head-flag.patch
sysctl-c99-convert-ctl_tables-in-arch-powerpc-kernel-idlec.patch
sysctl-c99-convert-ctl_tables-entries-in-arch-ppc-kernel-ppc_htabc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
