---

yaml --- r: 322952 b: refs/heads/master c: 0ba8f2d h: refs/heads/master v: v3
git-mirror · Sep 17, 2012 · ddd0ae3 · ddd0ae3
1 parent 06def7b
commit ddd0ae3
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: 8dcebaa9a0ae8a0487f4342f3d56d2cb1c980860
+refs/heads/master: 0ba8f2d59304dfe69b59c034de723ad80f7ab9ac
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -584,7 +584,7 @@ static inline void __free_one_page(struct page *page,
 		combined_idx = buddy_idx & page_idx;
 		higher_page = page + (combined_idx - page_idx);
 		buddy_idx = __find_buddy_index(combined_idx, order + 1);
-		higher_buddy = page + (buddy_idx - combined_idx);
+		higher_buddy = higher_page + (buddy_idx - combined_idx);
 		if (page_is_buddy(higher_page, higher_buddy, order + 1)) {
 			list_add_tail(&page->lru,
 				&zone->free_area[order].free_list[migratetype]);