diff for duplicates of <20080609161933.GC14939@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 9448b24..f2c211c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,8 @@ Signed-off-by: Russ Anderson <rja@sgi.com> 3 files changed, 48 insertions(+), 7 deletions(-) Index: linux-next/mm/page_alloc.c -=================================--- linux-next.orig/mm/page_alloc.c 2008-06-09 09:26:52.203578218 -0500 +=================================================================== +--- linux-next.orig/mm/page_alloc.c 2008-06-09 09:26:52.203578218 -0500 +++ linux-next/mm/page_alloc.c 2008-06-09 09:26:54.715891226 -0500 @@ -602,10 +602,10 @@ static int prep_new_page(struct page *pa bad_page(page); @@ -48,7 +49,8 @@ Index: linux-next/mm/page_alloc.c block_migratetype = get_pageblock_migratetype(page); Index: linux-next/mm/migrate.c -=================================--- linux-next.orig/mm/migrate.c 2008-06-09 09:26:46.226833574 -0500 +=================================================================== +--- linux-next.orig/mm/migrate.c 2008-06-09 09:26:46.226833574 -0500 +++ linux-next/mm/migrate.c 2008-06-09 09:26:54.739894217 -0500 @@ -720,7 +720,25 @@ unlock: * restored. @@ -56,7 +58,7 @@ Index: linux-next/mm/migrate.c list_del(&page->lru); - move_to_lru(page); + if (PageMemError(page)) -+ if (rc = 0) ++ if (rc == 0) + /* + * A page with a memory error that has + * been migrated will not be moved to @@ -96,7 +98,8 @@ Index: linux-next/mm/migrate.c out: if (!swapwrite) Index: linux-next/include/linux/page-flags.h -=================================--- linux-next.orig/include/linux/page-flags.h 2008-06-09 09:26:52.223580710 -0500 +=================================================================== +--- linux-next.orig/include/linux/page-flags.h 2008-06-09 09:26:52.223580710 -0500 +++ linux-next/include/linux/page-flags.h 2008-06-09 09:26:54.763897207 -0500 @@ -84,6 +84,7 @@ enum pageflags { PG_private, /* If pagecache, has fs-private data */ diff --git a/a/content_digest b/N1/content_digest index 846fdf4..9ab3339 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\020080502004248.GC12006@sgi.com\0" "From\0Russ Anderson <rja@sgi.com>\0" "Subject\0[PATCH 2/3] mm: Avoid putting a bad page back on the LRU v6\0" - "Date\0Mon, 09 Jun 2008 16:19:34 +0000\0" + "Date\0Mon, 9 Jun 2008 11:19:34 -0500\0" "To\0linux-kernel@vger.kernel.org" " linux-ia64@vger.kernel.org\0" "Cc\0Linus Torvalds <torvalds@linux-foundation.org>" @@ -30,7 +29,8 @@ " 3 files changed, 48 insertions(+), 7 deletions(-)\n" "\n" "Index: linux-next/mm/page_alloc.c\n" - "=================================--- linux-next.orig/mm/page_alloc.c\t2008-06-09 09:26:52.203578218 -0500\n" + "===================================================================\n" + "--- linux-next.orig/mm/page_alloc.c\t2008-06-09 09:26:52.203578218 -0500\n" "+++ linux-next/mm/page_alloc.c\t2008-06-09 09:26:54.715891226 -0500\n" "@@ -602,10 +602,10 @@ static int prep_new_page(struct page *pa\n" " \t\tbad_page(page);\n" @@ -61,7 +61,8 @@ " \n" " \t\tblock_migratetype = get_pageblock_migratetype(page);\n" "Index: linux-next/mm/migrate.c\n" - "=================================--- linux-next.orig/mm/migrate.c\t2008-06-09 09:26:46.226833574 -0500\n" + "===================================================================\n" + "--- linux-next.orig/mm/migrate.c\t2008-06-09 09:26:46.226833574 -0500\n" "+++ linux-next/mm/migrate.c\t2008-06-09 09:26:54.739894217 -0500\n" "@@ -720,7 +720,25 @@ unlock:\n" " \t\t * restored.\n" @@ -69,7 +70,7 @@ " \t\tlist_del(&page->lru);\n" "- \t\tmove_to_lru(page);\n" "+\t\tif (PageMemError(page))\n" - "+\t\t\tif (rc = 0)\n" + "+\t\t\tif (rc == 0)\n" "+\t\t\t\t/*\n" "+\t\t\t\t * A page with a memory error that has\n" "+\t\t\t\t * been migrated will not be moved to\n" @@ -109,7 +110,8 @@ " out:\n" " \tif (!swapwrite)\n" "Index: linux-next/include/linux/page-flags.h\n" - "=================================--- linux-next.orig/include/linux/page-flags.h\t2008-06-09 09:26:52.223580710 -0500\n" + "===================================================================\n" + "--- linux-next.orig/include/linux/page-flags.h\t2008-06-09 09:26:52.223580710 -0500\n" "+++ linux-next/include/linux/page-flags.h\t2008-06-09 09:26:54.763897207 -0500\n" "@@ -84,6 +84,7 @@ enum pageflags {\n" " \tPG_private,\t\t/* If pagecache, has fs-private data */\n" @@ -142,4 +144,4 @@ "Russ Anderson, OS RAS/Partitioning Project Lead \n" SGI - Silicon Graphics Inc rja@sgi.com -a92a48d8e302b8f0d928149be8d8d7c9da0b11ccb1c7f841daac8d4ef8d618d9 +a3b85c90679155cf35e208899d1e0b3476c17aecc7a7a81c3406ff32e17f2518
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.