slub: Do not use frozen page flag but a bit in the page counters

Do not use a page flag for the frozen bit. It needs to be part
of the state that is handled with cmpxchg_double(). So use a bit
in the counter struct in the page struct for that purpose.

Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

2 files changed, 3 insertions, 7 deletions

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 027935c86c68..e5fb2a70518b 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -41,8 +41,9 @@ struct page {
                                          * & limit reverse map searches.
                                          */
                 struct {                /* SLUB */
-                        u16 inuse;
-                        u16 objects;
+                        unsigned inuse:16;
+                        unsigned objects:15;
+                        unsigned frozen:1;
                 };
         };
         union {
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 6081493db68f..20791f18f5cf 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -124,9 +124,6 @@ enum pageflags {
 
         /* SLOB */
         PG_slob_free = PG_private,
-
-        /* SLUB */
-        PG_slub_frozen = PG_active,
 };
 
 #ifndef __GENERATING_BOUNDS_H
@@ -212,8 +209,6 @@ PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
 
 __PAGEFLAG(SlobFree, slob_free)
 
-__PAGEFLAG(SlubFrozen, slub_frozen)
-
 /*
  * Private page markings that may be used by the filesystem that owns the page
  * for its own purposes.