---

yaml --- r: 217425 b: refs/heads/master c: b7f50cf h: refs/heads/master i: 217423: 6afbc20 v: v3
git-mirror · Oct 26, 2010 · 4696fa8 · 4696fa8
1 parent 13ee5fd
commit 4696fa8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a75d377686037982cbec320bb770b19fe7be6a5d
+refs/heads/master: b7f50cfa3630b6e079929ffccfd442d65064ee1f
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -531,7 +531,7 @@ static inline void __free_one_page(struct page *page,
 	 * so it's less likely to be used soon and more likely to be merged
 	 * as a higher order page
 	 */
-	if ((order < MAX_ORDER-1) && pfn_valid_within(page_to_pfn(buddy))) {
+	if ((order < MAX_ORDER-2) && pfn_valid_within(page_to_pfn(buddy))) {
 		struct page *higher_page, *higher_buddy;
 		combined_idx = __find_combined_index(page_idx, order);
 		higher_page = page + combined_idx - page_idx;