From d35d847f3ddc5b7952d30b6a98271b6b2e4f8fab Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Thu, 14 Jul 2011 12:48:14 -0500
Subject: [PATCH] --- yaml --- r: 261661 b: refs/heads/master c:
 013e896373fc53f3d3c039364a25ccbd1fc0729a h: refs/heads/master i:   261659:
 040badf0b9499344f49cfcacd3d94bdcf888a867 v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/mm_types.h | 37 +++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index acf481a4ec9e..14248c2e7401 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3adf004d82c03ca9d57cbe960657757a71e4c2e7
+refs/heads/master: 013e896373fc53f3d3c039364a25ccbd1fc0729a
diff --git a/trunk/include/linux/mm_types.h b/trunk/include/linux/mm_types.h
index 3d76a433d52f..774b8952deb4 100644
--- a/trunk/include/linux/mm_types.h
+++ b/trunk/include/linux/mm_types.h
@@ -49,30 +49,31 @@ struct page {
 					 * see PAGE_MAPPING_ANON below.
 					 */
 	/* Second double word */
-	union {
-		struct {
+	struct {
+		union {
 			pgoff_t index;		/* Our offset within mapping. */
-			atomic_t _mapcount;	/* Count of ptes mapped in mms,
+			void *freelist;		/* slub first free object */
+		};
+
+		union {
+			/* Used for cmpxchg_double in slub */
+			unsigned long counters;
+
+			struct {
+
+				union {
+					atomic_t _mapcount;	/* Count of ptes mapped in mms,
 							 * to show when page is mapped
 							 * & limit reverse map searches.
 							 */
-			atomic_t _count;		/* Usage count, see below. */
-		};
 
-		struct {			/* SLUB cmpxchg_double area */
-			void *freelist;
-			union {
-				unsigned long counters;
-				struct {
-					unsigned inuse:16;
-					unsigned objects:15;
-					unsigned frozen:1;
-					/*
-					 * Kernel may make use of this field even when slub
-					 * uses the rest of the double word!
-					 */
-					atomic_t _count;
+					struct {
+						unsigned inuse:16;
+						unsigned objects:15;
+						unsigned frozen:1;
+					};
 				};
+				atomic_t _count;		/* Usage count, see below. */
 			};
 		};
 	};