summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-02-19 02:21:45 -0800
committerIngo Molnar <mingo@elte.hu>2008-03-21 17:06:14 +0100
commit6721fc0a0d87019b08384ac798ca7d51bc5fda4e (patch)
treebf1573c24920f47d6cb83c02519953409248eb83 /arch
parentae51801ba5ca27c2c571eb508daa99b392e79bd4 (diff)
downloadop-kernel-dev-6721fc0a0d87019b08384ac798ca7d51bc5fda4e.zip
op-kernel-dev-6721fc0a0d87019b08384ac798ca7d51bc5fda4e.tar.gz
x86: fix dma_alloc_pages
memory-less node support: this patch uses updated dev_to_node, because dev_to_node already makes sure it returns an online node. Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-dma_64.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index a82473d..375cb2b 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -53,11 +53,6 @@ dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
int node;
node = dev_to_node(dev);
- if (node == -1)
- node = numa_node_id();
-
- if (node < first_node(node_online_map))
- node = first_node(node_online_map);
page = alloc_pages_node(node, gfp, order);
return page ? page_address(page) : NULL;
OpenPOWER on IntegriCloud