diff options
| author | Andi Kleen <ak@suse.de> | 2005-09-12 18:49:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 19:49:57 +0200 |
| commit | 117090b5e815d0075bff85c2be954d68a11ac4ed (patch) | |
| tree | d1eeba143c17dbf5ae6d4baf45efcaa3229e80b1 | |
| parent | [PATCH] x86-64: Don't trust boot_cpu_id in the mptable. (diff) | |
| download | linux-117090b5e815d0075bff85c2be954d68a11ac4ed.tar.xz linux-117090b5e815d0075bff85c2be954d68a11ac4ed.zip | |
[PATCH] x86-64: Micro optimization to dma_alloc_coherent node lookup
Use pcibus_to_node directly
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/x86_64/kernel/pci-gart.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index 57f35c68aa34..cf0a0315d586 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/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; |