diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-11-14 06:46:37 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-15 03:03:10 -0500 |
commit | 94a15564ac63af6bb2ff8d4d04f86d5e7ee0278a (patch) | |
tree | c0e01d768d447789789b024a27911d8ab1abec46 /arch/x86 | |
parent | a3b28ee1090072092e2be043c24df94230e725b2 (diff) |
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')
-rw-r--r-- | arch/x86/include/asm/iommu.h | 1 | ||||
-rw-r--r-- | arch/x86/kernel/x86_init.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h index df42a712361f..345c99cef152 100644 --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _ASM_X86_IOMMU_H | 1 | #ifndef _ASM_X86_IOMMU_H |
2 | #define _ASM_X86_IOMMU_H | 2 | #define _ASM_X86_IOMMU_H |
3 | 3 | ||
4 | static inline void iommu_shutdown_noop(void) {} | ||
5 | extern struct dma_map_ops nommu_dma_ops; | 4 | extern struct dma_map_ops nommu_dma_ops; |
6 | extern int force_iommu, no_iommu; | 5 | extern int force_iommu, no_iommu; |
7 | extern int iommu_detected; | 6 | extern int iommu_detected; |
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) { } | |||
20 | void __init x86_init_uint_noop(unsigned int unused) { } | 20 | void __init x86_init_uint_noop(unsigned int unused) { } |
21 | void __init x86_init_pgd_noop(pgd_t *unused) { } | 21 | void __init x86_init_pgd_noop(pgd_t *unused) { } |
22 | int __init iommu_init_noop(void) { return 0; } | 22 | int __init iommu_init_noop(void) { return 0; } |
23 | void __init iommu_shutdown_noop(void) { } | ||
23 | 24 | ||
24 | /* | 25 | /* |
25 | * The platform setup functions are preset with the default functions | 26 | * The platform setup functions are preset with the default functions |