aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-04-07 19:49:33 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-09 11:53:51 -0700
commitfa47dd0ba303599f8adf8d8336ed2fb74efc47c5 (patch)
tree5aad31f503964dafb047f15bf327e99e5ddbd5c7 /arch
parent946f2ee5c7312e8acac4f3ab6629e7e2d36a3646 (diff)
downloadkernel_samsung_smdk4412-fa47dd0ba303599f8adf8d8336ed2fb74efc47c5.zip
kernel_samsung_smdk4412-fa47dd0ba303599f8adf8d8336ed2fb74efc47c5.tar.gz
kernel_samsung_smdk4412-fa47dd0ba303599f8adf8d8336ed2fb74efc47c5.tar.bz2
[PATCH] x86_64: Fix compilation with CONFIG_PCI=n / allnoconfig
Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/pci-dma.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index 03c9eee..af035ed 100644
--- 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;