On Mon, 13 Sep 2010 14:08:03 -0700 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > On Mon, 13 Sep 2010 16:08:22 +0900 > KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> wrote: <snip> > > Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> > > --- > > mm/memcontrol.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > Index: lockless-update/mm/memcontrol.c > > =================================================================== > > --- lockless-update.orig/mm/memcontrol.c > > +++ lockless-update/mm/memcontrol.c > > @@ -1485,7 +1485,8 @@ void mem_cgroup_update_file_mapped(struc > > SetPageCgroupFileMapped(pc); > > } else { > > __this_cpu_dec(mem->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]); > > - ClearPageCgroupFileMapped(pc); > > + if (page_mapped(page)) /* for race between dec->inc counter */ > > + ClearPageCgroupFileMapped(pc); > > } > > This should be !page_mapped(), shouldn't it? > Ahhhh, yes. reflesh miss.. > And your second patch _does_ have !page_mapped() here, which is why the > second patch didn't apply. > Very sorry. > I tried to fix things up. Please check. Thank you. -Kame > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>