From: Andrew Morton <akpm@osdl.org>

Let's see if Christoph was telling the truth ;)

Cc: Christoph Lameter <clameter@sgi.com>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Jes Sorensen <jes@trained-monkey.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/migrate.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN mm/migrate.c~page-migration-simplify-migrate_pages-tweaks mm/migrate.c
--- 25/mm/migrate.c~page-migration-simplify-migrate_pages-tweaks	Fri May 19 12:28:11 2006
+++ 25-akpm/mm/migrate.c	Fri May 19 12:28:11 2006
@@ -550,7 +550,8 @@ static int move_to_new_page(struct page 
 	 * establishing additional references. We are the only one
 	 * holding a reference to the new page at this point.
 	 */
-	SetPageLocked(newpage);
+	if (TestSetPageLocked(newpage))
+		BUG();
 
 	/* Prepare mapping for the new page.*/
 	newpage->index = page->index;
@@ -559,7 +560,6 @@ static int move_to_new_page(struct page 
 	mapping = page_mapping(page);
 	if (!mapping)
 		rc = migrate_page(mapping, newpage, page);
-
 	else if (mapping->a_ops->migratepage)
 		/*
 		 * Most pages have a mapping and most filesystems
_