diff --git a/[refs] b/[refs]
index e9d7dec45cb7..f8d955f9191d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b16bc64d1aed40fb9cff9187061005b2a89b5d5d
+refs/heads/master: 699397499742d1245ea5d677a08fa265df666d2d
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index 25788b1b7fcf..617fb31086ee 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -727,7 +727,7 @@ int do_migrate_pages(struct mm_struct *mm,
 	return -ENOSYS;
 }
 
-static struct page *new_vma_page(struct page *page, unsigned long private)
+static struct page *new_vma_page(struct page *page, unsigned long private, int **x)
 {
 	return NULL;
 }