aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/proto.h
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2007-07-21 11:11:31 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 21:37:14 -0400
commitf2cf8e085c0d3fd5c755d7c0de7334a50ebb728e (patch)
tree85f9c2d037d5e72c3e3caf646edb0c9855fb61a1 /include/asm-x86_64/proto.h
parent1c05f093c0721894bb60fd26d174815bb7ef2b7f (diff)
x86_64: move iommu declaration from proto to iommu.h
[akpm@linux-foundation.org: build fix] Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Muli Ben-Yehuda <muli@il.ibm.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Cc: Dave Jones <davej@codemonkey.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86_64/proto.h')
-rw-r--r--include/asm-x86_64/proto.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index b70aa0ccbe2d..d6e3225549c0 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -85,31 +85,6 @@ extern int exception_trace;
85extern unsigned cpu_khz; 85extern unsigned cpu_khz;
86extern unsigned tsc_khz; 86extern unsigned tsc_khz;
87 87
88extern void pci_iommu_shutdown(void);
89extern void no_iommu_init(void);
90extern int force_iommu, no_iommu;
91extern int iommu_detected;
92#ifdef CONFIG_IOMMU
93extern void gart_iommu_init(void);
94extern void gart_iommu_shutdown(void);
95extern void __init gart_parse_options(char *);
96extern void iommu_hole_init(void);
97extern int fallback_aper_order;
98extern int fallback_aper_force;
99extern int iommu_aperture;
100extern int iommu_aperture_allowed;
101extern int iommu_aperture_disabled;
102extern int fix_aperture;
103#else
104#define iommu_aperture 0
105#define iommu_aperture_allowed 0
106
107static inline void gart_iommu_shutdown(void)
108{
109}
110
111#endif
112
113extern int reboot_force; 88extern int reboot_force;
114extern int notsc_setup(char *); 89extern int notsc_setup(char *);
115 90