From 812b1ae8cef93959ab3db8553d9ce86292f3fea9 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@shadowen.org>
Date: Wed, 23 Jul 2008 21:27:16 -0700
Subject: [PATCH] --- yaml --- r: 105279 b: refs/heads/master c:
 0cad47cf13bc2e9142d3a11d9f50523797d0d4ea h: refs/heads/master i:   105277:
 c2ab19064e17f5344fef4217b364626d9126ce2c   105275:
 2c4310b00ce3a5c1aaa570763fb0770f9bda3e57   105271:
 387275c1739da29ae74b1841b66d00ae25c859fb   105263:
 b116e52bc74be168844c8fe109b58a59cdba9441   105247:
 77f28260209567ae3b04a8e9be9c846a4a6cf551   105215:
 f6ea963091642f57d36c54bc55f84119f07d816f v: v3

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

diff --git a/[refs] b/[refs]
index daeb7cfd7db4..5a88d76bace2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da3bbdd4632c0171406b2677e31494afa5bde2f8
+refs/heads/master: 0cad47cf13bc2e9142d3a11d9f50523797d0d4ea
diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index 0d2a4e7012aa..7d8db1233e44 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/include/linux/page-flags.h
@@ -96,7 +96,14 @@ enum pageflags {
 #ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
 	PG_uncached,		/* Page has been mapped as uncached */
 #endif
-	__NR_PAGEFLAGS
+	__NR_PAGEFLAGS,
+
+	/* Filesystems */
+	PG_checked = PG_owner_priv_1,
+
+	/* XEN */
+	PG_pinned = PG_owner_priv_1,
+	PG_savepinned = PG_dirty,
 };
 
 #ifndef __GENERATING_BOUNDS_H
@@ -155,9 +162,9 @@ PAGEFLAG(Dirty, dirty) TESTSCFLAG(Dirty, dirty) __CLEARPAGEFLAG(Dirty, dirty)
 PAGEFLAG(LRU, lru) __CLEARPAGEFLAG(LRU, lru)
 PAGEFLAG(Active, active) __CLEARPAGEFLAG(Active, active)
 __PAGEFLAG(Slab, slab)
-PAGEFLAG(Checked, owner_priv_1)		/* Used by some filesystems */
-PAGEFLAG(Pinned, owner_priv_1) TESTSCFLAG(Pinned, owner_priv_1) /* Xen */
-PAGEFLAG(SavePinned, dirty);					/* Xen */
+PAGEFLAG(Checked, checked)		/* Used by some filesystems */
+PAGEFLAG(Pinned, pinned) TESTSCFLAG(Pinned, pinned)	/* Xen */
+PAGEFLAG(SavePinned, savepinned);			/* Xen */
 PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
 PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private)
 	__SETPAGEFLAG(Private, private)