projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[linux-2.6-block.git]
/
drivers
/
pci
/
pci-driver.c
diff --git
a/drivers/pci/pci-driver.c
b/drivers/pci/pci-driver.c
index 8eb8a3091dc74bb027284dbaa9d4f61219eaf692..a13f53486114fe27e665bfc7451933d823465ca1 100644
(file)
--- a/
drivers/pci/pci-driver.c
+++ b/
drivers/pci/pci-driver.c
@@
-181,7
+181,7
@@
static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
any need to change it. */
struct mempolicy *oldpol;
cpumask_t oldmask = current->cpus_allowed;
- int node =
pcibus_to_node(dev->bus
);
+ int node =
dev_to_node(&dev->dev
);
if (node >= 0) {
node_to_cpumask_ptr(nodecpumask, node);