From: Allen Pais <allen.pais@oracle.com>
Date: Wed, 11 Jan 2017 09:11:16 +0000 (+0530)
Subject: sparc64:This fixes the numa_node attributes displayed in sysfs.
X-Git-Tag: v4.1.12-92~1^2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca4e0d4efa9845bfff3338e3269ff112be186a2e;p=users%2Fjedix%2Flinux-maple.git

sparc64:This fixes the numa_node attributes displayed in sysfs.

Orabug: 22748961

Signed-off-by: Chris Hyser <chris.hyser@oracle.com>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
---

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 553ea40b2913a..d21f046fa23b8 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -685,6 +685,13 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
 		return NULL;
 	}
 
+	/* adding the device later will overwrite this value with the parent and
+	 * then trash the entire subtree.
+	 */
+	set_dev_node(&bus->dev, pbm->numa_node);
+	if (bus->dev.parent)
+		set_dev_node(bus->dev.parent, pbm->numa_node);
+
 	pci_of_scan_bus(pbm, node, bus);
 	pci_bus_register_of_sysfs(bus);