diff for duplicates of <20080609215801.GC9039@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 3bed3f5..292d633 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Reviewed-by: Christoph Lameter <clameter@sgi.com> 3 files changed, 54 insertions(+), 8 deletions(-) Index: linux-next/mm/page_alloc.c -=================================--- linux-next.orig/mm/page_alloc.c 2008-06-09 16:52:13.714381779 -0500 +=================================================================== +--- linux-next.orig/mm/page_alloc.c 2008-06-09 16:52:13.714381779 -0500 +++ linux-next/mm/page_alloc.c 2008-06-09 16:52:21.119299155 -0500 @@ -602,10 +602,10 @@ static int prep_new_page(struct page *pa bad_page(page); @@ -43,7 +44,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 13:46:32.892124708 -0500 +=================================================================== +--- linux-next.orig/mm/migrate.c 2008-06-09 13:46:32.892124708 -0500 +++ linux-next/mm/migrate.c 2008-06-09 16:52:21.147302624 -0500 @@ -720,7 +720,25 @@ unlock: * restored. @@ -51,7 +53,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 @@ -91,7 +93,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 16:52:13.746385743 -0500 +=================================================================== +--- linux-next.orig/include/linux/page-flags.h 2008-06-09 16:52:13.746385743 -0500 +++ linux-next/include/linux/page-flags.h 2008-06-09 16:52:21.171305598 -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 6322ecb..9b3865d 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 v7\0" - "Date\0Mon, 09 Jun 2008 21:58:01 +0000\0" + "Date\0Mon, 9 Jun 2008 16:58:01 -0500\0" "To\0linux-kernel@vger.kernel.org" " linux-ia64@vger.kernel.org\0" "Cc\0Linus Torvalds <torvalds@linux-foundation.org>" @@ -25,7 +24,8 @@ " 3 files changed, 54 insertions(+), 8 deletions(-)\n" "\n" "Index: linux-next/mm/page_alloc.c\n" - "=================================--- linux-next.orig/mm/page_alloc.c\t2008-06-09 16:52:13.714381779 -0500\n" + "===================================================================\n" + "--- linux-next.orig/mm/page_alloc.c\t2008-06-09 16:52:13.714381779 -0500\n" "+++ linux-next/mm/page_alloc.c\t2008-06-09 16:52:21.119299155 -0500\n" "@@ -602,10 +602,10 @@ static int prep_new_page(struct page *pa\n" " \t\tbad_page(page);\n" @@ -56,7 +56,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 13:46:32.892124708 -0500\n" + "===================================================================\n" + "--- linux-next.orig/mm/migrate.c\t2008-06-09 13:46:32.892124708 -0500\n" "+++ linux-next/mm/migrate.c\t2008-06-09 16:52:21.147302624 -0500\n" "@@ -720,7 +720,25 @@ unlock:\n" " \t\t * restored.\n" @@ -64,7 +65,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" @@ -104,7 +105,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 16:52:13.746385743 -0500\n" + "===================================================================\n" + "--- linux-next.orig/include/linux/page-flags.h\t2008-06-09 16:52:13.746385743 -0500\n" "+++ linux-next/include/linux/page-flags.h\t2008-06-09 16:52:21.171305598 -0500\n" "@@ -84,6 +84,7 @@ enum pageflags {\n" " \tPG_private,\t\t/* If pagecache, has fs-private data */\n" @@ -159,4 +161,4 @@ "Russ Anderson, OS RAS/Partitioning Project Lead \n" SGI - Silicon Graphics Inc rja@sgi.com -15a484adbcdee94dc5bf06115310d660d0e2791ae3198484f4e340feb9bc2596 +4407e1ae8766261b93510cce79a1e6d0cacd72c5951ba9f1248b050a3d007f87
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.