Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb38d377 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

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: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7818a1e0

include/asm-x86/processor.h

+44 −0
Original line number Diff line number Diff line
@@ -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! */

include/asm-x86/processor_32.h

+0 −37
Original line number Diff line number Diff line
@@ -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,						\

include/asm-x86/processor_64.h

+0 −32
Original line number Diff line number Diff line
@@ -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) \

}