[tip:core/iommu] x86: Add iommu_init to x86_init_ops, fix build

From: tip-bot for Ingo Molnar
Date: Tue Nov 10 2009 - 08:43:26 EST


Commit-ID: b4941a9a606f0131559cc040b64e8437ac7b32c5
Gitweb: http://git.kernel.org/tip/b4941a9a606f0131559cc040b64e8437ac7b32c5
Author: Ingo Molnar <mingo@xxxxxxx>
AuthorDate: Tue, 10 Nov 2009 14:37:58 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 10 Nov 2009 14:37:58 +0100

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@xxxxxxxxxxxxx>
Cc: chrisw@xxxxxxxxxxxx
Cc: dwmw2@xxxxxxxxxxxxx
Cc: joerg.roedel@xxxxxxx
Cc: muli@xxxxxxxxxx
LKML-Reference: <1257849980-22640-2-git-send-email-fujita.tomonori@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/pci-dma.c | 1 +
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;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/