From d5bc6caa4e5709af7a1ad6670a175c5128100a4f Mon Sep 17 00:00:00 2001
From: Yinghai Lu <Yinghai.Lu@Sun.COM>
Date: Wed, 17 Oct 2007 18:04:35 +0200
Subject: [PATCH] --- yaml --- r: 70965 b: refs/heads/master c:
 f6855f7fb2e22c5675d292dd445ee3c1fc09ac18 h: refs/heads/master i:   70963:
 992848996879e46735c394d58627655f29aeb8d5 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/pci-dma_64.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 94f0c5d5c7cc..75f04af1f2aa 100644
--- 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
index 9576a2eb375e..b2b42bdb0a15 100644
--- 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))