aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86_64/proto.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86_64/proto.h')
-rw-r--r--include/asm-x86_64/proto.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 9d3335b4e9b..038fe1f47e6 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -37,7 +37,6 @@ extern void ia32_sysenter_target(void);
extern void config_acpi_tables(void);
extern void ia32_syscall(void);
-extern void iommu_hole_init(void);
extern int pmtimer_mark_offset(void);
extern void pmtimer_resume(void);
@@ -101,13 +100,9 @@ extern int unsynchronized_tsc(void);
extern void select_idle_routine(const struct cpuinfo_x86 *c);
-extern void gart_parse_options(char *);
-extern void __init no_iommu_init(void);
-
extern unsigned long table_start, table_end;
extern int exception_trace;
-extern int force_iommu, no_iommu;
extern int using_apic_timer;
extern int disable_apic;
extern unsigned cpu_khz;
@@ -116,8 +111,13 @@ extern int skip_ioapic_setup;
extern int acpi_ht;
extern int acpi_disabled;
+extern void no_iommu_init(void);
+extern int force_iommu, no_iommu;
extern int iommu_detected;
#ifdef CONFIG_IOMMU
+extern void gart_iommu_init(void);
+extern void gart_parse_options(char *);
+extern void iommu_hole_init(void);
extern int fallback_aper_order;
extern int fallback_aper_force;
extern int iommu_aperture;