summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorKeith Owens <kaos@ocs.com.au>2006-10-11 01:21:28 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 11:14:19 -0700
commit699397499742d1245ea5d677a08fa265df666d2d (patch)
tree81e9971ff13fcadb6ea8ab12f55278c30bdff1a2 /mm
parentb16bc64d1aed40fb9cff9187061005b2a89b5d5d (diff)
downloadlinux-3.10-699397499742d1245ea5d677a08fa265df666d2d.tar.gz
linux-3.10-699397499742d1245ea5d677a08fa265df666d2d.tar.bz2
linux-3.10-699397499742d1245ea5d677a08fa265df666d2d.zip
[PATCH] Fix do_mbind warning with CONFIG_MIGRATION=n
With CONFIG_MIGRATION=n mm/mempolicy.c: In function 'do_mbind': mm/mempolicy.c:796: warning: passing argument 2 of 'migrate_pages' from incompatible pointer type Signed-off-by: Keith Owens <kaos@ocs.com.au> Cc: Christoph Lameter <clameter@engr.sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/mempolicy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 25788b1b7fc..617fb31086e 100644
--- a/mm/mempolicy.c
+++ b/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;
}