diff options
-rw-r--r-- | include/linux/page-flags.h | 7 | ||||
-rw-r--r-- | mm/slob.c | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 3fc586b7b90b..54590a9a103e 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h | |||
@@ -105,6 +105,10 @@ enum pageflags { | |||
105 | PG_pinned = PG_owner_priv_1, | 105 | PG_pinned = PG_owner_priv_1, |
106 | PG_savepinned = PG_dirty, | 106 | PG_savepinned = PG_dirty, |
107 | 107 | ||
108 | /* SLOB */ | ||
109 | PG_slob_page = PG_active, | ||
110 | PG_slob_free = PG_private, | ||
111 | |||
108 | /* SLUB */ | 112 | /* SLUB */ |
109 | PG_slub_frozen = PG_active, | 113 | PG_slub_frozen = PG_active, |
110 | PG_slub_debug = PG_error, | 114 | PG_slub_debug = PG_error, |
@@ -173,6 +177,9 @@ PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) | |||
173 | PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private) | 177 | PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private) |
174 | __SETPAGEFLAG(Private, private) | 178 | __SETPAGEFLAG(Private, private) |
175 | 179 | ||
180 | __PAGEFLAG(SlobPage, slob_page) | ||
181 | __PAGEFLAG(SlobFree, slob_free) | ||
182 | |||
176 | __PAGEFLAG(SlubFrozen, slub_frozen) | 183 | __PAGEFLAG(SlubFrozen, slub_frozen) |
177 | __PAGEFLAG(SlubDebug, slub_debug) | 184 | __PAGEFLAG(SlubDebug, slub_debug) |
178 | 185 | ||
@@ -130,17 +130,17 @@ static LIST_HEAD(free_slob_large); | |||
130 | */ | 130 | */ |
131 | static inline int slob_page(struct slob_page *sp) | 131 | static inline int slob_page(struct slob_page *sp) |
132 | { | 132 | { |
133 | return test_bit(PG_active, &sp->flags); | 133 | return PageSlobPage((struct page *)sp); |
134 | } | 134 | } |
135 | 135 | ||
136 | static inline void set_slob_page(struct slob_page *sp) | 136 | static inline void set_slob_page(struct slob_page *sp) |
137 | { | 137 | { |
138 | __set_bit(PG_active, &sp->flags); | 138 | __SetPageSlobPage((struct page *)sp); |
139 | } | 139 | } |
140 | 140 | ||
141 | static inline void clear_slob_page(struct slob_page *sp) | 141 | static inline void clear_slob_page(struct slob_page *sp) |
142 | { | 142 | { |
143 | __clear_bit(PG_active, &sp->flags); | 143 | __ClearPageSlobPage((struct page *)sp); |
144 | } | 144 | } |
145 | 145 | ||
146 | /* | 146 | /* |
@@ -148,19 +148,19 @@ static inline void clear_slob_page(struct slob_page *sp) | |||
148 | */ | 148 | */ |
149 | static inline int slob_page_free(struct slob_page *sp) | 149 | static inline int slob_page_free(struct slob_page *sp) |
150 | { | 150 | { |
151 | return test_bit(PG_private, &sp->flags); | 151 | return PageSlobFree((struct page *)sp); |
152 | } | 152 | } |
153 | 153 | ||
154 | static void set_slob_page_free(struct slob_page *sp, struct list_head *list) | 154 | static void set_slob_page_free(struct slob_page *sp, struct list_head *list) |
155 | { | 155 | { |
156 | list_add(&sp->list, list); | 156 | list_add(&sp->list, list); |
157 | __set_bit(PG_private, &sp->flags); | 157 | __SetPageSlobFree((struct page *)sp); |
158 | } | 158 | } |
159 | 159 | ||
160 | static inline void clear_slob_page_free(struct slob_page *sp) | 160 | static inline void clear_slob_page_free(struct slob_page *sp) |
161 | { | 161 | { |
162 | list_del(&sp->list); | 162 | list_del(&sp->list); |
163 | __clear_bit(PG_private, &sp->flags); | 163 | __ClearPageSlobFree((struct page *)sp); |
164 | } | 164 | } |
165 | 165 | ||
166 | #define SLOB_UNIT sizeof(slob_t) | 166 | #define SLOB_UNIT sizeof(slob_t) |