diff for duplicates of <20190925214526.GA4643@worktop.programming.kicks-ass.net> diff --git a/a/content_digest b/N1/content_digest index 1045725..c0ea6c1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -47,7 +47,20 @@ dave.hansen@linux.intel.com luto@kernel.org len.brown@intel.com - " axboe@kernel.dk\0" + axboe@kernel.dk + dledford@redhat.com + jeffrey.t.kirsher@intel.com + linux-alpha@vger.kernel.org + naveen.n.rao@linux.vnet.ibm.com + mwb@linux.vnet.ibm.com + linuxppc-dev@lists.ozlabs.org + linux-s390@vger.kernel.org + linux-sh@vger.kernel.org + sparclinux@vger.kernel.org + tbogendoerfer@suse.de + linux-mips@vger.kernel.org + rafael@kernel.org + " gregkh@linuxfoundation.org\0" "\00:1\0" "b\0" "On Wed, Sep 25, 2019 at 06:31:54PM +0200, Peter Zijlstra wrote:\n" @@ -563,4 +576,4 @@ " \n" " \treturn 0;" -1be2b0bef67bce90dd6f4416f0c5a9dbba7b68d8fd58366ca9a2a10e037a53ec +cf2bde29e900aabaa52b8689e56cfa99d9196969abc1f8ed2da3ecd03b42ba56
diff --git a/a/1.txt b/N2/1.txt index 96df954..d6bbec2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -273,21 +273,21 @@ index 636058bbf48a..049f3c7dbdcb 100644 dev->kobj.parent = kobj; - /* use parent numa_node */ -- if (parent && (dev_to_node(dev) == NUMA_NO_NODE)) +- if (parent && (dev_to_node(dev) = NUMA_NO_NODE)) - set_dev_node(dev, dev_to_node(parent)); +#ifdef CONFIG_NUMA + /* use parent node */ -+ if (dev->numa_node == NUMA_NO_NODE && parent) ++ if (dev->numa_node = NUMA_NO_NODE && parent) + set_dev_node(dev, parent->numa_node); + -+ if (dev->numa_node == NUMA_NO_NODE && dev->class && dev->class->no_devm) ++ if (dev->numa_node = NUMA_NO_NODE && dev->class && dev->class->no_devm) + set_dev_node(dev, NUMA_INVALID_NODE); + -+ if (dev->numa_node == NUMA_NO_NODE && dev->bus && dev->bus->no_devm) ++ if (dev->numa_node = NUMA_NO_NODE && dev->bus && dev->bus->no_devm) + set_dev_node(dev, NUMA_INVALID_NODE); + + /* verify 'real' devices have a node assigned on NUMA capable hardware */ -+ if (nr_node_ids > 1 && dev->numa_node == NUMA_NO_NODE) { ++ if (nr_node_ids > 1 && dev->numa_node = NUMA_NO_NODE) { + pr_warn(FW_BUG "device: '%s': no node assigned on NUMA capable HW\n", + dev_name(dev)); + set_dev_node(dev, 0); // assign 'random' valid node @@ -416,7 +416,7 @@ index 6717adee33f0..6414788e642e 100644 { - return dev->numa_node; + int node = dev->numa_node; -+ if (WARN_ON(node == NUMA_INVALID_NODE)) ++ if (WARN_ON(node = NUMA_INVALID_NODE)) + node = 0; // 'random' valid node + return node; } diff --git a/a/content_digest b/N2/content_digest index 1045725..6f02fe7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -10,7 +10,7 @@ "ref\020190925163154.GF4553@hirez.programming.kicks-ass.net\0" "From\0Peter Zijlstra <peterz@infradead.org>\0" "Subject\0Re: [PATCH v6] numa: make node_to_cpumask_map() NUMA_NO_NODE aware\0" - "Date\0Wed, 25 Sep 2019 23:45:26 +0200\0" + "Date\0Wed, 25 Sep 2019 21:45:26 +0000\0" "To\0Michal Hocko <mhocko@kernel.org>\0" "Cc\0Yunsheng Lin <linyunsheng@huawei.com>" catalin.marinas@arm.com @@ -47,7 +47,20 @@ dave.hansen@linux.intel.com luto@kernel.org len.brown@intel.com - " axboe@kernel.dk\0" + axboe@kernel.dk + dledford@redhat.com + jeffrey.t.kirsher@intel.com + linux-alpha@vger.kernel.org + naveen.n.rao@linux.vnet.ibm.com + mwb@linux.vnet.ibm.com + linuxppc-dev@lists.ozlabs.org + linux-s390@vger.kernel.org + linux-sh@vger.kernel.org + sparclinux@vger.kernel.org + tbogendoerfer@suse.de + linux-mips@vger.kernel.org + rafael@kernel.org + " gregkh@linuxfoundation.org\0" "\00:1\0" "b\0" "On Wed, Sep 25, 2019 at 06:31:54PM +0200, Peter Zijlstra wrote:\n" @@ -325,21 +338,21 @@ " \t\tdev->kobj.parent = kobj;\n" " \n" "-\t/* use parent numa_node */\n" - "-\tif (parent && (dev_to_node(dev) == NUMA_NO_NODE))\n" + "-\tif (parent && (dev_to_node(dev) = NUMA_NO_NODE))\n" "-\t\tset_dev_node(dev, dev_to_node(parent));\n" "+#ifdef CONFIG_NUMA\n" "+\t/* use parent node */\n" - "+\tif (dev->numa_node == NUMA_NO_NODE && parent)\n" + "+\tif (dev->numa_node = NUMA_NO_NODE && parent)\n" "+\t\tset_dev_node(dev, parent->numa_node);\n" "+\n" - "+\tif (dev->numa_node == NUMA_NO_NODE && dev->class && dev->class->no_devm)\n" + "+\tif (dev->numa_node = NUMA_NO_NODE && dev->class && dev->class->no_devm)\n" "+\t\tset_dev_node(dev, NUMA_INVALID_NODE);\n" "+\n" - "+\tif (dev->numa_node == NUMA_NO_NODE && dev->bus && dev->bus->no_devm)\n" + "+\tif (dev->numa_node = NUMA_NO_NODE && dev->bus && dev->bus->no_devm)\n" "+\t\tset_dev_node(dev, NUMA_INVALID_NODE);\n" "+\n" "+\t/* verify 'real' devices have a node assigned on NUMA capable hardware */\n" - "+\tif (nr_node_ids > 1 && dev->numa_node == NUMA_NO_NODE) {\n" + "+\tif (nr_node_ids > 1 && dev->numa_node = NUMA_NO_NODE) {\n" "+\t\tpr_warn(FW_BUG \"device: '%s': no node assigned on NUMA capable HW\\n\",\n" "+\t\t\t\tdev_name(dev));\n" "+\t\tset_dev_node(dev, 0); // assign 'random' valid node\n" @@ -468,7 +481,7 @@ " {\n" "-\treturn dev->numa_node;\n" "+\tint node = dev->numa_node;\n" - "+\tif (WARN_ON(node == NUMA_INVALID_NODE))\n" + "+\tif (WARN_ON(node = NUMA_INVALID_NODE))\n" "+\t\tnode = 0; // 'random' valid node\n" "+\treturn node;\n" " }\n" @@ -563,4 +576,4 @@ " \n" " \treturn 0;" -1be2b0bef67bce90dd6f4416f0c5a9dbba7b68d8fd58366ca9a2a10e037a53ec +4ae0a9d79ee7cef342ef2c1cd3ed3c0748b30204f1e6df0741d5e4d7c405a65b
diff --git a/a/content_digest b/N3/content_digest index 1045725..b19edc2 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -12,42 +12,53 @@ "Subject\0Re: [PATCH v6] numa: make node_to_cpumask_map() NUMA_NO_NODE aware\0" "Date\0Wed, 25 Sep 2019 23:45:26 +0200\0" "To\0Michal Hocko <mhocko@kernel.org>\0" - "Cc\0Yunsheng Lin <linyunsheng@huawei.com>" + "Cc\0dalias@libc.org" + linux-sh@vger.kernel.org catalin.marinas@arm.com - will@kernel.org - mingo@redhat.com - bp@alien8.de - rth@twiddle.net - ink@jurassic.park.msu.ru - mattst88@gmail.com - benh@kernel.crashing.org - paulus@samba.org - mpe@ellerman.id.au + dave.hansen@linux.intel.com heiko.carstens@de.ibm.com - gor@linux.ibm.com - borntraeger@de.ibm.com - ysato@users.sourceforge.jp - dalias@libc.org - davem@davemloft.net - ralf@linux-mips.org - paul.burton@mips.com - jhogan@kernel.org jiaxun.yang@flygoat.com + linux-mips@vger.kernel.org + mwb@linux.vnet.ibm.com + paulus@samba.org + hpa@zytor.com + sparclinux@vger.kernel.org chenhc@lemote.com - akpm@linux-foundation.org + will@kernel.org + cai@lca.pw + linux-s390@vger.kernel.org + ysato@users.sourceforge.jp + x86@kernel.org + Yunsheng Lin <linyunsheng@huawei.com> rppt@linux.ibm.com + borntraeger@de.ibm.com + dledford@redhat.com + mingo@redhat.com + jeffrey.t.kirsher@intel.com + jhogan@kernel.org + mattst88@gmail.com + len.brown@intel.com + gor@linux.ibm.com anshuman.khandual@arm.com + gregkh@linuxfoundation.org + bp@alien8.de + luto@kernel.org tglx@linutronix.de - cai@lca.pw - robin.murphy@arm.com + naveen.n.rao@linux.vnet.ibm.com linux-arm-kernel@lists.infradead.org + rth@twiddle.net + axboe@kernel.dk + linuxppc-dev@lists.ozlabs.org linux-kernel@vger.kernel.org - hpa@zytor.com - x86@kernel.org - dave.hansen@linux.intel.com - luto@kernel.org - len.brown@intel.com - " axboe@kernel.dk\0" + ralf@linux-mips.org + tbogendoerfer@suse.de + paul.burton@mips.com + linux-alpha@vger.kernel.org + rafael@kernel.org + ink@jurassic.park.msu.ru + akpm@linux-foundation.org + robin.murphy@arm.com + " davem@davemloft.net\0" "\00:1\0" "b\0" "On Wed, Sep 25, 2019 at 06:31:54PM +0200, Peter Zijlstra wrote:\n" @@ -563,4 +574,4 @@ " \n" " \treturn 0;" -1be2b0bef67bce90dd6f4416f0c5a9dbba7b68d8fd58366ca9a2a10e037a53ec +ea1e107bef803f88b09462507ebaa91d59387ad2fd133fb9d1bb329834ec6a89
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.