aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-05-11 09:59:34 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2009-05-11 09:59:34 +0300
commit7303f240981888884412a97ac742772527356880 (patch)
treee5bcc86cf4e33e862dbcb37787ed9a8f2ec2b32b
parentce8a7424d23a36f043d0de8484f888971c831119 (diff)
downloadkernel_samsung_aries-7303f240981888884412a97ac742772527356880.zip
kernel_samsung_aries-7303f240981888884412a97ac742772527356880.tar.gz
kernel_samsung_aries-7303f240981888884412a97ac742772527356880.tar.bz2
slob: use PG_slab for identifying SLOB pages
For the sake of consistency. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Andi Kleen <andi@firstfloor.org> Acked-by: Matt Mackall <mpm@selenic.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
-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 62214c7..f036dfb 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -120,7 +120,6 @@ enum pageflags {
PG_savepinned = PG_dirty,
/* SLOB */
- PG_slob_page = PG_active,
PG_slob_free = PG_private,
/* SLUB */
@@ -203,7 +202,6 @@ PAGEFLAG(SavePinned, savepinned); /* Xen */
PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
-__PAGEFLAG(SlobPage, slob_page)
__PAGEFLAG(SlobFree, slob_free)
__PAGEFLAG(SlubFrozen, slub_frozen)
diff --git a/mm/slob.c b/mm/slob.c
index a2d4ab3..aad9dad 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -131,17 +131,17 @@ static LIST_HEAD(free_slob_large);
*/
static inline int is_slob_page(struct slob_page *sp)
{
- return PageSlobPage((struct page *)sp);
+ return PageSlab((struct page *)sp);
}
static inline void set_slob_page(struct slob_page *sp)
{
- __SetPageSlobPage((struct page *)sp);
+ __SetPageSlab((struct page *)sp);
}
static inline void clear_slob_page(struct slob_page *sp)
{
- __ClearPageSlobPage((struct page *)sp);
+ __ClearPageSlab((struct page *)sp);
}
static inline struct slob_page *slob_page(const void *addr)