diff for duplicates of <20090617072319.GA5841@localhost> diff --git a/a/1.txt b/N1/1.txt index 1f920ba..be5e61a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,21 +21,21 @@ On Wed, Jun 17, 2009 at 08:28:26AM +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 ? > > > > @@ -80,8 +80,8 @@ You are welcome~ > Okay. then, how about this ? > We should not increase file_rss on trying to migrate the poisoned page > -> - else if (!is_migration_entry(pte_to_swp_entry(*pte))) -> + else if (!(PAGE_MIGRATION && migration)) +> - 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 if (!(PAGE_MIGRATION && migration)) This is good if we are going to stop the hwpoison page from being consumed by move_to_new_page(), but I highly doubt we'll ever add @@ -111,3 +111,9 @@ like a ghost) will go BUG(): Thanks, Fengguang + +-- +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 bb27871..2928dbd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -48,21 +48,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" @@ -107,8 +107,8 @@ "> Okay. then, how about this ?\n" "> We should not increase file_rss on trying to migrate the poisoned page\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 if (!(PAGE_MIGRATION && migration))\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 if (!(PAGE_MIGRATION && migration))\n" "\n" "This is good if we are going to stop the hwpoison page from being\n" "consumed by move_to_new_page(), but I highly doubt we'll ever add\n" @@ -137,6 +137,12 @@ " BUG();\n" "\n" "Thanks,\n" - Fengguang + "Fengguang\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>" -12f0ed208f94404eb3dc381fb788c8d938c4660ff8d6a26d51e309f3dc3e1aba +055660358391c93c0f54861b179b2503e87766bb186ab4227b5e3f86bac017bd
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.