x86: move load_cr3 to a common place.

[linux-2.6] / include / asm-x86 / processor_32.h

diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 0d83da198127aab0b8976a07cd7824c3cc415d5d..b586902acd85c1fb56bdb8a37e77315f7880e1bf 100644 (file)
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -19,20 +19,7 @@
 #include <asm/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/init.h>
-#include <asm/processor-flags.h>
-
-/* flag for disabling the tsc */
-extern int tsc_disable;
-
-struct desc_struct {
-       unsigned long a,b;
-};
-
-static inline int desc_empty(const void *ptr)
-{
-       const u32 *desc = ptr;
-       return !(desc[0] | desc[1]);
-}
+#include <asm/desc_defs.h>
 
 /*
  * Default implementation of macro that returns current
@@ -133,7 +120,6 @@ extern void detect_ht(struct cpuinfo_x86 *c);
 static inline void detect_ht(struct cpuinfo_x86 *c) {}
 #endif
 
-#define load_cr3(pgdir) write_cr3(__pa(pgdir))
 
 /*
  * Save the cr4 feature set we're using (ie
@@ -209,10 +195,6 @@ extern int bootloader_type;
 
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 
-extern void hard_disable_TSC(void);
-extern void disable_TSC(void);
-extern void hard_enable_TSC(void);
-
 /*
  * Size of io_bitmap.
  */
@@ -360,6 +342,9 @@ struct thread_struct {
        unsigned long   io_bitmap_max;
 /* MSR_IA32_DEBUGCTLMSR value to switch in if TIF_DEBUGCTLMSR is set.  */
        unsigned long   debugctlmsr;
+/* Debug Store - if not 0 points to a DS Save Area configuration;
+ *               goes into MSR_IA32_DS_AREA */
+       unsigned long   ds_area_msr;
 };
 
 #define INIT_THREAD  {                                                 \
@@ -707,7 +692,7 @@ extern void enable_sep_cpu(void);
 extern int sysenter_setup(void);
 
 /* Defined in head.S */
-extern struct Xgt_desc_struct early_gdt_descr;
+extern struct desc_ptr early_gdt_descr;
 
 extern void cpu_set_gdt(int);
 extern void switch_to_new_gdt(void);