git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
mm
/
migrate.c
diff --git
a/mm/migrate.c
b/mm/migrate.c
index
068655d
..
939888f
100644
(file)
--- a/
mm/migrate.c
+++ b/
mm/migrate.c
@@
-802,7
+802,7
@@
static struct page *new_page_node(struct page *p, unsigned long private,
*result = &pm->status;
*result = &pm->status;
- return alloc_pages_node(pm->node,
+ return alloc_pages_
exact_
node(pm->node,
GFP_HIGHUSER_MOVABLE | GFP_THISNODE, 0);
}
GFP_HIGHUSER_MOVABLE | GFP_THISNODE, 0);
}
@@
-820,7
+820,6
@@
static int do_move_page_to_node_array(struct mm_struct *mm,
struct page_to_node *pp;
LIST_HEAD(pagelist);
struct page_to_node *pp;
LIST_HEAD(pagelist);
- migrate_prep();
down_read(&mm->mmap_sem);
/*
down_read(&mm->mmap_sem);
/*
@@
-907,6
+906,9
@@
static int do_pages_move(struct mm_struct *mm, struct task_struct *task,
pm = (struct page_to_node *)__get_free_page(GFP_KERNEL);
if (!pm)
goto out;
pm = (struct page_to_node *)__get_free_page(GFP_KERNEL);
if (!pm)
goto out;
+
+ migrate_prep();
+
/*
* Store a chunk of page_to_node array in a page,
* but keep the last one as a marker
/*
* Store a chunk of page_to_node array in a page,
* but keep the last one as a marker