From 602c4d112f9abf43af4b882b4a6f5505ed5c51b7 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Mon, 28 Apr 2008 02:12:52 -0700 Subject: [PATCH] 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 Cc: Jes Sorensen Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/linux/page-flags.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 437778c703f5..17deafa9eb9b 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -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) -- 2.30.2