From 453199863f9a0b70cb64cd33e9b0e750cadcea91 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Mon, 28 Apr 2008 02:12:52 -0700
Subject: [PATCH] --- yaml --- r: 94017 b: refs/heads/master c:
 602c4d112f9abf43af4b882b4a6f5505ed5c51b7 h: refs/heads/master i:   94015:
 febada3c3425ca745d064df4cf8249b2d48052f3 v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/page-flags.h | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index f7bfd7f87dcd..c76b8b3a79ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a128b2b1a5e8ebce0260e3345812ee70daccc7f
+refs/heads/master: 602c4d112f9abf43af4b882b4a6f5505ed5c51b7
diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index 437778c703f5..17deafa9eb9b 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/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)