From 3e046f5679ecd8ed9800f9474d2d627978aa6712 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 18 Apr 2006 22:20:52 -0700 Subject: [PATCH] --- yaml --- r: 25980 b: refs/heads/master c: 6aa3001b239b387d98a7f945e4a51edeb59e4f2d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9fdc8f7e528e..cc4deae8757f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 013159227b840dfd441bd2e4c8b4d77ffb3cc42e +refs/heads/master: 6aa3001b239b387d98a7f945e4a51edeb59e4f2d diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 97d6827c7d66..123c60586740 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -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); } @@ -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; } /*