Commit 09e129a6 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: merge tls_{32,64}.h 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 4dc706c2

arch/x86/um/shared/sysdep/tls.h

+35 −3
Original line number Diff line number Diff line 
#ifndef _SYSDEP_TLS_H

#define _SYSDEP_TLS_H



# ifndef __KERNEL__



/* Change name to avoid conflicts with the original one from <asm/ldt.h>, which

 * may be named user_desc (but in 2.4 and in header matching its API was named

 * modify_ldt_ldt_s). */



typedef struct um_dup_user_desc {

	unsigned int  entry_number;

	unsigned int  base_addr;

	unsigned int  limit;

	unsigned int  seg_32bit:1;

	unsigned int  contents:2;

	unsigned int  read_exec_only:1;

	unsigned int  limit_in_pages:1;

	unsigned int  seg_not_present:1;

	unsigned int  useable:1;

#ifdef __x86_64__

	unsigned int  lm:1;

#endif

} user_desc_t;



# else /* __KERNEL__ */



#  include <ldt.h>

typedef struct user_desc user_desc_t;



# endif /* __KERNEL__ */



#ifdef __i386__

#include "tls_32.h"

#else

#include "tls_64.h"

#define GDT_ENTRY_TLS_MIN_I386 6

#define GDT_ENTRY_TLS_MIN_X86_64 12

#endif



#endif /* _SYSDEP_TLS_H */

arch/x86/um/shared/sysdep/tls_32.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
#ifndef _SYSDEP_TLS_H

#define _SYSDEP_TLS_H



# ifndef __KERNEL__



/* Change name to avoid conflicts with the original one from <asm/ldt.h>, which

 * may be named user_desc (but in 2.4 and in header matching its API was named

 * modify_ldt_ldt_s). */



typedef struct um_dup_user_desc {

	unsigned int  entry_number;

	unsigned int  base_addr;

	unsigned int  limit;

	unsigned int  seg_32bit:1;

	unsigned int  contents:2;

	unsigned int  read_exec_only:1;

	unsigned int  limit_in_pages:1;

	unsigned int  seg_not_present:1;

	unsigned int  useable:1;

} user_desc_t;



# else /* __KERNEL__ */



#  include <ldt.h>

typedef struct user_desc user_desc_t;



# endif /* __KERNEL__ */



#define GDT_ENTRY_TLS_MIN_I386 6

#define GDT_ENTRY_TLS_MIN_X86_64 12



#endif /* _SYSDEP_TLS_H */

arch/x86/um/shared/sysdep/tls_64.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#ifndef _SYSDEP_TLS_H

#define _SYSDEP_TLS_H



# ifndef __KERNEL__



/* Change name to avoid conflicts with the original one from <asm/ldt.h>, which

 * may be named user_desc (but in 2.4 and in header matching its API was named

 * modify_ldt_ldt_s). */



typedef struct um_dup_user_desc {

	unsigned int  entry_number;

	unsigned int  base_addr;

	unsigned int  limit;

	unsigned int  seg_32bit:1;

	unsigned int  contents:2;

	unsigned int  read_exec_only:1;

	unsigned int  limit_in_pages:1;

	unsigned int  seg_not_present:1;

	unsigned int  useable:1;

	unsigned int  lm:1;

} user_desc_t;



# else /* __KERNEL__ */



#  include <ldt.h>

typedef struct user_desc user_desc_t;



# endif /* __KERNEL__ */

#endif /* _SYSDEP_TLS_H */