diff options
author | Christoph Hellwig <hch@lst.de> | 2006-12-06 23:32:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:22 -0500 |
commit | 873481367edb18a7d0d7e5a285e6728c16bb44a9 (patch) | |
tree | dd97507a3c061addac715bb07bfd5c4991e08f80 /drivers | |
parent | 8b98c1699eba23cfd2e8b366625c50ff5fd1415b (diff) |
[PATCH] add numa node information to struct device
For node-aware skb allocations we need information about the node in struct
net_device or struct device. Davem suggested to put it into struct device
which this patch does.
In particular:
- struct device gets a new int numa_node member if CONFIG_NUMA is set
- there are two new helpers, dev_to_node and set_dev_node to
transparently deal with the non-numa case
- for pci devices the node-info is set to the value we get from
pcibus_to_node.
Note that for some architectures pcibus_to_node doesn't work yet at the time
we call it currently. This is harmless and will just mean skb allocations
aren't node-local on this architectures until the implementation of
pcibus_to_node on these architectures have been updated (There are patches for
x86 and x86_64 floating around)
[akpm@osdl.org: cleanup]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/core.c | 1 | ||||
-rw-r--r-- | drivers/pci/probe.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index e4b530ef757d..67b79a7592a9 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -386,6 +386,7 @@ void device_initialize(struct device *dev) | |||
386 | INIT_LIST_HEAD(&dev->node); | 386 | INIT_LIST_HEAD(&dev->node); |
387 | init_MUTEX(&dev->sem); | 387 | init_MUTEX(&dev->sem); |
388 | device_init_wakeup(dev, 0); | 388 | device_init_wakeup(dev, 0); |
389 | set_dev_node(dev, -1); | ||
389 | } | 390 | } |
390 | 391 | ||
391 | #ifdef CONFIG_SYSFS_DEPRECATED | 392 | #ifdef CONFIG_SYSFS_DEPRECATED |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 0eeac60042b3..6a3c1e728900 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -873,6 +873,7 @@ void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus) | |||
873 | dev->dev.release = pci_release_dev; | 873 | dev->dev.release = pci_release_dev; |
874 | pci_dev_get(dev); | 874 | pci_dev_get(dev); |
875 | 875 | ||
876 | set_dev_node(&dev->dev, pcibus_to_node(bus)); | ||
876 | dev->dev.dma_mask = &dev->dma_mask; | 877 | dev->dev.dma_mask = &dev->dma_mask; |
877 | dev->dev.coherent_dma_mask = 0xffffffffull; | 878 | dev->dev.coherent_dma_mask = 0xffffffffull; |
878 | 879 | ||