From 4696fa82864cc12d3b706995f679564a423c7dd2 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Tue, 26 Oct 2010 14:21:11 -0700
Subject: [PATCH] --- yaml --- r: 217425 b: refs/heads/master c:
 b7f50cfa3630b6e079929ffccfd442d65064ee1f h: refs/heads/master i:   217423:
 6afbc2061131558e03f01bf8fa3e2d027edb0d8f v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 364a214410d4..1540bc155832 100644
--- 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
index 2a362c52fdf4..5faf876cfc3a 100644
--- 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;