From 9f3041e506ba29a53e0644a23c95c5452497c6d6 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 6 Dec 2006 20:32:33 -0800
Subject: [PATCH] --- yaml --- r: 42668 b: refs/heads/master c:
 873481367edb18a7d0d7e5a285e6728c16bb44a9 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/base/core.c    |  1 +
 trunk/drivers/pci/probe.c    |  1 +
 trunk/include/linux/device.h | 22 ++++++++++++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e73f23b34663..4df9dc0da4ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b98c1699eba23cfd2e8b366625c50ff5fd1415b
+refs/heads/master: 873481367edb18a7d0d7e5a285e6728c16bb44a9
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index e4b530ef757d..67b79a7592a9 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -386,6 +386,7 @@ void device_initialize(struct device *dev)
 	INIT_LIST_HEAD(&dev->node);
 	init_MUTEX(&dev->sem);
 	device_init_wakeup(dev, 0);
+	set_dev_node(dev, -1);
 }
 
 #ifdef CONFIG_SYSFS_DEPRECATED
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
index 0eeac60042b3..6a3c1e728900 100644
--- a/trunk/drivers/pci/probe.c
+++ b/trunk/drivers/pci/probe.c
@@ -873,6 +873,7 @@ void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 	dev->dev.release = pci_release_dev;
 	pci_dev_get(dev);
 
+	set_dev_node(&dev->dev, pcibus_to_node(bus));
 	dev->dev.dma_mask = &dev->dma_mask;
 	dev->dev.coherent_dma_mask = 0xffffffffull;
 
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index 583a341e016c..49ab53ce92dc 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -371,6 +371,9 @@ struct device {
 					   core doesn't touch it */
 	struct dev_pm_info	power;
 
+#ifdef CONFIG_NUMA
+	int		numa_node;	/* NUMA node this device is close to */
+#endif
 	u64		*dma_mask;	/* dma mask (if dma'able device) */
 	u64		coherent_dma_mask;/* Like dma_mask, but for
 					     alloc_coherent mappings as
@@ -394,6 +397,25 @@ struct device {
 	void	(*release)(struct device * dev);
 };
 
+#ifdef CONFIG_NUMA
+static inline int dev_to_node(struct device *dev)
+{
+	return dev->numa_node;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+	dev->numa_node = node;
+}
+#else
+static inline int dev_to_node(struct device *dev)
+{
+	return -1;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+}
+#endif
+
 static inline void *
 dev_get_drvdata (struct device *dev)
 {