[PATCH] Unify pxm_to_node() and node_to_pxm()

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

diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index d35c7e06f3401ee7813b44fa6583e70cd7458e61..8abf2a43c944dc937a845cc5870e4e98e41900ed 100644 (file)
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -39,8 +39,9 @@ extern void config_acpi_tables(void);
 extern void ia32_syscall(void);
 extern void iommu_hole_init(void);
 
-extern void time_init_gtod(void);
 extern int pmtimer_mark_offset(void);
+extern void pmtimer_resume(void);
+extern void pmtimer_wait(unsigned);
 extern unsigned int do_gettimeoffset_pm(void);
 #ifdef CONFIG_X86_PM_TIMER
 extern u32 pmtmr_ioport;
@@ -49,8 +50,8 @@ extern u32 pmtmr_ioport;
 #endif
 extern unsigned long long monotonic_base;
 extern int sysctl_vsyscall;
-
-extern void do_softirq_thunk(void);
+extern int nohpet;
+extern unsigned long vxtime_hz;
 
 extern int numa_setup(char *opt);
 
@@ -69,6 +70,9 @@ extern void free_bootmem_generic(unsigned long phys, unsigned len);
 
 extern void load_gs_index(unsigned gs);
 
+extern void stop_timer_interrupt(void);
+extern void main_timer_handler(struct pt_regs *regs);
+
 extern unsigned long end_pfn_map; 
 
 extern void show_trace(unsigned long * rsp);
@@ -123,9 +127,10 @@ 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 *);
+extern int setup_additional_cpus(char *);
 
 extern void smp_local_timer_interrupt(struct pt_regs * regs);