aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/page-flags.h2
-rw-r--r--mm/slob.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 62214c7d2d93..f036dfbdad54 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -120,7 +120,6 @@ enum pageflags {
120 PG_savepinned = PG_dirty, 120 PG_savepinned = PG_dirty,
121 121
122 /* SLOB */ 122 /* SLOB */
123 PG_slob_page = PG_active,
124 PG_slob_free = PG_private, 123 PG_slob_free = PG_private,
125 124
126 /* SLUB */ 125 /* SLUB */
@@ -203,7 +202,6 @@ PAGEFLAG(SavePinned, savepinned); /* Xen */
203PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) 202PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
204PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked) 203PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
205 204
206__PAGEFLAG(SlobPage, slob_page)
207__PAGEFLAG(SlobFree, slob_free) 205__PAGEFLAG(SlobFree, slob_free)
208 206
209__PAGEFLAG(SlubFrozen, slub_frozen) 207__PAGEFLAG(SlubFrozen, slub_frozen)
diff --git a/mm/slob.c b/mm/slob.c
index a2d4ab32198d..aad9dad2e820 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -131,17 +131,17 @@ static LIST_HEAD(free_slob_large);
131 */ 131 */
132static inline int is_slob_page(struct slob_page *sp) 132static inline int is_slob_page(struct slob_page *sp)
133{ 133{
134 return PageSlobPage((struct page *)sp); 134 return PageSlab((struct page *)sp);
135} 135}
136 136
137static inline void set_slob_page(struct slob_page *sp) 137static inline void set_slob_page(struct slob_page *sp)
138{ 138{
139 __SetPageSlobPage((struct page *)sp); 139 __SetPageSlab((struct page *)sp);
140} 140}
141 141
142static inline void clear_slob_page(struct slob_page *sp) 142static inline void clear_slob_page(struct slob_page *sp)
143{ 143{
144 __ClearPageSlobPage((struct page *)sp); 144 __ClearPageSlab((struct page *)sp);
145} 145}
146 146
147static inline struct slob_page *slob_page(const void *addr) 147static inline struct slob_page *slob_page(const void *addr)