OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
946f2ee
)
[PATCH] x86_64: Fix compilation with CONFIG_PCI=n / allnoconfig
author
Andi Kleen
<ak@suse.de>
Fri, 7 Apr 2006 17:49:33 +0000
(19:49 +0200)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sun, 9 Apr 2006 18:53:51 +0000
(11:53 -0700)
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/x86_64/kernel/pci-dma.c
patch
|
blob
|
history
diff --git
a/arch/x86_64/kernel/pci-dma.c
b/arch/x86_64/kernel/pci-dma.c
index
03c9eee
..
af035ed
100644
(file)
--- a/
arch/x86_64/kernel/pci-dma.c
+++ b/
arch/x86_64/kernel/pci-dma.c
@@
-48,9
+48,11
@@
dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
{
struct page *page;
int node;
+#ifdef CONFIG_PCI
if (dev->bus == &pci_bus_type)
node = pcibus_to_node(to_pci_dev(dev)->bus);
else
+#endif
node = numa_node_id();
page = alloc_pages_node(node, gfp, order);
return page ? page_address(page) : NULL;