From be4948c1dd92fa78195a70f884f7168344463451 Mon Sep 17 00:00:00 2001
From: Keith Owens <kaos@ocs.com.au>
Date: Wed, 11 Oct 2006 01:21:28 -0700
Subject: [PATCH] --- yaml --- r: 39317 b: refs/heads/master c:
 699397499742d1245ea5d677a08fa265df666d2d h: refs/heads/master i:   39315:
 ff11d791429b412ef1dda17d8240310a27f3a7eb v: v3

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

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;
 }