diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 07:31:13 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:13 -0500 |
commit | 25deca53e9b74a899efd3ae1f4493f4f2ce36846 (patch) | |
tree | b971cb4a1a315e3c48cd5d304dc45e75b7d21707 /include/asm-x86 | |
parent | 8d947344c47a40626730bb80d136d8daac9f2060 (diff) |
x86: introduce ldt_desc type.
this patch introduces ldt_desc type to account for the differences
in the ldt descriptor in x86_64 and i386
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/desc_64.h | 2 | ||||
-rw-r--r-- | include/asm-x86/desc_defs.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h index 887393f044b1..c49f928ed8b6 100644 --- a/include/asm-x86/desc_64.h +++ b/include/asm-x86/desc_64.h | |||
@@ -113,7 +113,7 @@ static inline void store_idt(struct desc_ptr *dtr) | |||
113 | static inline void set_tssldt_descriptor(void *ptr, unsigned long tss, | 113 | static inline void set_tssldt_descriptor(void *ptr, unsigned long tss, |
114 | unsigned type, unsigned size) | 114 | unsigned type, unsigned size) |
115 | { | 115 | { |
116 | struct ldttss_desc d; | 116 | struct ldttss_desc64 d; |
117 | 117 | ||
118 | memset(&d, 0, sizeof(d)); | 118 | memset(&d, 0, sizeof(d)); |
119 | d.limit0 = size & 0xFFFF; | 119 | d.limit0 = size & 0xFFFF; |
diff --git a/include/asm-x86/desc_defs.h b/include/asm-x86/desc_defs.h index 9732285116af..09ea05243497 100644 --- a/include/asm-x86/desc_defs.h +++ b/include/asm-x86/desc_defs.h | |||
@@ -58,7 +58,7 @@ enum { | |||
58 | }; | 58 | }; |
59 | 59 | ||
60 | // LDT or TSS descriptor in the GDT. 16 bytes. | 60 | // LDT or TSS descriptor in the GDT. 16 bytes. |
61 | struct ldttss_desc { | 61 | struct ldttss_desc64 { |
62 | u16 limit0; | 62 | u16 limit0; |
63 | u16 base0; | 63 | u16 base0; |
64 | unsigned base1 : 8, type : 5, dpl : 2, p : 1; | 64 | unsigned base1 : 8, type : 5, dpl : 2, p : 1; |
@@ -69,8 +69,10 @@ struct ldttss_desc { | |||
69 | 69 | ||
70 | #ifdef CONFIG_X86_64 | 70 | #ifdef CONFIG_X86_64 |
71 | typedef struct gate_struct64 gate_desc; | 71 | typedef struct gate_struct64 gate_desc; |
72 | typedef struct ldttss_desc64 ldt_desc; | ||
72 | #else | 73 | #else |
73 | typedef struct desc_struct gate_desc; | 74 | typedef struct desc_struct gate_desc; |
75 | typedef struct desc_struct ldt_desc; | ||
74 | #endif | 76 | #endif |
75 | 77 | ||
76 | struct desc_ptr { | 78 | struct desc_ptr { |