X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=mm%2Fpage_alloc.c;h=5faf876cfc3a1f58b7a392f89cf008b263148371;hp=2a362c52fdf482144eac24111059f56b5147bd42;hb=b7f50cfa3630b6e079929ffccfd442d65064ee1f;hpb=e10117d36ef758da0690c95ecffc09d5dd7da479

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2a362c52fdf4..5faf876cfc3a 100644
--- a/mm/page_alloc.c
+++ b/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;