diff for duplicates of <20090616134944.GB7524@localhost> diff --git a/a/1.txt b/N1/1.txt index 2633e09..188f104 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,21 +17,21 @@ On Tue, Jun 16, 2009 at 08:03:08AM +0800, Minchan Kim wrote: > > > > Signed-off-by: Andi Kleen <ak@linux.intel.com> > > > > > > > > --- -> > > > include/linux/rmap.h | 1 + -> > > > mm/rmap.c | 9 ++++++++- -> > > > 2 files changed, 9 insertions(+), 1 deletion(-) +> > > > A include/linux/rmap.h | A A 1 + +> > > > A mm/rmap.c A A A A A A | A A 9 ++++++++- +> > > > A 2 files changed, 9 insertions(+), 1 deletion(-) > > > > > > > > --- sound-2.6.orig/mm/rmap.c > > > > +++ sound-2.6/mm/rmap.c > > > > @@ -958,7 +958,14 @@ static int try_to_unmap_one(struct page -> > > > /* Update high watermark before we lower rss */ -> > > > update_hiwater_rss(mm); +> > > > A A A A /* Update high watermark before we lower rss */ +> > > > A A A A update_hiwater_rss(mm); > > > > -> > > > - if (PageAnon(page)) { -> > > > + if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) { -> > > > + if (PageAnon(page)) -> > > > + dec_mm_counter(mm, anon_rss); -> > > > + else if (!is_migration_entry(pte_to_swp_entry(*pte))) +> > > > - A A A if (PageAnon(page)) { +> > > > + A A A if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) { +> > > > + A A A A A A A if (PageAnon(page)) +> > > > + A A A A A A A A A A A dec_mm_counter(mm, anon_rss); +> > > > + A A A A A A A else if (!is_migration_entry(pte_to_swp_entry(*pte))) > > > > > > Isn't it straightforward to use !is_hwpoison_entry ? > > @@ -72,8 +72,8 @@ Thanks, Fengguang > > -> > - else if (!is_migration_entry(pte_to_swp_entry(*pte))) -> > + else +> > - A A A A A A A else if (!is_migration_entry(pte_to_swp_entry(*pte))) +> > + A A A A A A A else > > > > > > Thanks, @@ -83,3 +83,9 @@ Fengguang > -- > Kinds Regards > Minchan Kim + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 0fc8b0e..eb3bb01 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -42,21 +42,21 @@ "> > > > Signed-off-by: Andi Kleen <ak@linux.intel.com>\n" "> > > >\n" "> > > > ---\n" - "> > > > \302\240include/linux/rmap.h | \302\240 \302\2401 +\n" - "> > > > \302\240mm/rmap.c \302\240 \302\240 \302\240 \302\240 \302\240 \302\240| \302\240 \302\2409 ++++++++-\n" - "> > > > \302\2402 files changed, 9 insertions(+), 1 deletion(-)\n" + "> > > > A include/linux/rmap.h | A A 1 +\n" + "> > > > A mm/rmap.c A A A A A A | A A 9 ++++++++-\n" + "> > > > A 2 files changed, 9 insertions(+), 1 deletion(-)\n" "> > > >\n" "> > > > --- sound-2.6.orig/mm/rmap.c\n" "> > > > +++ sound-2.6/mm/rmap.c\n" "> > > > @@ -958,7 +958,14 @@ static int try_to_unmap_one(struct page\n" - "> > > > \302\240 \302\240 \302\240 \302\240/* Update high watermark before we lower rss */\n" - "> > > > \302\240 \302\240 \302\240 \302\240update_hiwater_rss(mm);\n" + "> > > > A A A A /* Update high watermark before we lower rss */\n" + "> > > > A A A A update_hiwater_rss(mm);\n" "> > > >\n" - "> > > > - \302\240 \302\240 \302\240 if (PageAnon(page)) {\n" - "> > > > + \302\240 \302\240 \302\240 if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) {\n" - "> > > > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (PageAnon(page))\n" - "> > > > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 dec_mm_counter(mm, anon_rss);\n" - "> > > > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 else if (!is_migration_entry(pte_to_swp_entry(*pte)))\n" + "> > > > - A A A if (PageAnon(page)) {\n" + "> > > > + A A A if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) {\n" + "> > > > + A A A A A A A if (PageAnon(page))\n" + "> > > > + A A A A A A A A A A A dec_mm_counter(mm, anon_rss);\n" + "> > > > + A A A A A A A else if (!is_migration_entry(pte_to_swp_entry(*pte)))\n" "> > > \n" "> > > Isn't it straightforward to use !is_hwpoison_entry ?\n" "> > \n" @@ -97,8 +97,8 @@ "Fengguang\n" "\n" "> > \n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 else if (!is_migration_entry(pte_to_swp_entry(*pte)))\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 else\n" + "> > - A A A A A A A else if (!is_migration_entry(pte_to_swp_entry(*pte)))\n" + "> > + A A A A A A A else\n" "> > \n" "> > \n" "> > Thanks,\n" @@ -107,6 +107,12 @@ "> \n" "> -- \n" "> Kinds Regards\n" - > Minchan Kim + "> Minchan Kim\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -e6d673e61cec95cee64d1a78b3681bbbb7b1109e1636a6bd0f87ea8c8174d71a +59cb2749cb28fbf6b88c32e06b455a11669ae83636cff508291e1b6240b1a8b9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.