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

Commit af8e3354 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

mm: CONFIG_MMU for PG_mlocked 



Remove three degrees of obfuscation, left over from when we had
CONFIG_UNEVICTABLE_LRU.  MLOCK_PAGES is CONFIG_HAVE_MLOCKED_PAGE_BIT is
CONFIG_HAVE_MLOCK is CONFIG_MMU.  rmap.o (and memory-failure.o) are only
built when CONFIG_MMU, so don't need such conditions at all.

Somehow, I feel no compulsion to remove the CONFIG_HAVE_MLOCK* lines from
169 defconfigs: leave those to evolve in due course.

Signed-off-by: default avatarHugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Nick Piggin <npiggin@suse.de>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 53f79acb

include/linux/page-flags.h

+3 −5
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ enum pageflags { 
	PG_buddy,		/* Page is free, on buddy lists */

	PG_swapbacked,		/* Page is backed by RAM/swap */

	PG_unevictable,		/* Page is "unevictable"  */

#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT

#ifdef CONFIG_MMU

	PG_mlocked,		/* Page is vma mlocked */

#endif

#ifdef CONFIG_ARCH_USES_PG_UNCACHED
@@ -259,12 +259,10 @@ PAGEFLAG_FALSE(SwapCache) 
PAGEFLAG(Unevictable, unevictable) __CLEARPAGEFLAG(Unevictable, unevictable)

	TESTCLEARFLAG(Unevictable, unevictable)



#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT

#define MLOCK_PAGES 1

#ifdef CONFIG_MMU

PAGEFLAG(Mlocked, mlocked) __CLEARPAGEFLAG(Mlocked, mlocked)

	TESTSCFLAG(Mlocked, mlocked) __TESTCLEARFLAG(Mlocked, mlocked)

#else

#define MLOCK_PAGES 0

PAGEFLAG_FALSE(Mlocked) SETPAGEFLAG_NOOP(Mlocked)

	TESTCLEARFLAG_FALSE(Mlocked) __TESTCLEARFLAG_FALSE(Mlocked)

#endif
@@ -393,7 +391,7 @@ static inline void __ClearPageTail(struct page *page) 


#endif /* !PAGEFLAGS_EXTENDED */



#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT

#ifdef CONFIG_MMU

#define __PG_MLOCKED		(1 << PG_mlocked)

#else

#define __PG_MLOCKED		0

mm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -200,14 +200,6 @@ config VIRT_TO_BUS 
	def_bool y

	depends on !ARCH_NO_VIRT_TO_BUS



config HAVE_MLOCK

	bool

	default y if MMU=y



config HAVE_MLOCKED_PAGE_BIT

	bool

	default y if HAVE_MLOCK=y



config MMU_NOTIFIER

	bool

mm/internal.h

+12 −14
Original line number Diff line number Diff line
@@ -63,17 +63,6 @@ static inline unsigned long page_order(struct page *page) 
	return page_private(page);

}



#ifdef CONFIG_HAVE_MLOCK

extern long mlock_vma_pages_range(struct vm_area_struct *vma,

			unsigned long start, unsigned long end);

extern void munlock_vma_pages_range(struct vm_area_struct *vma,

			unsigned long start, unsigned long end);

static inline void munlock_vma_pages_all(struct vm_area_struct *vma)

{

	munlock_vma_pages_range(vma, vma->vm_start, vma->vm_end);

}

#endif



/*

 * unevictable_migrate_page() called only from migrate_page_copy() to

 * migrate unevictable flag to new page.
@@ -86,7 +75,16 @@ static inline void unevictable_migrate_page(struct page *new, struct page *old) 
		SetPageUnevictable(new);

}



#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT

#ifdef CONFIG_MMU

extern long mlock_vma_pages_range(struct vm_area_struct *vma,

			unsigned long start, unsigned long end);

extern void munlock_vma_pages_range(struct vm_area_struct *vma,

			unsigned long start, unsigned long end);

static inline void munlock_vma_pages_all(struct vm_area_struct *vma)

{

	munlock_vma_pages_range(vma, vma->vm_start, vma->vm_end);

}



/*

 * Called only in fault path via page_evictable() for a new page

 * to determine if it's being mapped into a LOCKED vma.
@@ -144,7 +142,7 @@ static inline void mlock_migrate_page(struct page *newpage, struct page *page) 
	}

}



#else /* CONFIG_HAVE_MLOCKED_PAGE_BIT */

#else /* !CONFIG_MMU */

static inline int is_mlocked_vma(struct vm_area_struct *v, struct page *p)

{

	return 0;
@@ -153,7 +151,7 @@ static inline void clear_page_mlock(struct page *page) { } 
static inline void mlock_vma_page(struct page *page) { }

static inline void mlock_migrate_page(struct page *new, struct page *old) { }



#endif /* CONFIG_HAVE_MLOCKED_PAGE_BIT */

#endif /* !CONFIG_MMU */



/*

 * Return the mem_map entry representing the 'offset' subpage within

mm/memory-failure.c

+0 −2
Original line number Diff line number Diff line
@@ -582,10 +582,8 @@ static struct page_state { 
	{ unevict|dirty, unevict|dirty,	"unevictable LRU", me_pagecache_dirty},

	{ unevict,	unevict,	"unevictable LRU", me_pagecache_clean},



#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT

	{ mlock|dirty,	mlock|dirty,	"mlocked LRU",	me_pagecache_dirty },

	{ mlock,	mlock,		"mlocked LRU",	me_pagecache_clean },

#endif



	{ lru|dirty,	lru|dirty,	"LRU",		me_pagecache_dirty },

	{ lru|dirty,	lru,		"clean LRU",	me_pagecache_clean },

mm/page_alloc.c

+0 −4
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ static inline void __free_one_page(struct page *page, 
	zone->free_area[order].nr_free++;

}



#ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT

/*

 * free_page_mlock() -- clean up attempts to free and mlocked() page.

 * Page should not be on lru, so no need to fix that up.
@@ -497,9 +496,6 @@ static inline void free_page_mlock(struct page *page) 
	__dec_zone_page_state(page, NR_MLOCK);

	__count_vm_event(UNEVICTABLE_MLOCKFREED);

}

#else

static void free_page_mlock(struct page *page) { }

#endif



static inline int free_pages_check(struct page *page)

{