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

Commit 602c4d11 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

page flags: handle PG_uncached like all other flags



Remove the special setup for PG_uncached and simply make it part of the enum.
The page flag will only be allocated when the kernel build includes the
uncached allocator.

Acked-by: default avatarDean Nelson <dcn@sgi.com>
Cc: Jes Sorensen <jes@trained-monkey.org>
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a128b2b
Loading
Loading
Loading
Loading
+8 −11
Original line number Diff line number Diff line
@@ -88,16 +88,8 @@ enum pageflags {
	PG_mappedtodisk,	/* Has blocks allocated on-disk */
	PG_reclaim,		/* To be reclaimed asap */
	PG_buddy,		/* Page is free, on buddy lists */

#if (BITS_PER_LONG > 32)
/*
 * 64-bit-only flags build down from bit 31
 *
 * 32 bit  -------------------------------| FIELDS |       FLAGS         |
 * 64 bit  |           FIELDS             | ??????         FLAGS         |
 *         63                            32                              0
 */
	PG_uncached = 31,		/* Page has been mapped as uncached */
#ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
	PG_uncached,		/* Page has been mapped as uncached */
#endif
	__NR_PAGEFLAGS
};
@@ -194,8 +186,13 @@ static inline int PageSwapCache(struct page *page)
}
#endif

#if (BITS_PER_LONG > 32)
#ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
PAGEFLAG(Uncached, uncached)
#else
static inline int PageUncached(struct page *)
{
	return 0;
}
#endif

static inline int PageUptodate(struct page *page)