aboutsummaryrefslogtreecommitdiffstats
path: root/mm/mempolicy.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r--mm/mempolicy.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index d3c5de47ff6d..f15c1b24ca18 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -950,8 +950,8 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
950 * 950 *
951 * Returns the number of page that could not be moved. 951 * Returns the number of page that could not be moved.
952 */ 952 */
953int do_migrate_pages(struct mm_struct *mm, 953int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
954 const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags) 954 const nodemask_t *to, int flags)
955{ 955{
956 int busy = 0; 956 int busy = 0;
957 int err; 957 int err;
@@ -963,7 +963,7 @@ int do_migrate_pages(struct mm_struct *mm,
963 963
964 down_read(&mm->mmap_sem); 964 down_read(&mm->mmap_sem);
965 965
966 err = migrate_vmas(mm, from_nodes, to_nodes, flags); 966 err = migrate_vmas(mm, from, to, flags);
967 if (err) 967 if (err)
968 goto out; 968 goto out;
969 969
@@ -998,7 +998,7 @@ int do_migrate_pages(struct mm_struct *mm,
998 * moved to an empty node, then there is nothing left worth migrating. 998 * moved to an empty node, then there is nothing left worth migrating.
999 */ 999 */
1000 1000
1001 tmp = *from_nodes; 1001 tmp = *from;
1002 while (!nodes_empty(tmp)) { 1002 while (!nodes_empty(tmp)) {
1003 int s,d; 1003 int s,d;
1004 int source = -1; 1004 int source = -1;
@@ -1021,11 +1021,11 @@ int do_migrate_pages(struct mm_struct *mm,
1021 * [0-7] - > [3,4,5] moves only 0,1,2,6,7. 1021 * [0-7] - > [3,4,5] moves only 0,1,2,6,7.
1022 */ 1022 */
1023 1023
1024 if ((nodes_weight(*from_nodes) != nodes_weight(*to_nodes)) && 1024 if ((nodes_weight(*from) != nodes_weight(*to)) &&
1025 (node_isset(s, *to_nodes))) 1025 (node_isset(s, *to)))
1026 continue; 1026 continue;
1027 1027
1028 d = node_remap(s, *from_nodes, *to_nodes); 1028 d = node_remap(s, *from, *to);
1029 if (s == d) 1029 if (s == d)
1030 continue; 1030 continue;
1031 1031
@@ -1085,8 +1085,8 @@ static void migrate_page_add(struct page *page, struct list_head *pagelist,
1085{ 1085{
1086} 1086}
1087 1087
1088int do_migrate_pages(struct mm_struct *mm, 1088int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
1089 const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags) 1089 const nodemask_t *to, int flags)
1090{ 1090{
1091 return -ENOSYS; 1091 return -ENOSYS;
1092} 1092}