Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 25980
b: refs/heads/master
c: 6aa3001
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Apr 19, 2006
1 parent 1ba13d1 commit 3e046f5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 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: 013159227b840dfd441bd2e4c8b4d77ffb3cc42e
refs/heads/master: 6aa3001b239b387d98a7f945e4a51edeb59e4f2d
10 changes: 6 additions & 4 deletions trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,13 @@ static inline void prep_zero_page(struct page *page, int order, gfp_t gfp_flags)
* zone->lock is already acquired when we use these.
* So, we don't need atomic page->flags operations here.
*/
static inline unsigned long page_order(struct page *page) {
static inline unsigned long page_order(struct page *page)
{
return page_private(page);
}

static inline void set_page_order(struct page *page, int order) {
static inline void set_page_order(struct page *page, int order)
{
set_page_private(page, order);
__SetPageBuddy(page);
}
Expand Down Expand Up @@ -299,9 +301,9 @@ static inline int page_is_buddy(struct page *page, int order)

if (PageBuddy(page) && page_order(page) == order) {
BUG_ON(page_count(page) != 0);
return 1;
return 1;
}
return 0;
return 0;
}

/*
Expand Down

0 comments on commit 3e046f5

Please sign in to comment.