diff options
Diffstat (limited to 'include/asm-x86/desc.h')
| -rw-r--r-- | include/asm-x86/desc.h | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index d75bc063431..c31715cf221 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -165,6 +165,39 @@ static inline void pack_ldt(ldt_desc *ldt, unsigned long addr, #endif } +static inline void pack_tss(tss_desc *tss, unsigned long addr, + unsigned size, unsigned entry) +{ +#ifdef CONFIG_X86_64 + set_tssldt_descriptor(tss, + addr, entry, size); +#else + pack_descriptor(tss, (unsigned long)addr, + size, + 0x80 | entry, 0); +#endif +} + +static inline void __set_tss_desc(unsigned cpu, unsigned int entry, void *addr) +{ + struct desc_struct *d = get_cpu_gdt_table(cpu); + tss_desc tss; + + /* + * sizeof(unsigned long) coming from an extra "long" at the end + * of the iobitmap. See tss_struct definition in processor.h + * + * -1? seg base+limit should be pointing to the address of the + * last valid byte + */ + pack_tss(&tss, (unsigned long)addr, + IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1, + DESC_TSS); + write_gdt_entry(d, entry, &tss, DESC_TSS); +} + +#define set_tss_desc(cpu, addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr) + static inline void native_set_ldt(const void *addr, unsigned int entries) { if (likely(entries == 0)) @@ -222,12 +255,6 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu) gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]; } -#ifdef CONFIG_X86_32 -# include "desc_32.h" -#else -# include "desc_64.h" -#endif - #define _LDT_empty(info) (\ (info)->base_addr == 0 && \ (info)->limit == 0 && \ |