The patch titled cpuset-remove-unneeded-nodemask_alloc-in-cpuset_sprintf_memlist-v2 has been removed from the -mm tree. Its filename was cpuset-remove-unneeded-nodemask_alloc-in-cpuset_sprintf_memlist-v2.patch This patch was dropped because it was folded into cpuset-remove-unneeded-nodemask_alloc-in-cpuset_sprintf_memlist.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cpuset-remove-unneeded-nodemask_alloc-in-cpuset_sprintf_memlist-v2 From: Li Zefan <lizf@xxxxxxxxxxxxxx> Acked-by: Paul Menage <menage@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx> Cc: Miao Xie <miaox@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/cpuset.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN kernel/cpuset.c~cpuset-remove-unneeded-nodemask_alloc-in-cpuset_sprintf_memlist-v2 kernel/cpuset.c --- a/kernel/cpuset.c~cpuset-remove-unneeded-nodemask_alloc-in-cpuset_sprintf_memlist-v2 +++ a/kernel/cpuset.c @@ -1610,26 +1610,26 @@ out: * across a page fault. */ -static int cpuset_sprintf_cpulist(char *page, struct cpuset *cs) +static size_t cpuset_sprintf_cpulist(char *page, struct cpuset *cs) { - int ret; + size_t count; mutex_lock(&callback_mutex); - ret = cpulist_scnprintf(page, PAGE_SIZE, cs->cpus_allowed); + count = cpulist_scnprintf(page, PAGE_SIZE, cs->cpus_allowed); mutex_unlock(&callback_mutex); - return ret; + return count; } -static int cpuset_sprintf_memlist(char *page, struct cpuset *cs) +static size_t cpuset_sprintf_memlist(char *page, struct cpuset *cs) { - int retval; + size_t count; mutex_lock(&callback_mutex); - retval = nodelist_scnprintf(page, PAGE_SIZE, cs->mems_allowed); + count = nodelist_scnprintf(page, PAGE_SIZE, cs->mems_allowed); mutex_unlock(&callback_mutex); - return retval; + return count; } static ssize_t cpuset_common_file_read(struct cgroup *cont, _ Patches currently in -mm which might be from lizf@xxxxxxxxxxxxxx are origin.patch cpuset-remove-unneeded-nodemask_alloc-in-cpuset_sprintf_memlist.patch cpuset-remove-unneeded-nodemask_alloc-in-cpuset_attch.patch cpuset-fix-unchecked-calls-to-nodemask_alloc.patch cpuset-fix-unchecked-calls-to-nodemask_alloc-v2.patch cpuset-hold-callback_mutex-in-cpuset_clone.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html