---

yaml --- r: 8591 b: refs/heads/master c: 117090b h: refs/heads/master i: 8589: 1e3167c 8587: 165336b 8583: aa913f8 8575: 659a06d v: v3
git-mirror · Sep 12, 2005 · bf71768 · bf71768
1 parent 2202640
commit bf71768
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: 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
@@ -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;