diff for duplicates of <20160716101431.GA10305@bbox> diff --git a/a/1.txt b/N1/1.txt index 28a0ab8..2a866dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,3 +35,31 @@ On Fri, Jul 15, 2016 at 02:09:24PM +0100, Mel Gorman wrote: Oops, It should be pgdat, not zone->zone_pgdat. Andrew, please fold it. + +>From 0b058f64335764b82439a3c24fad8573cc1474d7 Mon Sep 17 00:00:00 2001 +From: Minchan Kim <minchan@kernel.org> +Date: Sat, 16 Jul 2016 19:07:51 +0900 +Subject: [PATCH] mm: fix node_pages_scanned + +Use pgdat for node stat instead of zone->pgdat. + +Signed-off-by: Minchan Kim <minchan@kernel.org> +--- + mm/page_alloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 7edd311..7547b6b 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -4368,7 +4368,7 @@ void show_free_areas(unsigned int filter) + K(node_page_state(pgdat, NR_SHMEM)), + K(node_page_state(pgdat, NR_WRITEBACK_TEMP)), + K(node_page_state(pgdat, NR_UNSTABLE_NFS)), +- node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED), ++ node_page_state(pgdat, NR_PAGES_SCANNED), + !pgdat_reclaimable(pgdat) ? "yes" : "no"); + } + +-- +1.9.1 diff --git a/a/content_digest b/N1/content_digest index 09b5583..721347c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,8 @@ "Date\0Sat, 16 Jul 2016 19:14:31 +0900\0" "To\0Mel Gorman <mgorman@techsingularity.net>" " Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0Johannes Weiner <hannes@cmpxchg.org>" + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Johannes Weiner <hannes@cmpxchg.org> Vlastimil Babka <vbabka@suse.cz> Linux-MM <linux-mm@kvack.org> " LKML <linux-kernel@vger.kernel.org>\0" @@ -47,6 +48,34 @@ "> +\t\t\tnode_page_state(zone->zone_pgdat, NR_PAGES_SCANNED),\n" "\n" "Oops, It should be pgdat, not zone->zone_pgdat.\n" - Andrew, please fold it. + "Andrew, please fold it.\n" + "\n" + ">From 0b058f64335764b82439a3c24fad8573cc1474d7 Mon Sep 17 00:00:00 2001\n" + "From: Minchan Kim <minchan@kernel.org>\n" + "Date: Sat, 16 Jul 2016 19:07:51 +0900\n" + "Subject: [PATCH] mm: fix node_pages_scanned\n" + "\n" + "Use pgdat for node stat instead of zone->pgdat.\n" + "\n" + "Signed-off-by: Minchan Kim <minchan@kernel.org>\n" + "---\n" + " mm/page_alloc.c | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "\n" + "diff --git a/mm/page_alloc.c b/mm/page_alloc.c\n" + "index 7edd311..7547b6b 100644\n" + "--- a/mm/page_alloc.c\n" + "+++ b/mm/page_alloc.c\n" + "@@ -4368,7 +4368,7 @@ void show_free_areas(unsigned int filter)\n" + " \t\t\tK(node_page_state(pgdat, NR_SHMEM)),\n" + " \t\t\tK(node_page_state(pgdat, NR_WRITEBACK_TEMP)),\n" + " \t\t\tK(node_page_state(pgdat, NR_UNSTABLE_NFS)),\n" + "-\t\t\tnode_page_state(zone->zone_pgdat, NR_PAGES_SCANNED),\n" + "+\t\t\tnode_page_state(pgdat, NR_PAGES_SCANNED),\n" + " \t\t\t!pgdat_reclaimable(pgdat) ? \"yes\" : \"no\");\n" + " \t}\n" + " \n" + "-- \n" + 1.9.1 -6800b00a7d2b2327d23f080d1da89fb4b85f5ab32d03801e5d618878b237da35 +fa977dd400131fb9a5c272269f3681c0a5fd45ec64f35dc3c13d77a8d186d9d8
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.