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@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index daafcf1..ad58418 100644 (file)
--- a/arch/arm/mm/fault.c
+++ b/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 --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index abe2a95..97135b6 100644 (file)
--- a/arch/arm64/mm/fault.c
+++ b/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 --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c
index afccef5..2ec3d3a 100644 (file)
--- a/arch/unicore32/mm/fault.c
+++ b/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 --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index c9784c1..7f4a1fd 100644 (file)
--- a/arch/xtensa/mm/fault.c
+++ b/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 --git a/include/linux/mm.h b/include/linux/mm.h
index 997fc2e..7d42501 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1052,8 +1052,6 @@ static inline void clear_page_pfmemalloc(struct page *page)
  * 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