linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-x86_64 / proto.h

diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 038fe1f..3ba8fd4 100644 (file)
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -37,6 +37,7 @@ 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);
@@ -52,6 +53,8 @@ extern int sysctl_vsyscall;
 extern int nohpet;
 extern unsigned long vxtime_hz;
 
+extern void do_softirq_thunk(void);
+
 extern int numa_setup(char *opt);
 
 extern int setup_early_printk(char *); 
@@ -74,7 +77,7 @@ extern void main_timer_handler(struct pt_regs *regs);
 
 extern unsigned long end_pfn_map; 
 
-extern void show_trace(struct task_struct *, struct pt_regs *, unsigned long * rsp);
+extern void show_trace(unsigned long * rsp);
 extern void show_registers(struct pt_regs *regs);
 
 extern void exception_table_check(void);
@@ -100,9 +103,13 @@ 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;
@@ -111,13 +118,7 @@ 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);
+#ifdef CONFIG_GART_IOMMU
 extern int fallback_aper_order;
 extern int fallback_aper_force;
 extern int iommu_aperture;
@@ -128,6 +129,7 @@ extern int fix_aperture;
 #define iommu_aperture 0
 #define iommu_aperture_allowed 0
 #endif
+extern int force_iommu;
 
 extern int reboot_force;
 extern int notsc_setup(char *);