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

Commit 2f3e442c authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: page-flags: clean up the page flag test, set, clear macros 



- PAGEFLAG_FALSE only defines TEST, make it define SET and CLEAR as
  well, analogous to PAGEFLAG.

- Define TESTSETFLAG_FALSE, analogous to TESTSETFLAG.

- Define TESTSCFLAG_FALSE, analogous to TESTSCFLAG

- Make PG_mlocked accessors the same on both MMU and !MMU setups

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3a79d52a

include/linux/page-flags.h

+14 −7
Original line number Diff line number Diff line
@@ -171,13 +171,12 @@ static inline int __TestClearPage##uname(struct page *page) \ 
#define __PAGEFLAG(uname, lname) TESTPAGEFLAG(uname, lname)		\

	__SETPAGEFLAG(uname, lname)  __CLEARPAGEFLAG(uname, lname)



#define PAGEFLAG_FALSE(uname) 						\

static inline int Page##uname(const struct page *page)			\

			{ return 0; }



#define TESTSCFLAG(uname, lname)					\

	TESTSETFLAG(uname, lname) TESTCLEARFLAG(uname, lname)



#define TESTPAGEFLAG_FALSE(uname)					\

static inline int Page##uname(const struct page *page) { return 0; }



#define SETPAGEFLAG_NOOP(uname)						\

static inline void SetPage##uname(struct page *page) {  }
@@ -187,12 +186,21 @@ static inline void ClearPage##uname(struct page *page) { } 
#define __CLEARPAGEFLAG_NOOP(uname)					\

static inline void __ClearPage##uname(struct page *page) {  }



#define TESTSETFLAG_FALSE(uname)					\

static inline int TestSetPage##uname(struct page *page) { return 0; }



#define TESTCLEARFLAG_FALSE(uname)					\

static inline int TestClearPage##uname(struct page *page) { return 0; }



#define __TESTCLEARFLAG_FALSE(uname)					\

static inline int __TestClearPage##uname(struct page *page) { return 0; }



#define PAGEFLAG_FALSE(uname) TESTPAGEFLAG_FALSE(uname)			\

	SETPAGEFLAG_NOOP(uname) CLEARPAGEFLAG_NOOP(uname)



#define TESTSCFLAG_FALSE(uname)						\

	TESTSETFLAG_FALSE(uname) TESTCLEARFLAG_FALSE(uname)



struct page;	/* forward declaration */



TESTPAGEFLAG(Locked, locked)
@@ -248,7 +256,6 @@ PAGEFLAG_FALSE(HighMem) 
PAGEFLAG(SwapCache, swapcache)

#else

PAGEFLAG_FALSE(SwapCache)

	SETPAGEFLAG_NOOP(SwapCache) CLEARPAGEFLAG_NOOP(SwapCache)

#endif



PAGEFLAG(Unevictable, unevictable) __CLEARPAGEFLAG(Unevictable, unevictable)
@@ -258,8 +265,8 @@ PAGEFLAG(Unevictable, unevictable) __CLEARPAGEFLAG(Unevictable, unevictable) 
PAGEFLAG(Mlocked, mlocked) __CLEARPAGEFLAG(Mlocked, mlocked)

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

#else

PAGEFLAG_FALSE(Mlocked) SETPAGEFLAG_NOOP(Mlocked)

	TESTCLEARFLAG_FALSE(Mlocked) __TESTCLEARFLAG_FALSE(Mlocked)

PAGEFLAG_FALSE(Mlocked) __CLEARPAGEFLAG_NOOP(Mlocked)

	TESTSCFLAG_FALSE(Mlocked) __TESTCLEARFLAG_FALSE(Mlocked)

#endif



#ifdef CONFIG_ARCH_USES_PG_UNCACHED