diff options
Diffstat (limited to 'include/asm-x86/desc_32.h')
-rw-r--r-- | include/asm-x86/desc_32.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/asm-x86/desc_32.h b/include/asm-x86/desc_32.h index c547403f341d..bc5ca3453466 100644 --- a/include/asm-x86/desc_32.h +++ b/include/asm-x86/desc_32.h | |||
@@ -12,12 +12,6 @@ | |||
12 | 12 | ||
13 | #include <asm/mmu.h> | 13 | #include <asm/mmu.h> |
14 | 14 | ||
15 | struct Xgt_desc_struct { | ||
16 | unsigned short size; | ||
17 | unsigned long address __attribute__((packed)); | ||
18 | unsigned short pad; | ||
19 | } __attribute__ ((packed)); | ||
20 | |||
21 | struct gdt_page | 15 | struct gdt_page |
22 | { | 16 | { |
23 | struct desc_struct gdt[GDT_ENTRIES]; | 17 | struct desc_struct gdt[GDT_ENTRIES]; |
@@ -29,7 +23,7 @@ static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) | |||
29 | return per_cpu(gdt_page, cpu).gdt; | 23 | return per_cpu(gdt_page, cpu).gdt; |
30 | } | 24 | } |
31 | 25 | ||
32 | extern struct Xgt_desc_struct idt_descr; | 26 | extern struct desc_ptr idt_descr; |
33 | extern struct desc_struct idt_table[]; | 27 | extern struct desc_struct idt_table[]; |
34 | extern void set_intr_gate(unsigned int irq, void * addr); | 28 | extern void set_intr_gate(unsigned int irq, void * addr); |
35 | 29 | ||
@@ -107,22 +101,22 @@ static inline void native_load_tr_desc(void) | |||
107 | asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8)); | 101 | asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8)); |
108 | } | 102 | } |
109 | 103 | ||
110 | static inline void native_load_gdt(const struct Xgt_desc_struct *dtr) | 104 | static inline void native_load_gdt(const struct desc_ptr *dtr) |
111 | { | 105 | { |
112 | asm volatile("lgdt %0"::"m" (*dtr)); | 106 | asm volatile("lgdt %0"::"m" (*dtr)); |
113 | } | 107 | } |
114 | 108 | ||
115 | static inline void native_load_idt(const struct Xgt_desc_struct *dtr) | 109 | static inline void native_load_idt(const struct desc_ptr *dtr) |
116 | { | 110 | { |
117 | asm volatile("lidt %0"::"m" (*dtr)); | 111 | asm volatile("lidt %0"::"m" (*dtr)); |
118 | } | 112 | } |
119 | 113 | ||
120 | static inline void native_store_gdt(struct Xgt_desc_struct *dtr) | 114 | static inline void native_store_gdt(struct desc_ptr *dtr) |
121 | { | 115 | { |
122 | asm ("sgdt %0":"=m" (*dtr)); | 116 | asm ("sgdt %0":"=m" (*dtr)); |
123 | } | 117 | } |
124 | 118 | ||
125 | static inline void native_store_idt(struct Xgt_desc_struct *dtr) | 119 | static inline void native_store_idt(struct desc_ptr *dtr) |
126 | { | 120 | { |
127 | asm ("sidt %0":"=m" (*dtr)); | 121 | asm ("sidt %0":"=m" (*dtr)); |
128 | } | 122 | } |