aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/um/shared/sysdep/tls_32.h
diff options
context:
space:
mode:
authorGravatar Al Viro <viro@ftp.linux.org.uk> 2011-08-18 20:06:39 +0100
committerGravatar Richard Weinberger <richard@nod.at> 2011-11-02 14:15:05 +0100
commit5c48b108ecbf6505d929e64d50dace13ac2bdf34 (patch)
tree016904f84fbe05aa301c5cdfe712d90f6bb828fe /arch/x86/um/shared/sysdep/tls_32.h
parentum: merge Makefile-{i386,x86_64} (diff)
downloadlinux-5c48b108ecbf6505d929e64d50dace13ac2bdf34.tar.gz
linux-5c48b108ecbf6505d929e64d50dace13ac2bdf34.tar.bz2
linux-5c48b108ecbf6505d929e64d50dace13ac2bdf34.zip
um: take arch/um/sys-x86 to arch/x86/um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86/um/shared/sysdep/tls_32.h')
-rw-r--r--arch/x86/um/shared/sysdep/tls_32.h32
1 files changed, 32 insertions, 0 deletions
diff --git a/arch/x86/um/shared/sysdep/tls_32.h b/arch/x86/um/shared/sysdep/tls_32.h
new file mode 100644
index 000000000000..34550755b2a1
--- /dev/null
+++ b/arch/x86/um/shared/sysdep/tls_32.h
@@ -0,0 +1,32 @@
+#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 */