From: Pekka Enberg <penberg@kernel.org>
Date: Mon, 18 Jul 2011 12:16:55 +0000 (+0300)
Subject: Revert "SLUB: Fix build breakage in linux/mm_types.h"
X-Git-Tag: upstream/snapshot3+hdmi~9422^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3adf004d82c03ca9d57cbe960657757a71e4c2e7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Revert "SLUB: Fix build breakage in linux/mm_types.h"

This reverts commit ea6bd8ee1a2ccdffc38b2b1fcfe941addfafaade.
---

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 6dc6413..3d76a43 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -49,27 +49,32 @@ struct page {
 					 * see PAGE_MAPPING_ANON below.
 					 */
 	/* Second double word */
-	struct {
-		union {
+	union {
+		struct {
 			pgoff_t index;		/* Our offset within mapping. */
-			void *freelist;		/* slub first free object */
-		};
-
-		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. */
+		};
 
-			/* Used for cmpxchg_double in slub */
-			unsigned long counters;
-			struct {
+		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;
+				};
 			};
 		};
-		atomic_t _count;		/* Usage count, see below. */
 	};
 
 	/* Third double word block */