tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

um: merge tls_{32,64}.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

authored by

Al Viro and committed by
Richard Weinberger 09e129a6 4dc706c2

+36 -65
+36 -4
arch/x86/um/shared/sysdep/tls.h
··· 1 - #ifdef __i386__ 2 - #include "tls_32.h" 3 - #else 4 - #include "tls_64.h" 1 + #ifndef _SYSDEP_TLS_H 2 + #define _SYSDEP_TLS_H 3 + 4 + # ifndef __KERNEL__ 5 + 6 + /* Change name to avoid conflicts with the original one from <asm/ldt.h>, which 7 + * may be named user_desc (but in 2.4 and in header matching its API was named 8 + * modify_ldt_ldt_s). */ 9 + 10 + typedef struct um_dup_user_desc { 11 + unsigned int entry_number; 12 + unsigned int base_addr; 13 + unsigned int limit; 14 + unsigned int seg_32bit:1; 15 + unsigned int contents:2; 16 + unsigned int read_exec_only:1; 17 + unsigned int limit_in_pages:1; 18 + unsigned int seg_not_present:1; 19 + unsigned int useable:1; 20 + #ifdef __x86_64__ 21 + unsigned int lm:1; 5 22 #endif 23 + } user_desc_t; 24 + 25 + # else /* __KERNEL__ */ 26 + 27 + # include <ldt.h> 28 + typedef struct user_desc user_desc_t; 29 + 30 + # endif /* __KERNEL__ */ 31 + 32 + #ifdef __i386__ 33 + #define GDT_ENTRY_TLS_MIN_I386 6 34 + #define GDT_ENTRY_TLS_MIN_X86_64 12 35 + #endif 36 + 37 + #endif /* _SYSDEP_TLS_H */
-32
arch/x86/um/shared/sysdep/tls_32.h
··· 1 - #ifndef _SYSDEP_TLS_H 2 - #define _SYSDEP_TLS_H 3 - 4 - # ifndef __KERNEL__ 5 - 6 - /* Change name to avoid conflicts with the original one from <asm/ldt.h>, which 7 - * may be named user_desc (but in 2.4 and in header matching its API was named 8 - * modify_ldt_ldt_s). */ 9 - 10 - typedef struct um_dup_user_desc { 11 - unsigned int entry_number; 12 - unsigned int base_addr; 13 - unsigned int limit; 14 - unsigned int seg_32bit:1; 15 - unsigned int contents:2; 16 - unsigned int read_exec_only:1; 17 - unsigned int limit_in_pages:1; 18 - unsigned int seg_not_present:1; 19 - unsigned int useable:1; 20 - } user_desc_t; 21 - 22 - # else /* __KERNEL__ */ 23 - 24 - # include <ldt.h> 25 - typedef struct user_desc user_desc_t; 26 - 27 - # endif /* __KERNEL__ */ 28 - 29 - #define GDT_ENTRY_TLS_MIN_I386 6 30 - #define GDT_ENTRY_TLS_MIN_X86_64 12 31 - 32 - #endif /* _SYSDEP_TLS_H */
-29
arch/x86/um/shared/sysdep/tls_64.h
··· 1 - #ifndef _SYSDEP_TLS_H 2 - #define _SYSDEP_TLS_H 3 - 4 - # ifndef __KERNEL__ 5 - 6 - /* Change name to avoid conflicts with the original one from <asm/ldt.h>, which 7 - * may be named user_desc (but in 2.4 and in header matching its API was named 8 - * modify_ldt_ldt_s). */ 9 - 10 - typedef struct um_dup_user_desc { 11 - unsigned int entry_number; 12 - unsigned int base_addr; 13 - unsigned int limit; 14 - unsigned int seg_32bit:1; 15 - unsigned int contents:2; 16 - unsigned int read_exec_only:1; 17 - unsigned int limit_in_pages:1; 18 - unsigned int seg_not_present:1; 19 - unsigned int useable:1; 20 - unsigned int lm:1; 21 - } user_desc_t; 22 - 23 - # else /* __KERNEL__ */ 24 - 25 - # include <ldt.h> 26 - typedef struct user_desc user_desc_t; 27 - 28 - # endif /* __KERNEL__ */ 29 - #endif /* _SYSDEP_TLS_H */