diff for duplicates of <20200629173629.000029eb@huawei.com> diff --git a/a/1.txt b/N1/1.txt index 607e1a6..ad2a2d4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -155,7 +155,7 @@ Jonathan > - node = acpi_map_pxm_to_node(pxm); > + node = acpi_map_pxm_to_node(pxm, true); > -> if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) { +> if (node = NUMA_NO_NODE || node >= MAX_NUMNODES) { > pr_err("SRAT: Too many proximity domains %d\n", pxm); > diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c > index a5636524af76..760a468864b7 100644 @@ -211,8 +211,7 @@ Jonathan > --- a/drivers/acpi/nfit/core.c > +++ b/drivers/acpi/nfit/core.c > @@ -2948,7 +2948,7 @@ static int acpi_nfit_register_region(struct -> acpi_nfit_desc *acpi_desc, ndr_desc->numa_node = -> acpi_map_pxm_to_online_node( spa->proximity_domain); +> acpi_nfit_desc *acpi_desc, ndr_desc->numa_node > acpi_map_pxm_to_online_node( spa->proximity_domain); > ndr_desc->target_node = acpi_map_pxm_to_node( > - spa->proximity_domain); > + spa->proximity_domain, false); @@ -225,13 +224,10 @@ Jonathan > +++ b/drivers/acpi/numa/hmat.c > @@ -666,7 +666,7 @@ static void hmat_register_target_device(struct > memory_target *target, -> pdev->dev.numa_node = -> acpi_map_pxm_to_online_node(target->memory_pxm); info = (struct +> pdev->dev.numa_node > acpi_map_pxm_to_online_node(target->memory_pxm); info = (struct > memregion_info) { -> - .target_node = -> acpi_map_pxm_to_node(target->memory_pxm), -> + .target_node = -> acpi_map_pxm_to_node(target->memory_pxm, false), }; +> - .target_node > acpi_map_pxm_to_node(target->memory_pxm), +> + .target_node > acpi_map_pxm_to_node(target->memory_pxm, false), }; > rc = platform_device_add_data(pdev, &info, sizeof(info)); > if (rc < 0) { > diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c @@ -250,7 +246,7 @@ Jonathan > @@ -62,7 +62,7 @@ int acpi_map_pxm_to_node(int pxm) > node = pxm_to_node_map[pxm]; > -> if (node == NUMA_NO_NODE) { +> if (node = NUMA_NO_NODE) { > - if (nodes_weight(nodes_found_map) >= MAX_NUMNODES) > + if (nodes_weight(nodes_found_map) >= MAX_NUMNODES || > !create) return NUMA_NO_NODE; @@ -262,7 +258,7 @@ Jonathan > > - node = acpi_map_pxm_to_node(pxm); > + node = acpi_map_pxm_to_node(pxm, true); -> if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) { +> if (node = NUMA_NO_NODE || node >= MAX_NUMNODES) { > pr_err("SRAT: Too many proximity domains.\n"); > goto out_err_bad_srat; > @@ -444,6 +444,6 @@ int acpi_get_node(acpi_handle handle) @@ -289,7 +285,7 @@ Jonathan > + */ > + node = acpi_map_pxm_to_node(its_affinity->proximity_domain, > false); -> if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) { +> if (node = NUMA_NO_NODE || node >= MAX_NUMNODES) { > pr_err("SRAT: Invalid NUMA node %d in ITS > affinity\n", node); diff --git a/include/acpi/acpi_numa.h > b/include/acpi/acpi_numa.h index fdebcfc6c8df..6935c7516262 100644 diff --git a/a/content_digest b/N1/content_digest index 573433c..f42ba50 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,22 @@ "ref\020200629161659.3006329-1-Jonathan.Cameron@huawei.com\0" "From\0Jonathan Cameron <Jonathan.Cameron@huawei.com>\0" "Subject\0Re: [RFC PATCH] ACPI: Only create numa nodes from entries in SRAT or SRAT emulation.\0" - "Date\0Mon, 29 Jun 2020 17:36:29 +0100\0" - "To\0<linux-mm@kvack.org>" - <linux-acpi@vger.kernel.org> - " <linux-arm-kernel@lists.infradead.org>\0" + "Date\0Mon, 29 Jun 2020 16:36:29 +0000\0" + "To\0linux-mm@kvack.org" + linux-acpi@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "Cc\0Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>" Bjorn Helgaas <bhelgaas@google.com> - <linux-pci@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <martin@geanix.com> + linux-pci@vger.kernel.org + linux-kernel@vger.kernel.org + martin@geanix.com Ingo Molnar <mingo@redhat.com> - <linux-ia64@vger.kernel.org> + linux-ia64@vger.kernel.org Tony Luck <tony.luck@intel.com> Fenghua Yu <fenghua.yu@intel.com> - <x86@kernel.org> + x86@kernel.org Thomas Gleixner <tglx@linutronix.de> - " <linuxarm@huawei.com>\0" + " linuxarm@huawei.com\0" "\00:1\0" "b\0" "On Tue, 30 Jun 2020 00:16:59 +0800\n" @@ -176,7 +176,7 @@ "> -\tnode = acpi_map_pxm_to_node(pxm);\n" "> +\tnode = acpi_map_pxm_to_node(pxm, true);\n" "> \n" - "> \tif (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {\n" + "> \tif (node = NUMA_NO_NODE || node >= MAX_NUMNODES) {\n" "> \t\tpr_err(\"SRAT: Too many proximity domains %d\\n\", pxm);\n" "> diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c\n" "> index a5636524af76..760a468864b7 100644\n" @@ -232,8 +232,7 @@ "> --- a/drivers/acpi/nfit/core.c\n" "> +++ b/drivers/acpi/nfit/core.c\n" "> @@ -2948,7 +2948,7 @@ static int acpi_nfit_register_region(struct\n" - "> acpi_nfit_desc *acpi_desc, ndr_desc->numa_node =\n" - "> acpi_map_pxm_to_online_node( spa->proximity_domain);\n" + "> acpi_nfit_desc *acpi_desc, ndr_desc->numa_node > acpi_map_pxm_to_online_node( spa->proximity_domain);\n" "> \t\tndr_desc->target_node = acpi_map_pxm_to_node(\n" "> -\t\t\t\tspa->proximity_domain);\n" "> +\t\t\t\tspa->proximity_domain, false);\n" @@ -246,13 +245,10 @@ "> +++ b/drivers/acpi/numa/hmat.c\n" "> @@ -666,7 +666,7 @@ static void hmat_register_target_device(struct\n" "> memory_target *target, \n" - "> \tpdev->dev.numa_node =\n" - "> acpi_map_pxm_to_online_node(target->memory_pxm); info = (struct\n" + "> \tpdev->dev.numa_node > acpi_map_pxm_to_online_node(target->memory_pxm); info = (struct\n" "> memregion_info) {\n" - "> -\t\t.target_node =\n" - "> acpi_map_pxm_to_node(target->memory_pxm),\n" - "> +\t\t.target_node =\n" - "> acpi_map_pxm_to_node(target->memory_pxm, false), };\n" + "> -\t\t.target_node > acpi_map_pxm_to_node(target->memory_pxm),\n" + "> +\t\t.target_node > acpi_map_pxm_to_node(target->memory_pxm, false), };\n" "> \trc = platform_device_add_data(pdev, &info, sizeof(info));\n" "> \tif (rc < 0) {\n" "> diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c\n" @@ -271,7 +267,7 @@ "> @@ -62,7 +62,7 @@ int acpi_map_pxm_to_node(int pxm)\n" "> \tnode = pxm_to_node_map[pxm];\n" "> \n" - "> \tif (node == NUMA_NO_NODE) {\n" + "> \tif (node = NUMA_NO_NODE) {\n" "> -\t\tif (nodes_weight(nodes_found_map) >= MAX_NUMNODES)\n" "> +\t\tif (nodes_weight(nodes_found_map) >= MAX_NUMNODES ||\n" "> !create) return NUMA_NO_NODE;\n" @@ -283,7 +279,7 @@ "> \n" "> -\tnode = acpi_map_pxm_to_node(pxm);\n" "> +\tnode = acpi_map_pxm_to_node(pxm, true);\n" - "> \tif (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {\n" + "> \tif (node = NUMA_NO_NODE || node >= MAX_NUMNODES) {\n" "> \t\tpr_err(\"SRAT: Too many proximity domains.\\n\");\n" "> \t\tgoto out_err_bad_srat;\n" "> @@ -444,6 +444,6 @@ int acpi_get_node(acpi_handle handle)\n" @@ -310,7 +306,7 @@ "> +\t */\n" "> +\tnode = acpi_map_pxm_to_node(its_affinity->proximity_domain,\n" "> false); \n" - "> \tif (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {\n" + "> \tif (node = NUMA_NO_NODE || node >= MAX_NUMNODES) {\n" "> \t\tpr_err(\"SRAT: Invalid NUMA node %d in ITS\n" "> affinity\\n\", node); diff --git a/include/acpi/acpi_numa.h\n" "> b/include/acpi/acpi_numa.h index fdebcfc6c8df..6935c7516262 100644\n" @@ -357,4 +353,4 @@ "> \treturn 0;\n" > } -41a1e2cb63ffa66f7ff695f7fe8ea19b248585ced9211ad72416eddac51da249 +53ff1dd47b7957faaa0459119e9d22a1f3d9ea74d4663c941649833fe72fe2ef
diff --git a/a/1.txt b/N2/1.txt index 607e1a6..6212fb3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -335,3 +335,9 @@ Jonathan > { > return 0; > } + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 573433c..6d32a4e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,18 +5,18 @@ "To\0<linux-mm@kvack.org>" <linux-acpi@vger.kernel.org> " <linux-arm-kernel@lists.infradead.org>\0" - "Cc\0Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>" - Bjorn Helgaas <bhelgaas@google.com> - <linux-pci@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <martin@geanix.com> - Ingo Molnar <mingo@redhat.com> - <linux-ia64@vger.kernel.org> + "Cc\0Fenghua Yu <fenghua.yu@intel.com>" + Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> + linux-ia64@vger.kernel.org Tony Luck <tony.luck@intel.com> - Fenghua Yu <fenghua.yu@intel.com> - <x86@kernel.org> - Thomas Gleixner <tglx@linutronix.de> - " <linuxarm@huawei.com>\0" + linux-pci@vger.kernel.org + x86@kernel.org + linux-kernel@vger.kernel.org + linuxarm@huawei.com + Ingo Molnar <mingo@redhat.com> + martin@geanix.com + Bjorn Helgaas <bhelgaas@google.com> + " Thomas Gleixner <tglx@linutronix.de>\0" "\00:1\0" "b\0" "On Tue, 30 Jun 2020 00:16:59 +0800\n" @@ -355,6 +355,12 @@ "> +static inline int acpi_map_pxm_to_node(int pxm, bool create)\n" "> {\n" "> \treturn 0;\n" - > } + "> }\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -41a1e2cb63ffa66f7ff695f7fe8ea19b248585ced9211ad72416eddac51da249 +81118707d418cab1cb44d8241dd636ce1ccd6ccdd3679b49204569b76b2cce0b
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.