summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/x86_init.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-11-14 20:46:37 +0900
committerIngo Molnar <mingo@elte.hu>2009-11-15 09:03:10 +0100
commit94a15564ac63af6bb2ff8d4d04f86d5e7ee0278a (patch)
treec0e01d768d447789789b024a27911d8ab1abec46 /arch/x86/kernel/x86_init.c
parenta3b28ee1090072092e2be043c24df94230e725b2 (diff)
downloadtalos-op-linux-94a15564ac63af6bb2ff8d4d04f86d5e7ee0278a.tar.gz
talos-op-linux-94a15564ac63af6bb2ff8d4d04f86d5e7ee0278a.zip
x86: Move iommu_shutdown_noop to x86_init.c
iommu_init_noop() is in arch/x86/kernel/x86_init.c but iommu_shutdown_noop() in arch/x86/include/asm/iommu.h. This moves iommu_shutdown_noop() to x86_init.c for consistency. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> LKML-Reference: <1258199198-16657-3-git-send-email-fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/x86_init.c')
-rw-r--r--arch/x86/kernel/x86_init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index c46984d122dc..80f3ae24b974 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -20,6 +20,7 @@ void __cpuinit x86_init_noop(void) { }
void __init x86_init_uint_noop(unsigned int unused) { }
void __init x86_init_pgd_noop(pgd_t *unused) { }
int __init iommu_init_noop(void) { return 0; }
+void __init iommu_shutdown_noop(void) { }
/*
* The platform setup functions are preset with the default functions
OpenPOWER on IntegriCloud