diff for duplicates of <20181005151224.17473.53398.stgit@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index e084032..7873403 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -138,7 +138,7 @@ index 247b1f2573e4..1baea475f296 100644 if (highest_memmap_pfn < end_pfn - 1) highest_memmap_pfn = end_pfn - 1; -+ if (context = MEMMAP_HOTPLUG) { ++ if (context == MEMMAP_HOTPLUG) { #ifdef CONFIG_ZONE_DEVICE - /* - * Honor reservation requested by the driver for this ZONE_DEVICE @@ -147,7 +147,7 @@ index 247b1f2573e4..1baea475f296 100644 - * ZONE_DEVICE page initialization until after we have released - * the hotplug lock. - */ -- if (zone = ZONE_DEVICE) { +- if (zone == ZONE_DEVICE) { - if (!altmap) - return; + /* @@ -157,11 +157,11 @@ index 247b1f2573e4..1baea475f296 100644 + * mapping. We will defer the ZONE_DEVICE page initialization + * until after we have released the hotplug lock. + */ -+ if (zone = ZONE_DEVICE) { ++ if (zone == ZONE_DEVICE) { + if (!altmap) + return; + -+ if (start_pfn = altmap->base_pfn) ++ if (start_pfn == altmap->base_pfn) + start_pfn += altmap->reserve; + end_pfn = altmap->base_pfn + + vmem_altmap_offset(altmap); @@ -175,7 +175,7 @@ index 247b1f2573e4..1baea475f296 100644 + __memmap_init_hotplug(end_pfn - start_pfn, nid, zone, + start_pfn, NULL); -- if (start_pfn = altmap->base_pfn) +- if (start_pfn == altmap->base_pfn) - start_pfn += altmap->reserve; - end_pfn = altmap->base_pfn + vmem_altmap_offset(altmap); + return; @@ -189,7 +189,7 @@ index 247b1f2573e4..1baea475f296 100644 * There can be holes in boot-time mem_map[]s handed to this * function. They do not exist on hotplugged memory. */ -- if (context = MEMMAP_EARLY) { +- if (context == MEMMAP_EARLY) { - if (!early_pfn_valid(pfn)) { - pfn = next_valid_pfn(pfn) - 1; - continue; @@ -213,7 +213,7 @@ index 247b1f2573e4..1baea475f296 100644 page = pfn_to_page(pfn); __init_single_page(page, pfn, zone, nid); -- if (context = MEMMAP_HOTPLUG) +- if (context == MEMMAP_HOTPLUG) - __SetPageReserved(page); /* diff --git a/a/content_digest b/N1/content_digest index 12f1c2b..3931f56 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181005151006.17473.83040.stgit@localhost.localdomain\0" "From\0Alexander Duyck <alexander.h.duyck@linux.intel.com>\0" "Subject\0[mm PATCH 4/5] mm: Move hot-plug specific memory init into separate functions and optimize\0" - "Date\0Fri, 05 Oct 2018 15:12:24 +0000\0" + "Date\0Fri, 05 Oct 2018 08:12:24 -0700\0" "To\0linux-mm@kvack.org" " akpm@linux-foundation.org\0" "Cc\0pavel.tatashin@microsoft.com" @@ -162,7 +162,7 @@ " \tif (highest_memmap_pfn < end_pfn - 1)\n" " \t\thighest_memmap_pfn = end_pfn - 1;\n" " \n" - "+\tif (context = MEMMAP_HOTPLUG) {\n" + "+\tif (context == MEMMAP_HOTPLUG) {\n" " #ifdef CONFIG_ZONE_DEVICE\n" "-\t/*\n" "-\t * Honor reservation requested by the driver for this ZONE_DEVICE\n" @@ -171,7 +171,7 @@ "-\t * ZONE_DEVICE page initialization until after we have released\n" "-\t * the hotplug lock.\n" "-\t */\n" - "-\tif (zone = ZONE_DEVICE) {\n" + "-\tif (zone == ZONE_DEVICE) {\n" "-\t\tif (!altmap)\n" "-\t\t\treturn;\n" "+\t\t/*\n" @@ -181,11 +181,11 @@ "+\t\t * mapping. We will defer the ZONE_DEVICE page initialization\n" "+\t\t * until after we have released the hotplug lock.\n" "+\t\t */\n" - "+\t\tif (zone = ZONE_DEVICE) {\n" + "+\t\tif (zone == ZONE_DEVICE) {\n" "+\t\t\tif (!altmap)\n" "+\t\t\t\treturn;\n" "+\n" - "+\t\t\tif (start_pfn = altmap->base_pfn)\n" + "+\t\t\tif (start_pfn == altmap->base_pfn)\n" "+\t\t\t\tstart_pfn += altmap->reserve;\n" "+\t\t\tend_pfn = altmap->base_pfn +\n" "+\t\t\t\t vmem_altmap_offset(altmap);\n" @@ -199,7 +199,7 @@ "+\t\t__memmap_init_hotplug(end_pfn - start_pfn, nid, zone,\n" "+\t\t\t\t start_pfn, NULL);\n" " \n" - "-\t\tif (start_pfn = altmap->base_pfn)\n" + "-\t\tif (start_pfn == altmap->base_pfn)\n" "-\t\t\tstart_pfn += altmap->reserve;\n" "-\t\tend_pfn = altmap->base_pfn + vmem_altmap_offset(altmap);\n" "+\t\treturn;\n" @@ -213,7 +213,7 @@ " \t\t * There can be holes in boot-time mem_map[]s handed to this\n" " \t\t * function. They do not exist on hotplugged memory.\n" " \t\t */\n" - "-\t\tif (context = MEMMAP_EARLY) {\n" + "-\t\tif (context == MEMMAP_EARLY) {\n" "-\t\t\tif (!early_pfn_valid(pfn)) {\n" "-\t\t\t\tpfn = next_valid_pfn(pfn) - 1;\n" "-\t\t\t\tcontinue;\n" @@ -237,7 +237,7 @@ " \n" " \t\tpage = pfn_to_page(pfn);\n" " \t\t__init_single_page(page, pfn, zone, nid);\n" - "-\t\tif (context = MEMMAP_HOTPLUG)\n" + "-\t\tif (context == MEMMAP_HOTPLUG)\n" "-\t\t\t__SetPageReserved(page);\n" " \n" " \t\t/*\n" @@ -315,4 +315,4 @@ " \tpr_info(\"%s initialised, %lu pages in %ums\\n\", dev_name(pgmap->dev),\n" " \t\tsize, jiffies_to_msecs(jiffies - start));" -c370cfdab0ac08029347d5d04625d8ce3021ad2e168db4a207e4152d74b6c4dd +c56c4bd67a6ad85b31673a47e3b45d91d5f312de3db6502eaceeedffe77ef9e7
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.