diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-um/ldt-i386.h | 2 | ||||
-rw-r--r-- | include/asm-um/ldt-x86_64.h (renamed from include/asm-um/ldt.h) | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-um/ldt-i386.h b/include/asm-um/ldt-i386.h index b42662929b6c..175722a91164 100644 --- a/include/asm-um/ldt-i386.h +++ b/include/asm-um/ldt-i386.h | |||
@@ -35,7 +35,7 @@ typedef struct uml_ldt { | |||
35 | union { | 35 | union { |
36 | struct ldt_entry * pages[LDT_PAGES_MAX]; | 36 | struct ldt_entry * pages[LDT_PAGES_MAX]; |
37 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; | 37 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; |
38 | }; | 38 | } u; |
39 | } uml_ldt_t; | 39 | } uml_ldt_t; |
40 | 40 | ||
41 | /* | 41 | /* |
diff --git a/include/asm-um/ldt.h b/include/asm-um/ldt-x86_64.h index 4466ff6de0fd..175722a91164 100644 --- a/include/asm-um/ldt.h +++ b/include/asm-um/ldt-x86_64.h | |||
@@ -35,7 +35,7 @@ typedef struct uml_ldt { | |||
35 | union { | 35 | union { |
36 | struct ldt_entry * pages[LDT_PAGES_MAX]; | 36 | struct ldt_entry * pages[LDT_PAGES_MAX]; |
37 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; | 37 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; |
38 | }; | 38 | } u; |
39 | } uml_ldt_t; | 39 | } uml_ldt_t; |
40 | 40 | ||
41 | /* | 41 | /* |
@@ -67,8 +67,3 @@ typedef struct uml_ldt { | |||
67 | (info)->useable == 0 ) | 67 | (info)->useable == 0 ) |
68 | 68 | ||
69 | #endif | 69 | #endif |
70 | #ifndef __UM_LDT_H | ||
71 | #define __UM_LDT_H | ||
72 | |||
73 | #include "asm/arch/ldt.h" | ||
74 | #endif | ||