Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=48f13bf3e742fca8aab87f6c39451d03bf5952d4
Commit:     48f13bf3e742fca8aab87f6c39451d03bf5952d4
Parent:     ea3061d227816d00717446ac12b853d7ae04b4fe
Author:     Mel Gorman <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 01:26:10 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 09:43:01 2007 -0700

    Breakout page_order() to internal.h to avoid special knowledge of the buddy 
allocator
    
    The statistics patch later needs to know what order a free page is on the 
free
    lists.  Rather than having special knowledge of page_private() when
    PageBuddy() is set, this patch places out page_order() in internal.h and 
adds
    a VM_BUG_ON to catch using it on non-PageBuddy pages.
    
    Signed-off-by: Mel Gorman <[EMAIL PROTECTED]>
    Signed-off-by: Christoph Lameter <[EMAIL PROTECTED]>
    Acked-by: Andy Whitcroft <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 mm/internal.h   |   10 ++++++++++
 mm/page_alloc.c |   10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mm/internal.h b/mm/internal.h
index a3110c0..953f941 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -37,4 +37,14 @@ static inline void __put_page(struct page *page)
 extern void fastcall __init __free_pages_bootmem(struct page *page,
                                                unsigned int order);
 
+/*
+ * function for dealing with page's order in buddy system.
+ * 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)
+{
+       VM_BUG_ON(!PageBuddy(page));
+       return page_private(page);
+}
 #endif
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a8a53f8..71ced51 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -313,16 +313,6 @@ static inline void prep_zero_page(struct page *page, int 
order, gfp_t gfp_flags)
                clear_highpage(page + i);
 }
 
-/*
- * function for dealing with page's order in buddy system.
- * 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)
-{
-       return page_private(page);
-}
-
 static inline void set_page_order(struct page *page, int order)
 {
        set_page_private(page, order);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to