From 25185a6819ba42f20ed3ee36a3f899911c039db2 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 23 Jun 2006 02:03:06 -0700
Subject: [PATCH] --- yaml --- r: 28896 b: refs/heads/master c:
 f886ed443fedb109e2062988bf120a531f0ec80a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f2e479abd804..4a3dd1deb5ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 729bd0b74ce9ac6c829109052fcd565f5c366ca5
+refs/heads/master: f886ed443fedb109e2062988bf120a531f0ec80a
diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index d276a4e2f825..0c076d58c676 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/include/linux/page-flags.h
@@ -7,6 +7,8 @@
 
 #include <linux/percpu.h>
 #include <linux/cache.h>
+#include <linux/types.h>
+
 #include <asm/pgtable.h>
 
 /*
@@ -88,7 +90,17 @@
 #define PG_nosave_free		18	/* Free, should not be written */
 #define PG_buddy		19	/* Page is free, on buddy lists */
 
-#define PG_uncached		20	/* Page has been mapped as uncached */
+
+#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
+ */
+#define PG_uncached		31	/* Page has been mapped as uncached */
+#endif
 
 /*
  * Global page accounting.  One instance per CPU.  Only unsigned longs are