The patch titled
Subject: mm: remove VM_FAULT_MINOR
has been added to the -mm tree. Its filename is
mm-remove-vm_fault_minor.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-remove-vm_fault_minor.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-remove-vm_fault_minor.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Jan Kara <jack@xxxxxxx>
Subject: mm: remove VM_FAULT_MINOR
The define has a comment from Nick Piggin from 2007:
/* For backwards compat. Remove me quickly. */
I guess 9 years should not be too hurried sense of 'quickly' even for
kernel measures.
Signed-off-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/mm/fault.c | 2 +-
arch/arm64/mm/fault.c | 2 +-
arch/unicore32/mm/fault.c | 2 +-
arch/xtensa/mm/fault.c | 2 +-
include/linux/mm.h | 2 --
5 files changed, 4 insertions(+), 6 deletions(-)
diff -puN arch/arm/mm/fault.c~mm-remove-vm_fault_minor arch/arm/mm/fault.c
--- a/arch/arm/mm/fault.c~mm-remove-vm_fault_minor
+++ a/arch/arm/mm/fault.c
@@ -346,7 +346,7 @@ retry:
up_read(&mm->mmap_sem);
/*
- * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
+ * Handle the "normal" case first - VM_FAULT_MAJOR
*/
if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
return 0;
diff -puN arch/arm64/mm/fault.c~mm-remove-vm_fault_minor arch/arm64/mm/fault.c
--- a/arch/arm64/mm/fault.c~mm-remove-vm_fault_minor
+++ a/arch/arm64/mm/fault.c
@@ -295,7 +295,7 @@ retry:
up_read(&mm->mmap_sem);
/*
- * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
+ * Handle the "normal" case first - VM_FAULT_MAJOR
*/
if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP |
VM_FAULT_BADACCESS))))
diff -puN arch/unicore32/mm/fault.c~mm-remove-vm_fault_minor arch/unicore32/mm/fault.c
--- a/arch/unicore32/mm/fault.c~mm-remove-vm_fault_minor
+++ a/arch/unicore32/mm/fault.c
@@ -276,7 +276,7 @@ retry:
up_read(&mm->mmap_sem);
/*
- * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
+ * Handle the "normal" case first - VM_FAULT_MAJOR
*/
if (likely(!(fault &
(VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
diff -puN arch/xtensa/mm/fault.c~mm-remove-vm_fault_minor arch/xtensa/mm/fault.c
--- a/arch/xtensa/mm/fault.c~mm-remove-vm_fault_minor
+++ a/arch/xtensa/mm/fault.c
@@ -146,7 +146,7 @@ good_area:
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
if (flags & VM_FAULT_MAJOR)
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address);
- else if (flags & VM_FAULT_MINOR)
+ else
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address);
return;
diff -puN include/linux/mm.h~mm-remove-vm_fault_minor include/linux/mm.h
--- a/include/linux/mm.h~mm-remove-vm_fault_minor
+++ a/include/linux/mm.h
@@ -1051,8 +1051,6 @@ static inline void clear_page_pfmemalloc
* just gets major/minor fault counters bumped up.
*/
-#define VM_FAULT_MINOR 0 /* For backwards compat. Remove me quickly. */
-
#define VM_FAULT_OOM 0x0001
#define VM_FAULT_SIGBUS 0x0002
#define VM_FAULT_MAJOR 0x0004
_
Patches currently in -mm which might be from jack@xxxxxxx are
ocfs2-fix-return-value-from-ocfs2_page_mkwrite.patch
mm-remove-vm_fault_minor.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
