The patch titled memcg-show-swap-usage-in-stat-file-fix has been removed from the -mm tree. Its filename was memcg-show-swap-usage-in-stat-file-fix.patch This patch was dropped because it was folded into memcg-show-swap-usage-in-stat-file.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memcg-show-swap-usage-in-stat-file-fix From: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx> The usage of swap should be showed in bytes. Signed-off-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/memcontrol.c~memcg-show-swap-usage-in-stat-file-fix mm/memcontrol.c --- a/mm/memcontrol.c~memcg-show-swap-usage-in-stat-file-fix +++ a/mm/memcontrol.c @@ -2712,7 +2712,7 @@ static int mem_cgroup_get_local_stat(str s->stat[MCS_PGPGOUT] += val; if (do_swap_account) { val = mem_cgroup_read_stat(&mem->stat, MEM_CGROUP_STAT_SWAPOUT); - s->stat[MCS_SWAP] += val; + s->stat[MCS_SWAP] += val * PAGE_SIZE; } /* per zone stat */ _ Patches currently in -mm which might be from nishimura@xxxxxxxxxxxxxxxxx are origin.patch memcg-remove-the-overhead-associated-with-the-root-cgroup.patch memcg-add-comments-explaining-memory-barriers.patch memory-controller-soft-limit-reclaim-on-contention-v9.patch memcg-improve-resource-counter-scalability.patch memcg-show-swap-usage-in-stat-file.patch memcg-show-swap-usage-in-stat-file-fix.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