---

yaml --- r: 105277 b: refs/heads/master c: 3c82d0c h: refs/heads/master i: 105275: 2c4310b v: v3
git-mirror · Jul 24, 2008 · c2ab190 · c2ab190
1 parent 60f0fbc
commit c2ab190
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42b7772812d15b86543a23b82bd6070eef9a08b1
+refs/heads/master: 3c82d0ce2c4f642b2f24ef98707a030543b06b90
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -432,8 +432,9 @@ static inline void __free_one_page(struct page *page,
 
 		buddy = __page_find_buddy(page, page_idx, order);
 		if (!page_is_buddy(page, buddy, order))
-			break;		/* Move the buddy up one level. */
+			break;
 
+		/* Our buddy is free, merge with it and move up one order. */
 		list_del(&buddy->lru);
 		zone->free_area[order].nr_free--;
 		rmv_page_order(buddy);