diff for duplicates of <20080730233150.GA86120@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 9d326c9..8be2ba6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,8 @@ Reviewed-by: Christoph Lameter <cl@linux-foundation.org> 2 files changed, 49 insertions(+), 2 deletions(-) Index: linux/mm/migrate.c -=================================--- linux.orig/mm/migrate.c 2008-07-29 13:18:23.000000000 -0500 +=================================================================== +--- linux.orig/mm/migrate.c 2008-07-29 13:18:23.000000000 -0500 +++ linux/mm/migrate.c 2008-07-29 13:21:03.000000000 -0500 @@ -65,6 +65,7 @@ int isolate_lru_page(struct page *page, } @@ -48,7 +49,7 @@ Index: linux/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 @@ -97,7 +98,8 @@ Index: linux/mm/migrate.c #ifdef CONFIG_NUMA /* Index: linux/include/linux/page-flags.h -=================================--- linux.orig/include/linux/page-flags.h 2008-07-29 13:18:23.000000000 -0500 +=================================================================== +--- linux.orig/include/linux/page-flags.h 2008-07-29 13:18:23.000000000 -0500 +++ linux/include/linux/page-flags.h 2008-07-29 13:21:03.000000000 -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 887e4ea..1a641f2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Russ Anderson <rja@sgi.com>\0" "Subject\0[PATCH] mm: Avoid putting a bad page back on the LRU v8\0" - "Date\0Wed, 30 Jul 2008 23:31:51 +0000\0" + "Date\0Wed, 30 Jul 2008 18:31:51 -0500\0" "To\0Andrew Morton <akpm@linux-foundation.org>" linux-kernel@vger.kernel.org " linux-ia64@vger.kernel.org\0" @@ -25,7 +25,8 @@ " 2 files changed, 49 insertions(+), 2 deletions(-)\n" "\n" "Index: linux/mm/migrate.c\n" - "=================================--- linux.orig/mm/migrate.c\t2008-07-29 13:18:23.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/mm/migrate.c\t2008-07-29 13:18:23.000000000 -0500\n" "+++ linux/mm/migrate.c\t2008-07-29 13:21:03.000000000 -0500\n" "@@ -65,6 +65,7 @@ int isolate_lru_page(struct page *page, \n" " \t}\n" @@ -57,7 +58,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" @@ -106,7 +107,8 @@ " #ifdef CONFIG_NUMA\n" " /*\n" "Index: linux/include/linux/page-flags.h\n" - "=================================--- linux.orig/include/linux/page-flags.h\t2008-07-29 13:18:23.000000000 -0500\n" + "===================================================================\n" + "--- linux.orig/include/linux/page-flags.h\t2008-07-29 13:18:23.000000000 -0500\n" "+++ linux/include/linux/page-flags.h\t2008-07-29 13:21:03.000000000 -0500\n" "@@ -84,6 +84,7 @@ enum pageflags {\n" " \tPG_private,\t\t/* If pagecache, has fs-private data */\n" @@ -156,4 +158,4 @@ "Russ Anderson, OS RAS/Partitioning Project Lead \n" SGI - Silicon Graphics Inc rja@sgi.com -5172fb4dde71850baf4df38e73bdc71e219c49ed51cb30fc8d706df61fc37e8c +8d45affff9df829ec638926d5f9d9240134048fec4dcdfc42bb6684bda5bcc75
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.