diff --git a/[refs] b/[refs] index 36f503277369..61fe8b3d221e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8493ae439f7038b502df1d687e61dde54c27ca92 +refs/heads/master: 3751d60430fe4c26460a5ca8ad8672d32f93bcb1 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index fc75f34ba609..da53a252b259 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -612,8 +612,10 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *mem, /* pagein of a big page is an event. So, ignore page size */ if (nr_pages > 0) __this_cpu_inc(mem->stat->count[MEM_CGROUP_STAT_PGPGIN_COUNT]); - else + else { __this_cpu_inc(mem->stat->count[MEM_CGROUP_STAT_PGPGOUT_COUNT]); + nr_pages = -nr_pages; /* for event */ + } __this_cpu_add(mem->stat->count[MEM_CGROUP_EVENTS], nr_pages);