Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105281
b: refs/heads/master
c: 9023cb7
h: refs/heads/master
i:
  105279: 812b1ae
v: v3
  • Loading branch information
Andy Whitcroft authored and Linus Torvalds committed Jul 24, 2008
1 parent 2434583 commit 509581a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a38082d21cbc5ec961da7dda195e98a9a064dcf
refs/heads/master: 9023cb7e8564d95a1893f8cb6895a293be9a71fe
7 changes: 7 additions & 0 deletions trunk/include/linux/page-flags.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ enum pageflags {
PG_pinned = PG_owner_priv_1,
PG_savepinned = PG_dirty,

/* SLOB */
PG_slob_page = PG_active,
PG_slob_free = PG_private,

/* SLUB */
PG_slub_frozen = PG_active,
PG_slub_debug = PG_error,
Expand Down Expand Up @@ -173,6 +177,9 @@ PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private)
__SETPAGEFLAG(Private, private)

__PAGEFLAG(SlobPage, slob_page)
__PAGEFLAG(SlobFree, slob_free)

__PAGEFLAG(SlubFrozen, slub_frozen)
__PAGEFLAG(SlubDebug, slub_debug)

Expand Down
12 changes: 6 additions & 6 deletions trunk/mm/slob.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,37 +130,37 @@ static LIST_HEAD(free_slob_large);
*/
static inline int slob_page(struct slob_page *sp)
{
return test_bit(PG_active, &sp->flags);
return PageSlobPage((struct page *)sp);
}

static inline void set_slob_page(struct slob_page *sp)
{
__set_bit(PG_active, &sp->flags);
__SetPageSlobPage((struct page *)sp);
}

static inline void clear_slob_page(struct slob_page *sp)
{
__clear_bit(PG_active, &sp->flags);
__ClearPageSlobPage((struct page *)sp);
}

/*
* slob_page_free: true for pages on free_slob_pages list.
*/
static inline int slob_page_free(struct slob_page *sp)
{
return test_bit(PG_private, &sp->flags);
return PageSlobFree((struct page *)sp);
}

static void set_slob_page_free(struct slob_page *sp, struct list_head *list)
{
list_add(&sp->list, list);
__set_bit(PG_private, &sp->flags);
__SetPageSlobFree((struct page *)sp);
}

static inline void clear_slob_page_free(struct slob_page *sp)
{
list_del(&sp->list);
__clear_bit(PG_private, &sp->flags);
__ClearPageSlobFree((struct page *)sp);
}

#define SLOB_UNIT sizeof(slob_t)
Expand Down

0 comments on commit 509581a

Please sign in to comment.