um: merge tls_{32,64}.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
4dc706c2f2
commit
09e129a603
|
@ -1,5 +1,37 @@
|
||||||
#ifdef __i386__
|
#ifndef _SYSDEP_TLS_H
|
||||||
#include "tls_32.h"
|
#define _SYSDEP_TLS_H
|
||||||
#else
|
|
||||||
#include "tls_64.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
|
#endif
|
||||||
|
} user_desc_t;
|
||||||
|
|
||||||
|
# else /* __KERNEL__ */
|
||||||
|
|
||||||
|
# include <ldt.h>
|
||||||
|
typedef struct user_desc user_desc_t;
|
||||||
|
|
||||||
|
# endif /* __KERNEL__ */
|
||||||
|
|
||||||
|
#ifdef __i386__
|
||||||
|
#define GDT_ENTRY_TLS_MIN_I386 6
|
||||||
|
#define GDT_ENTRY_TLS_MIN_X86_64 12
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* _SYSDEP_TLS_H */
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
#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 */
|
|
|
@ -1,29 +0,0 @@
|
||||||
#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 */
|
|
Loading…
Reference in a new issue