diff options
-rw-r--r-- | include/linux/page-flags.h | 2 | ||||
-rw-r--r-- | mm/slob.c | 6 |
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 */ | |||
203 | PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) | 202 | PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) |
204 | PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked) | 203 | PAGEFLAG(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) |
@@ -131,17 +131,17 @@ static LIST_HEAD(free_slob_large); | |||
131 | */ | 131 | */ |
132 | static inline int is_slob_page(struct slob_page *sp) | 132 | static 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 | ||
137 | static inline void set_slob_page(struct slob_page *sp) | 137 | static 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 | ||
142 | static inline void clear_slob_page(struct slob_page *sp) | 142 | static 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 | ||
147 | static inline struct slob_page *slob_page(const void *addr) | 147 | static inline struct slob_page *slob_page(const void *addr) |