---

yaml --- r: 70965 b: refs/heads/master c: f6855f7 h: refs/heads/master i: 70963: 9928489 v: v3
git-mirror · Oct 17, 2007 · d5bc6ca · d5bc6ca
1 parent 59e05e8
commit d5bc6ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f8ae1a7d4e7e2628cd875d0811ca5cbff012bc2
+refs/heads/master: f6855f7fb2e22c5675d292dd445ee3c1fc09ac18
diff --git a/trunk/arch/x86/kernel/pci-dma_64.c b/trunk/arch/x86/kernel/pci-dma_64.c
@@ -51,11 +51,9 @@ dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
 {
 	struct page *page;
 	int node;
-#ifdef CONFIG_PCI
-	if (dev->bus == &pci_bus_type)
-		node = pcibus_to_node(to_pci_dev(dev)->bus);
-	else
-#endif
+
+	node = dev_to_node(dev);
+	if (node == -1)
 		node = numa_node_id();
 
 	if (node < first_node(node_online_map))