aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-10 14:37:58 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-10 14:37:58 +0100
commitb4941a9a606f0131559cc040b64e8437ac7b32c5 (patch)
tree8ae1ec6a7e124135bed99fb4fb8525afce1f3833 /arch/x86/kernel
parent72d03802b8b5c841ab1da82bff0652628cbadf60 (diff)
downloadkernel_samsung_aries-b4941a9a606f0131559cc040b64e8437ac7b32c5.zip
kernel_samsung_aries-b4941a9a606f0131559cc040b64e8437ac7b32c5.tar.gz
kernel_samsung_aries-b4941a9a606f0131559cc040b64e8437ac7b32c5.tar.bz2
x86: Add iommu_init to x86_init_ops, fix build
Most of the time x86_init.h is included in pci-dma.c - but not always, leading to this rare build failure: arch/x86/kernel/pci-dma.c:296: error: 'x86_init' undeclared (first use in this function) So include asm/x86_init.h explicitly. Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: chrisw@sous-sol.org Cc: dwmw2@infradead.org Cc: joerg.roedel@amd.com Cc: muli@il.ibm.com LKML-Reference: <1257849980-22640-2-git-send-email-fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/pci-dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 63eebee..f79870e 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -11,6 +11,7 @@
#include <asm/gart.h>
#include <asm/calgary.h>
#include <asm/amd_iommu.h>
+#include <asm/x86_init.h>
static int forbid_dac __read_mostly;