x86: unify thread struct.

The thread_struct is not fundamentally different between architectures, and
this patch puts it in the common header. What's really unique for each of
them is enclosed in ifdefs.

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

3 files changed, 44 insertions, 69 deletions

diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index b1ea52156362..0e82ad5a22a4 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -126,6 +126,50 @@ extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);
 extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
 extern unsigned short num_cache_leaves;
 
+struct thread_struct {
+/* cached TLS descriptors. */
+        struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
+        unsigned long   sp0;
+        unsigned long   sp;
+#ifdef CONFIG_X86_32
+        unsigned long   sysenter_cs;
+#else
+        unsigned long   usersp; /* Copy from PDA */
+        unsigned short  es, ds, fsindex, gsindex;
+#endif
+        unsigned long   ip;
+        unsigned long   fs;
+        unsigned long   gs;
+/* Hardware debugging registers */
+        unsigned long   debugreg0;
+        unsigned long   debugreg1;
+        unsigned long   debugreg2;
+        unsigned long   debugreg3;
+        unsigned long   debugreg6;
+        unsigned long   debugreg7;
+/* fault info */
+        unsigned long   cr2, trap_no, error_code;
+/* floating point info */
+        union i387_union        i387 __attribute__((aligned(16)));;
+#ifdef CONFIG_X86_32
+/* virtual 86 mode info */
+        struct vm86_struct __user *vm86_info;
+        unsigned long           screen_bitmap;
+        unsigned long           v86flags, v86mask, saved_sp0;
+        unsigned int            saved_fs, saved_gs;
+#endif
+/* IO permissions */
+        unsigned long   *io_bitmap_ptr;
+        unsigned long   iopl;
+/* max allowed port in the bitmap, in bytes: */
+        unsigned 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;
+};
+
 static inline unsigned long native_get_debugreg(int regno)
 {
         unsigned long val = 0;  /* Damn you, gcc! */
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 53037d1a6ae6..8cb05cec3cb9 100644
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -176,43 +176,6 @@ typedef struct {
 
 #define ARCH_MIN_TASKALIGN      16
 
-struct thread_struct {
-/* cached TLS descriptors. */
-        struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
-        unsigned long   sp0;
-        unsigned long   sysenter_cs;
-        unsigned long   ip;
-        unsigned long   sp;
-        unsigned long   fs;
-        unsigned long   gs;
-/* Hardware debugging registers */
-        unsigned long   debugreg0;
-        unsigned long   debugreg1;
-        unsigned long   debugreg2;
-        unsigned long   debugreg3;
-        unsigned long   debugreg6;
-        unsigned long   debugreg7;
-/* fault info */
-        unsigned long   cr2, trap_no, error_code;
-/* floating point info */
-        union i387_union        i387;
-/* virtual 86 mode info */
-        struct vm86_struct __user * vm86_info;
-        unsigned long           screen_bitmap;
-        unsigned long           v86flags, v86mask, saved_sp0;
-        unsigned int            saved_fs, saved_gs;
-/* IO permissions */
-        unsigned long   *io_bitmap_ptr;
-        unsigned long   iopl;
-/* max allowed port in the bitmap, in bytes: */
-        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  {                                                  \
         .sp0 = sizeof(init_stack) + (long)&init_stack,                  \
         .vm86_info = NULL,                                              \
diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
index 8d342c23ad14..4b4ec3d79910 100644
--- a/include/asm-x86/processor_64.h
+++ b/include/asm-x86/processor_64.h
@@ -125,38 +125,6 @@ DECLARE_PER_CPU(struct orig_ist, orig_ist);
 #define ARCH_MIN_MMSTRUCT_ALIGN 0
 #endif
 
-struct thread_struct {
-        unsigned long   sp0;
-        unsigned long   sp;
-        unsigned long   usersp; /* Copy from PDA */
-        unsigned long   fs;
-        unsigned long   gs;
-        unsigned short  es, ds, fsindex, gsindex;       
-/* Hardware debugging registers */
-        unsigned long   debugreg0;  
-        unsigned long   debugreg1;  
-        unsigned long   debugreg2;  
-        unsigned long   debugreg3;  
-        unsigned long   debugreg6;  
-        unsigned long   debugreg7;  
-/* fault info */
-        unsigned long   cr2, trap_no, error_code;
-/* floating point info */
-        union i387_union        i387  __attribute__((aligned(16)));
-/* IO permissions. the bitmap could be moved into the GDT, that would make
-   switch faster for a limited number of ioperm using tasks. -AK */
-        int             ioperm;
-        unsigned long   *io_bitmap_ptr;
-        unsigned 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;
-/* cached TLS descriptors. */
-        struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
-} __attribute__((aligned(16)));
-
 #define INIT_THREAD  { \
         .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
 }