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: Dean Nelson <dcn@sgi.com>
Cc: Jes Sorensen <jes@trained-monkey.org>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Lameter 2008-04-28 02:12:52 -07:00 committed by Linus Torvalds
parent 0a128b2b1a
commit 602c4d112f

View File

@ -88,16 +88,8 @@ enum pageflags {
PG_mappedtodisk, /* Has blocks allocated on-disk */ PG_mappedtodisk, /* Has blocks allocated on-disk */
PG_reclaim, /* To be reclaimed asap */ PG_reclaim, /* To be reclaimed asap */
PG_buddy, /* Page is free, on buddy lists */ PG_buddy, /* Page is free, on buddy lists */
#ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
#if (BITS_PER_LONG > 32) PG_uncached, /* Page has been mapped as uncached */
/*
* 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 */
#endif #endif
__NR_PAGEFLAGS __NR_PAGEFLAGS
}; };
@ -194,8 +186,13 @@ static inline int PageSwapCache(struct page *page)
} }
#endif #endif
#if (BITS_PER_LONG > 32) #ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
PAGEFLAG(Uncached, uncached) PAGEFLAG(Uncached, uncached)
#else
static inline int PageUncached(struct page *)
{
return 0;
}
#endif #endif
static inline int PageUptodate(struct page *page) static inline int PageUptodate(struct page *page)