4 files changed, 39 insertions, 82 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 30f224428724..a0c0b80c7f2d 100644
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@ -4,8 +4,6 @@ header-y += boot.h
 header-y += debugreg_32.h
 header-y += debugreg_64.h
 header-y += debugreg.h
-header-y += ldt_32.h
-header-y += ldt_64.h
 header-y += ldt.h
 header-y += msr-index.h
 header-y += prctl.h
diff --git a/include/asm-x86/ldt.h b/include/asm-x86/ldt.h
index 3d9cc20d2ba4..20c597242b53 100644
--- a/include/asm-x86/ldt.h
+++ b/include/asm-x86/ldt.h
@@ -1,13 +1,40 @@
-#ifdef __KERNEL__
+/*
-# ifdef CONFIG_X86_32
+ * ldt.h
-#  include "ldt_32.h"
+ *
-# else
+ * Definitions of structures used with the modify_ldt system call.
-#  include "ldt_64.h"
+ */
-# endif
+#ifndef _ASM_X86_LDT_H
-#else
+#define _ASM_X86_LDT_H
-# ifdef __i386__
-#  include "ldt_32.h"
+/* Maximum number of LDT entries supported. */
-# else
+#define LDT_ENTRIES     8192
-#  include "ldt_64.h"
+/* The size of each LDT entry. */
-# endif
+#define LDT_ENTRY_SIZE  8
+#ifndef __ASSEMBLY__
+/*
+ * Note on 64bit base and limit is ignored and you cannot set DS/ES/CS
+ * not to the default values if you still want to do syscalls. This
+ * call is more for 32bit mode therefore.
+ */
+struct 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
+};
+#define MODIFY_LDT_CONTENTS_DATA        0
+#define MODIFY_LDT_CONTENTS_STACK       1
+#define MODIFY_LDT_CONTENTS_CODE        2
+#endif /* !__ASSEMBLY__ */
 #endif
diff --git a/include/asm-x86/ldt_32.h b/include/asm-x86/ldt_32.h
deleted file mode 100644
index e9d3de1dee6c..000000000000
--- a/include/asm-x86/ldt_32.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * ldt.h
- *
- * Definitions of structures used with the modify_ldt system call.
- */
-#ifndef _LINUX_LDT_H
-#define _LINUX_LDT_H
-/* Maximum number of LDT entries supported. */
-#define LDT_ENTRIES     8192
-/* The size of each LDT entry. */
-#define LDT_ENTRY_SIZE  8
-#ifndef __ASSEMBLY__
-struct user_desc {
-        unsigned int  entry_number;
-        unsigned long 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;
-};
-#define MODIFY_LDT_CONTENTS_DATA        0
-#define MODIFY_LDT_CONTENTS_STACK       1
-#define MODIFY_LDT_CONTENTS_CODE        2
-#endif /* !__ASSEMBLY__ */
-#endif
diff --git a/include/asm-x86/ldt_64.h b/include/asm-x86/ldt_64.h
deleted file mode 100644
index 9ef647b890d2..000000000000
--- a/include/asm-x86/ldt_64.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ldt.h
- *
- * Definitions of structures used with the modify_ldt system call.
- */
-#ifndef _LINUX_LDT_H
-#define _LINUX_LDT_H
-/* Maximum number of LDT entries supported. */
-#define LDT_ENTRIES     8192
-/* The size of each LDT entry. */
-#define LDT_ENTRY_SIZE  8
-#ifndef __ASSEMBLY__
-/* Note on 64bit base and limit is ignored and you cannot set
-   DS/ES/CS not to the default values if you still want to do syscalls. This
-   call is more for 32bit mode therefore. */
-struct 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;
-};
-#define MODIFY_LDT_CONTENTS_DATA        0
-#define MODIFY_LDT_CONTENTS_STACK       1
-#define MODIFY_LDT_CONTENTS_CODE        2
-#endif /* !__ASSEMBLY__ */
-#endif

diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index 30f224428724..a0c0b80c7f2d 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild
@@ -4,8 +4,6 @@ header-y += boot.h
4	header-y += debugreg_32.h	4	header-y += debugreg_32.h
5	header-y += debugreg_64.h	5	header-y += debugreg_64.h
6	header-y += debugreg.h	6	header-y += debugreg.h
7	header-y += ldt_32.h
8	header-y += ldt_64.h
9	header-y += ldt.h	7	header-y += ldt.h
10	header-y += msr-index.h	8	header-y += msr-index.h
11	header-y += prctl.h	9	header-y += prctl.h


diff --git a/include/asm-x86/ldt.h b/include/asm-x86/ldt.h index 3d9cc20d2ba4..20c597242b53 100644 --- a/include/asm-x86/ldt.h +++ b/include/asm-x86/ldt.h
@@ -1,13 +1,40 @@
1	#ifdef __KERNEL__	1	/*
2	# ifdef CONFIG_X86_32	2	* ldt.h
3	# include "ldt_32.h"	3	*
4	# else	4	* Definitions of structures used with the modify_ldt system call.
5	# include "ldt_64.h"	5	*/
6	# endif	6	#ifndef _ASM_X86_LDT_H
7	#else	7	#define _ASM_X86_LDT_H
8	# ifdef __i386__	8
9	# include "ldt_32.h"	9	/* Maximum number of LDT entries supported. */
10	# else	10	#define LDT_ENTRIES 8192
11	# include "ldt_64.h"	11	/* The size of each LDT entry. */
12	# endif	12	#define LDT_ENTRY_SIZE 8
		13
		14	#ifndef __ASSEMBLY__
		15	/*
		16	* Note on 64bit base and limit is ignored and you cannot set DS/ES/CS
		17	* not to the default values if you still want to do syscalls. This
		18	* call is more for 32bit mode therefore.
		19	*/
		20	struct user_desc {
		21	unsigned int entry_number;
		22	unsigned int base_addr;
		23	unsigned int limit;
		24	unsigned int seg_32bit:1;
		25	unsigned int contents:2;
		26	unsigned int read_exec_only:1;
		27	unsigned int limit_in_pages:1;
		28	unsigned int seg_not_present:1;
		29	unsigned int useable:1;
		30	#ifdef __x86_64__
		31	unsigned int lm:1;
		32	#endif
		33	};
		34
		35	#define MODIFY_LDT_CONTENTS_DATA 0
		36	#define MODIFY_LDT_CONTENTS_STACK 1
		37	#define MODIFY_LDT_CONTENTS_CODE 2
		38
		39	#endif /* !__ASSEMBLY__ */
13	#endif	40	#endif


diff --git a/include/asm-x86/ldt_32.h b/include/asm-x86/ldt_32.h deleted file mode 100644 index e9d3de1dee6c..000000000000 --- a/include/asm-x86/ldt_32.h +++ /dev/null
@@ -1,32 +0,0 @@
1	/*
2	* ldt.h
3	*
4	* Definitions of structures used with the modify_ldt system call.
5	*/
6	#ifndef _LINUX_LDT_H
7	#define _LINUX_LDT_H
8
9	/* Maximum number of LDT entries supported. */
10	#define LDT_ENTRIES 8192
11	/* The size of each LDT entry. */
12	#define LDT_ENTRY_SIZE 8
13
14	#ifndef __ASSEMBLY__
15	struct user_desc {
16	unsigned int entry_number;
17	unsigned long base_addr;
18	unsigned int limit;
19	unsigned int seg_32bit:1;
20	unsigned int contents:2;
21	unsigned int read_exec_only:1;
22	unsigned int limit_in_pages:1;
23	unsigned int seg_not_present:1;
24	unsigned int useable:1;
25	};
26
27	#define MODIFY_LDT_CONTENTS_DATA 0
28	#define MODIFY_LDT_CONTENTS_STACK 1
29	#define MODIFY_LDT_CONTENTS_CODE 2
30
31	#endif /* !__ASSEMBLY__ */
32	#endif


diff --git a/include/asm-x86/ldt_64.h b/include/asm-x86/ldt_64.h deleted file mode 100644 index 9ef647b890d2..000000000000 --- a/include/asm-x86/ldt_64.h +++ /dev/null
@@ -1,36 +0,0 @@
1	/*
2	* ldt.h
3	*
4	* Definitions of structures used with the modify_ldt system call.
5	*/
6	#ifndef _LINUX_LDT_H
7	#define _LINUX_LDT_H
8
9	/* Maximum number of LDT entries supported. */
10	#define LDT_ENTRIES 8192
11	/* The size of each LDT entry. */
12	#define LDT_ENTRY_SIZE 8
13
14	#ifndef __ASSEMBLY__
15	/* Note on 64bit base and limit is ignored and you cannot set
16	DS/ES/CS not to the default values if you still want to do syscalls. This
17	call is more for 32bit mode therefore. */
18	struct user_desc {
19	unsigned int entry_number;
20	unsigned int base_addr;
21	unsigned int limit;
22	unsigned int seg_32bit:1;
23	unsigned int contents:2;
24	unsigned int read_exec_only:1;
25	unsigned int limit_in_pages:1;
26	unsigned int seg_not_present:1;
27	unsigned int useable:1;
28	unsigned int lm:1;
29	};
30
31	#define MODIFY_LDT_CONTENTS_DATA 0
32	#define MODIFY_LDT_CONTENTS_STACK 1
33	#define MODIFY_LDT_CONTENTS_CODE 2
34
35	#endif /* !__ASSEMBLY__ */
36	#endif