From bf71768a9e038998a35bfce2219f963d0a9b1780 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 12 Sep 2005 18:49:24 +0200
Subject: [PATCH] --- yaml --- r: 8591 b: refs/heads/master c:
 117090b5e815d0075bff85c2be954d68a11ac4ed h: refs/heads/master i:   8589:
 1e3167cf73db5e1e63b4ef69c3b3ab4b82d95f2c   8587:
 165336b72fe4bd3c768abcd4543d5cbb66ff29b4   8583:
 aa913f82f0d994e807c7414612fbbb7496d976fb   8575:
 659a06d967b53853d4d27273928c2dd7d9082214 v: v3

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

diff --git a/[refs] b/[refs]
index f9935d9ace7a..85a067dbddb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3fbbf9fe8d5cd5f94256781cc69a4ac289a767
+refs/heads/master: 117090b5e815d0075bff85c2be954d68a11ac4ed
diff --git a/trunk/arch/x86_64/kernel/pci-gart.c b/trunk/arch/x86_64/kernel/pci-gart.c
index 57f35c68aa34..cf0a0315d586 100644
--- a/trunk/arch/x86_64/kernel/pci-gart.c
+++ b/trunk/arch/x86_64/kernel/pci-gart.c
@@ -191,11 +191,9 @@ static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order)
 {
 	struct page *page;
 	int node;
-	if (dev->bus == &pci_bus_type) {
-		cpumask_t mask;
-		mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
-		node = cpu_to_node(first_cpu(mask));
-	} else
+	if (dev->bus == &pci_bus_type)
+		node = pcibus_to_node(to_pci_dev(dev)->bus);
+	else
 		node = numa_node_id();
 	page = alloc_pages_node(node, gfp, order);
 	return page ? page_address(page) : NULL;