From a8ed226faf491a51dc44e87979fcae90e4ea911a Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 16 May 2007 22:10:56 -0700
Subject: [PATCH] --- yaml --- r: 56515 b: refs/heads/master c:
 5577bd8a85c8b7643a241789b14fafa9c8a6c7db h: refs/heads/master i:   56513:
 fb8f70d1e8ce36ac996658a7985ed76734dcb70c   56511:
 6169015c2801e8b9c32c274e37a1a02c547cd785 v: v3

---
 [refs]          |  2 +-
 trunk/mm/slub.c | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index c0042998a620..a3731eb4fd9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eefaca9c3246f3daf56e7ed02987f79abcee7087
+refs/heads/master: 5577bd8a85c8b7643a241789b14fafa9c8a6c7db
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index ce96d485a88f..3ca164f33965 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -99,42 +99,42 @@
  * 			the fast path and disables lockless freelists.
  */
 
+#define FROZEN (1 << PG_active)
+
+#ifdef CONFIG_SLUB_DEBUG
+#define SLABDEBUG (1 << PG_error)
+#else
+#define SLABDEBUG 0
+#endif
+
 static inline int SlabFrozen(struct page *page)
 {
-	return PageActive(page);
+	return page->flags & FROZEN;
 }
 
 static inline void SetSlabFrozen(struct page *page)
 {
-	SetPageActive(page);
+	page->flags |= FROZEN;
 }
 
 static inline void ClearSlabFrozen(struct page *page)
 {
-	ClearPageActive(page);
+	page->flags &= ~FROZEN;
 }
 
 static inline int SlabDebug(struct page *page)
 {
-#ifdef CONFIG_SLUB_DEBUG
-	return PageError(page);
-#else
-	return 0;
-#endif
+	return page->flags & SLABDEBUG;
 }
 
 static inline void SetSlabDebug(struct page *page)
 {
-#ifdef CONFIG_SLUB_DEBUG
-	SetPageError(page);
-#endif
+	page->flags |= SLABDEBUG;
 }
 
 static inline void ClearSlabDebug(struct page *page)
 {
-#ifdef CONFIG_SLUB_DEBUG
-	ClearPageError(page);
-#endif
+	page->flags &= ~SLABDEBUG;
 }
 
 /*