Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e8fb931 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 870d4b12

arch/arm/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	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;

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
	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))))

arch/unicore32/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	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))))

arch/xtensa/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ void do_page_fault(struct pt_regs *regs) 
	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;

include/linux/mm.h

+0 −2
Original line number Diff line number Diff line
@@ -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