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

Commit 0a128b2b authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

pageflags: eliminate PG_xxx aliases 



Remove aliases of PG_xxx.  We can easily drop those now and alias by
specifying the PG_xxx flag in the macro that generates the functions.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d60cd46b

include/linux/page-flags.h

+4 −8
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ enum pageflags { 
	PG_active,

	PG_slab,

	PG_owner_priv_1,	/* Owner use. If pagecache, fs may use*/

	PG_checked = PG_owner_priv_1, /* Used by some filesystems */

	PG_pinned = PG_owner_priv_1, /* Xen pinned pagetable */

	PG_arch_1,

	PG_reserved,

	PG_private,		/* If pagecache, has fs-private data */
@@ -89,8 +87,6 @@ enum pageflags { 
	PG_swapcache,		/* Swap page: swp_entry_t in private */

	PG_mappedtodisk,	/* Has blocks allocated on-disk */

	PG_reclaim,		/* To be reclaimed asap */

	/* PG_readahead is only used for file reads; PG_reclaim is only for writes */

	PG_readahead = PG_reclaim, /* Reminder to do async read-ahead */

	PG_buddy,		/* Page is free, on buddy lists */



#if (BITS_PER_LONG > 32)
@@ -158,8 +154,8 @@ PAGEFLAG(Dirty, dirty) TESTSCFLAG(Dirty, dirty) __CLEARPAGEFLAG(Dirty, dirty) 
PAGEFLAG(LRU, lru) __CLEARPAGEFLAG(LRU, lru)

PAGEFLAG(Active, active) __CLEARPAGEFLAG(Active, active)

__PAGEFLAG(Slab, slab)

PAGEFLAG(Checked, checked)		/* Used by some filesystems */

PAGEFLAG(Pinned, pinned) TESTSCFLAG(Pinned, pinned) /* Xen pagetable */

PAGEFLAG(Checked, owner_priv_1)		/* Used by some filesystems */

PAGEFLAG(Pinned, owner_priv_1) TESTSCFLAG(Pinned, owner_priv_1) /* Xen */

PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)

PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private)

	__SETPAGEFLAG(Private, private)
@@ -174,14 +170,14 @@ PAGEFLAG(MappedToDisk, mappedtodisk) 


/* PG_readahead is only used for file reads; PG_reclaim is only for writes */

PAGEFLAG(Reclaim, reclaim) TESTCLEARFLAG(Reclaim, reclaim)

PAGEFLAG(Readahead, readahead)		/* Reminder to do async read-ahead */

PAGEFLAG(Readahead, reclaim)		/* Reminder to do async read-ahead */



#ifdef CONFIG_HIGHMEM

/*

 * Must use a macro here due to header dependency issues. page_zone() is not

 * available at this point.

 */

#define PageHighMem(__p) is_highmem(page_zone(page))

#define PageHighMem(__p) is_highmem(page_zone(__p))

#else

static inline int PageHighMem(struct page *page)

{

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) 
	if (PageReserved(page))

		return 1;



	page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_readahead |

	page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_reclaim |

			1 << PG_referenced | 1 << PG_arch_1 |

			1 << PG_owner_priv_1 | 1 << PG_mappedtodisk);

	set_page_private(page, 0);