summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/iommu.h
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-11-14 12:46:37 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-15 09:03:10 +0100
commit94a15564ac63af6bb2ff8d4d04f86d5e7ee0278a (patch)
treec0e01d768d447789789b024a27911d8ab1abec46 /arch/x86/include/asm/iommu.h
parentx86: Set dma_ops to nommu_dma_ops by default (diff)
downloadlinux-94a15564ac63af6bb2ff8d4d04f86d5e7ee0278a.tar.xz
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/include/asm/iommu.h')
-rw-r--r--arch/x86/include/asm/iommu.h1
1 files changed, 0 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 @@
#ifndef _ASM_X86_IOMMU_H
#define _ASM_X86_IOMMU_H
-static inline void iommu_shutdown_noop(void) {}
extern struct dma_map_ops nommu_dma_ops;
extern int force_iommu, no_iommu;
extern int iommu_detected;