diff for duplicates of <20170605183511.GA8915@cmpxchg.org>

diff --git a/a/1.txt b/N1/1.txt
index d09c67c..c86e10d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -29,83 +29,4 @@ It looks like we need the following on top. I can't reproduce the
 crash, but it's verifiable with WARN_ONs in the vmstat functions that
 the nodestat array isn't properly initialized when slab bootstraps:
 
----
-
->From 89ed86b5b538d8debd3c29567d7e1d31257fa577 Mon Sep 17 00:00:00 2001
-From: Johannes Weiner <hannes@cmpxchg.org>
-Date: Mon, 5 Jun 2017 14:12:15 -0400
-Subject: [PATCH] mm: vmstat: move slab statistics from zone to node counters
- fix
-
-Unable to handle kernel paging request at virtual address 2e116007
-pgd = c0004000
-[2e116007] *pgd=00000000
-Internal error: Oops: 5 [#1] SMP ARM
-Modules linked in:
-CPU: 0 PID: 0 Comm: swapper Not tainted 4.12.0-rc3-00153-gb6bc6724488a #200
-Hardware name: Generic DRA74X (Flattened Device Tree)
-task: c0d0adc0 task.stack: c0d00000
-PC is at __mod_node_page_state+0x2c/0xc8
-LR is at __per_cpu_offset+0x0/0x8
-pc : [<c0271de8>]    lr : [<c0d07da4>]    psr: 600000d3
-sp : c0d01eec  ip : 00000000  fp : c15782f4
-r10: 00000000  r9 : c1591280  r8 : 00004000
-r7 : 00000001  r6 : 00000006  r5 : 2e116000  r4 : 00000007
-r3 : 00000007  r2 : 00000001  r1 : 00000006  r0 : c0dc27c0
-Flags: nZCv  IRQs off  FIQs off  Mode SVC_32  ISA ARM  Segment none
-Control: 10c5387d  Table: 8000406a  DAC: 00000051
-Process swapper (pid: 0, stack limit = 0xc0d00218)
-Stack: (0xc0d01eec to 0xc0d02000)
-1ee0:                            600000d3 c0dc27c0 c0271efc 00000001 c0d58864
-1f00: ef470000 00008000 00004000 c029fbb0 01000000 c1572b5c 00002000 00000000
-1f20: 00000001 00000001 00008000 c029f584 00000000 c0d58864 00008000 00008000
-1f40: 01008000 c0c23790 c15782f4 a00000d3 c0d58864 c02a0364 00000000 c0819388
-1f60: c0d58864 000000c0 01000000 c1572a58 c0aa57a4 00000080 00002000 c0dca000
-1f80: efffe980 c0c53a48 00000000 c0c23790 c1572a58 c0c59e48 c0c59de8 c1572b5c
-1fa0: c0dca000 c0c257a4 00000000 ffffffff c0dca000 c0d07940 c0dca000 c0c00a9c
-1fc0: ffffffff ffffffff 00000000 c0c00680 00000000 c0c53a48 c0dca214 c0d07958
-1fe0: c0c53a44 c0d0caa4 8000406a 412fc0f2 00000000 8000807c 00000000 00000000
-[<c0271de8>] (__mod_node_page_state) from [<c0271efc>] (mod_node_page_state+0x2c/0x4c)
-[<c0271efc>] (mod_node_page_state) from [<c029fbb0>] (cache_alloc_refill+0x5b8/0x828)
-[<c029fbb0>] (cache_alloc_refill) from [<c02a0364>] (kmem_cache_alloc+0x24c/0x2d0)
-[<c02a0364>] (kmem_cache_alloc) from [<c0c23790>] (create_kmalloc_cache+0x20/0x8c)
-[<c0c23790>] (create_kmalloc_cache) from [<c0c257a4>] (kmem_cache_init+0xac/0x11c)
-[<c0c257a4>] (kmem_cache_init) from [<c0c00a9c>] (start_kernel+0x1b8/0x3c0)
-[<c0c00a9c>] (start_kernel) from [<8000807c>] (0x8000807c)
-Code: e79e5103 e28c3001 e0833001 e1a04003 (e19440d5)
----[ end trace 0000000000000000 ]---
-
-The zone counters work earlier than the node counters because the
-zones have special boot pagesets, whereas the nodes do not.
-
-Add boot nodestats against which we account until the dynamic per-cpu
-allocator is available.
-
-Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
----
- mm/page_alloc.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 5f89cfaddc4b..7f341f84b587 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -5107,6 +5107,7 @@ static void build_zonelists(pg_data_t *pgdat)
-  */
- static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch);
- static DEFINE_PER_CPU(struct per_cpu_pageset, boot_pageset);
-+static DEFINE_PER_CPU(struct per_cpu_nodestat, boot_nodestats);
- static void setup_zone_pageset(struct zone *zone);
- 
- /*
-@@ -6010,6 +6011,8 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
- 	spin_lock_init(&pgdat->lru_lock);
- 	lruvec_init(node_lruvec(pgdat));
- 
-+	pgdat->per_cpu_nodestats = &boot_nodestats;
-+
- 	for (j = 0; j < MAX_NR_ZONES; j++) {
- 		struct zone *zone = pgdat->node_zones + j;
- 		unsigned long size, realsize, freesize, memmap_pages;
--- 
-2.13.0
\ No newline at end of file
+---
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 6062aef..69de358 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -80,86 +80,7 @@
   "crash, but it's verifiable with WARN_ONs in the vmstat functions that\n",
   "the nodestat array isn't properly initialized when slab bootstraps:\n",
   "\n",
-  "---\n",
-  "\n",
-  ">From 89ed86b5b538d8debd3c29567d7e1d31257fa577 Mon Sep 17 00:00:00 2001\n",
-  "From: Johannes Weiner <hannes\@cmpxchg.org>\n",
-  "Date: Mon, 5 Jun 2017 14:12:15 -0400\n",
-  "Subject: [PATCH] mm: vmstat: move slab statistics from zone to node counters\n",
-  " fix\n",
-  "\n",
-  "Unable to handle kernel paging request at virtual address 2e116007\n",
-  "pgd = c0004000\n",
-  "[2e116007] *pgd=00000000\n",
-  "Internal error: Oops: 5 [#1] SMP ARM\n",
-  "Modules linked in:\n",
-  "CPU: 0 PID: 0 Comm: swapper Not tainted 4.12.0-rc3-00153-gb6bc6724488a #200\n",
-  "Hardware name: Generic DRA74X (Flattened Device Tree)\n",
-  "task: c0d0adc0 task.stack: c0d00000\n",
-  "PC is at __mod_node_page_state+0x2c/0xc8\n",
-  "LR is at __per_cpu_offset+0x0/0x8\n",
-  "pc : [<c0271de8>]    lr : [<c0d07da4>]    psr: 600000d3\n",
-  "sp : c0d01eec  ip : 00000000  fp : c15782f4\n",
-  "r10: 00000000  r9 : c1591280  r8 : 00004000\n",
-  "r7 : 00000001  r6 : 00000006  r5 : 2e116000  r4 : 00000007\n",
-  "r3 : 00000007  r2 : 00000001  r1 : 00000006  r0 : c0dc27c0\n",
-  "Flags: nZCv  IRQs off  FIQs off  Mode SVC_32  ISA ARM  Segment none\n",
-  "Control: 10c5387d  Table: 8000406a  DAC: 00000051\n",
-  "Process swapper (pid: 0, stack limit = 0xc0d00218)\n",
-  "Stack: (0xc0d01eec to 0xc0d02000)\n",
-  "1ee0:                            600000d3 c0dc27c0 c0271efc 00000001 c0d58864\n",
-  "1f00: ef470000 00008000 00004000 c029fbb0 01000000 c1572b5c 00002000 00000000\n",
-  "1f20: 00000001 00000001 00008000 c029f584 00000000 c0d58864 00008000 00008000\n",
-  "1f40: 01008000 c0c23790 c15782f4 a00000d3 c0d58864 c02a0364 00000000 c0819388\n",
-  "1f60: c0d58864 000000c0 01000000 c1572a58 c0aa57a4 00000080 00002000 c0dca000\n",
-  "1f80: efffe980 c0c53a48 00000000 c0c23790 c1572a58 c0c59e48 c0c59de8 c1572b5c\n",
-  "1fa0: c0dca000 c0c257a4 00000000 ffffffff c0dca000 c0d07940 c0dca000 c0c00a9c\n",
-  "1fc0: ffffffff ffffffff 00000000 c0c00680 00000000 c0c53a48 c0dca214 c0d07958\n",
-  "1fe0: c0c53a44 c0d0caa4 8000406a 412fc0f2 00000000 8000807c 00000000 00000000\n",
-  "[<c0271de8>] (__mod_node_page_state) from [<c0271efc>] (mod_node_page_state+0x2c/0x4c)\n",
-  "[<c0271efc>] (mod_node_page_state) from [<c029fbb0>] (cache_alloc_refill+0x5b8/0x828)\n",
-  "[<c029fbb0>] (cache_alloc_refill) from [<c02a0364>] (kmem_cache_alloc+0x24c/0x2d0)\n",
-  "[<c02a0364>] (kmem_cache_alloc) from [<c0c23790>] (create_kmalloc_cache+0x20/0x8c)\n",
-  "[<c0c23790>] (create_kmalloc_cache) from [<c0c257a4>] (kmem_cache_init+0xac/0x11c)\n",
-  "[<c0c257a4>] (kmem_cache_init) from [<c0c00a9c>] (start_kernel+0x1b8/0x3c0)\n",
-  "[<c0c00a9c>] (start_kernel) from [<8000807c>] (0x8000807c)\n",
-  "Code: e79e5103 e28c3001 e0833001 e1a04003 (e19440d5)\n",
-  "---[ end trace 0000000000000000 ]---\n",
-  "\n",
-  "The zone counters work earlier than the node counters because the\n",
-  "zones have special boot pagesets, whereas the nodes do not.\n",
-  "\n",
-  "Add boot nodestats against which we account until the dynamic per-cpu\n",
-  "allocator is available.\n",
-  "\n",
-  "Signed-off-by: Johannes Weiner <hannes\@cmpxchg.org>\n",
-  "---\n",
-  " mm/page_alloc.c | 3 +++\n",
-  " 1 file changed, 3 insertions(+)\n",
-  "\n",
-  "diff --git a/mm/page_alloc.c b/mm/page_alloc.c\n",
-  "index 5f89cfaddc4b..7f341f84b587 100644\n",
-  "--- a/mm/page_alloc.c\n",
-  "+++ b/mm/page_alloc.c\n",
-  "\@\@ -5107,6 +5107,7 \@\@ static void build_zonelists(pg_data_t *pgdat)\n",
-  "  */\n",
-  " static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch);\n",
-  " static DEFINE_PER_CPU(struct per_cpu_pageset, boot_pageset);\n",
-  "+static DEFINE_PER_CPU(struct per_cpu_nodestat, boot_nodestats);\n",
-  " static void setup_zone_pageset(struct zone *zone);\n",
-  " \n",
-  " /*\n",
-  "\@\@ -6010,6 +6011,8 \@\@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)\n",
-  " \tspin_lock_init(&pgdat->lru_lock);\n",
-  " \tlruvec_init(node_lruvec(pgdat));\n",
-  " \n",
-  "+\tpgdat->per_cpu_nodestats = &boot_nodestats;\n",
-  "+\n",
-  " \tfor (j = 0; j < MAX_NR_ZONES; j++) {\n",
-  " \t\tstruct zone *zone = pgdat->node_zones + j;\n",
-  " \t\tunsigned long size, realsize, freesize, memmap_pages;\n",
-  "-- \n",
-  "2.13.0"
+  "---"
 ]
 
-ba696f63057336bdba1104593bce87ab1fb32adb56537ad1e0c895fb92a9f698
+83235a921a6aa5f029e9367590bf5596af02f9d7f2b5d44c6ce762b5ee370de5
