[patch 14/14] mm: page_alloc cleanups

14/14

--
SUSE Labs, Novell Inc.

Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c
+++ linux-2.6/mm/page_alloc.c
@@ -431,8 +431,7 @@ void __free_pages_ok(struct page *page, 
  *
  * -- wli
  */
-static inline struct page *
-expand(struct zone *zone, struct page *page,
+static inline void expand(struct zone *zone, struct page *page,
  	int low, int high, struct free_area *area)
 {
 	unsigned long size = 1 << high;
@@ -446,7 +445,6 @@ expand(struct zone *zone, struct page *p
 		area->nr_free++;
 		set_page_order(&page[size], high);
 	}
-	return page;
 }
 
 /*
@@ -498,7 +496,8 @@ static struct page *__rmqueue(struct zon
 		rmv_page_order(page);
 		area->nr_free--;
 		zone->free_pages -= 1UL << order;
-		return expand(zone, page, order, current_order, area);
+		expand(zone, page, order, current_order, area);
+		return page;
 	}
 
 	return NULL;
@@ -513,19 +512,16 @@ static int rmqueue_bulk(struct zone *zon
 			unsigned long count, struct list_head *list)
 {
 	int i;
-	int allocated = 0;
-	struct page *page;
 	
 	spin_lock(&zone->lock);
 	for (i = 0; i < count; ++i) {
-		page = __rmqueue(zone, order);
-		if (page == NULL)
+		struct page *page = __rmqueue(zone, order);
+		if (unlikely(page == NULL))
 			break;
-		allocated++;
 		list_add_tail(&page->lru, list);
 	}
 	spin_unlock(&zone->lock);
-	return allocated;
+	return i;
 }
 
 #ifdef CONFIG_NUMA

---

• References:
  • [rfc][patch 0/14] mm: performance improvements
    • From: Nick Piggin <[email protected]>
  • [patch 1/14] mm: opt rmqueue
    • From: Nick Piggin <[email protected]>
  • [patch 2/14] mm: pte prefetch
    • From: Nick Piggin <[email protected]>
  • [patch 3/14] mm: release opt
    • From: Nick Piggin <[email protected]>
  • [patch 4/14] mm: rmap opt
    • From: Nick Piggin <[email protected]>
  • [patch 5/14] mm: set_page_refs opt
    • From: Nick Piggin <[email protected]>
  • [patch 6/14] mm: microopt conditions
    • From: Nick Piggin <[email protected]>
  • [patch 7/14] mm: remove bad_range
    • From: Nick Piggin <[email protected]>
  • [patch 8/14] mm: remove pcp_low
    • From: Nick Piggin <[email protected]>
  • [patch 9/14] mm: page_state opt
    • From: Nick Piggin <[email protected]>
  • [patch 10/14] mm: single pcp list
    • From: Nick Piggin <[email protected]>
  • [patch 11/14] mm: increase pcp size
    • From: Nick Piggin <[email protected]>
  • [patch 12/14] mm: variable pcp size
    • From: Nick Piggin <[email protected]>
  • [patch 13/14] mm: cleanup zone_pcp
    • From: Nick Piggin <[email protected]>

• Prev by Date: [patch 12/14] mm: variable pcp size
• Next by Date: Re: [patch 2/14] mm: pte prefetch
• Previous by thread: [patch 13/14] mm: cleanup zone_pcp
• Next by thread: Re: [patch 9/14] mm: page_state opt
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]