diff --git a/[refs] b/[refs] index 33be25c54067..e08cf8c9fa07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 411223c01a51163e995dbc2679bf8e963a136a5f +refs/heads/master: 9d966d495c4ac2fcbd010f681425f67141f80bad diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index e2fdbce1874b..07f22d4a431f 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -972,7 +972,7 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages, * array. Return various errors if the user did something wrong. */ for (i = 0; i < nr_pages; i++) { - const void *p; + const void __user *p; err = -EFAULT; if (get_user(p, pages + i))