git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemo...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
pci-dma_64.c
diff --git
a/arch/x86/kernel/pci-dma_64.c
b/arch/x86/kernel/pci-dma_64.c
index a82473d192a31b830eea331c07fb043dd9849343..375cb2bc45be9a1f6bbf42c4666a739002d88c4e 100644
(file)
--- 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;