Merge branches 'release' and 'gpe-ack' into release

[linux-2.6] / include / asm-x86 / desc.h

diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
index c31715cf221822f6100258e4a2909768d8e8ae40..5b6a05d3a7712aa7b29b26a37aff2c843ba78819 100644 (file)
--- a/include/asm-x86/desc.h
+++ b/include/asm-x86/desc.h
@@ -7,7 +7,8 @@
 #include <asm/mmu.h>
 #include <linux/smp.h>
 
-static inline void fill_ldt(struct desc_struct *desc, struct user_desc *info)
+static inline void fill_ldt(struct desc_struct *desc,
+                           const struct user_desc *info)
 {
        desc->limit0 = info->limit & 0x0ffff;
        desc->base0 = info->base_addr & 0x0000ffff;
@@ -71,6 +72,12 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
 
 #endif
 
+static inline int desc_empty(const void *ptr)
+{
+       const u32 *desc = ptr;
+       return !(desc[0] | desc[1]);
+}
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else
@@ -125,21 +132,6 @@ static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
        memcpy(&gdt[entry], desc, size);
 }
 
-static inline void set_tssldt_descriptor(struct ldttss_desc64 *d,
-                                        unsigned long tss, unsigned type,
-                                        unsigned size)
-{
-       memset(d, 0, sizeof(*d));
-       d->limit0 = size & 0xFFFF;
-       d->base0 = PTR_LOW(tss);
-       d->base1 = PTR_MIDDLE(tss) & 0xFF;
-       d->type = type;
-       d->p = 1;
-       d->limit1 = (size >> 16) & 0xF;
-       d->base2 = (PTR_MIDDLE(tss) >> 8) & 0xFF;
-       d->base3 = PTR_HIGH(tss);
-}
-
 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
                                   unsigned long limit, unsigned char type,
                                   unsigned char flags)
@@ -151,30 +143,24 @@ static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
        desc->p = 1;
 }
 
-static inline void pack_ldt(ldt_desc *ldt, unsigned long addr,
-                          unsigned size)
-{
-
-#ifdef CONFIG_X86_64
-               set_tssldt_descriptor(ldt,
-                            addr, DESC_LDT, size);
-#else
-               pack_descriptor(ldt, (unsigned long)addr,
-                               size,
-                               0x80 | DESC_LDT, 0);
-#endif
-}
 
-static inline void pack_tss(tss_desc *tss, unsigned long addr,
-                          unsigned size, unsigned entry)
+static inline void set_tssldt_descriptor(void *d, unsigned long addr,
+                                        unsigned type, unsigned size)
 {
 #ifdef CONFIG_X86_64
-               set_tssldt_descriptor(tss,
-                            addr, entry, size);
+       struct ldttss_desc64 *desc = d;
+       memset(desc, 0, sizeof(*desc));
+       desc->limit0 = size & 0xFFFF;
+       desc->base0 = PTR_LOW(addr);
+       desc->base1 = PTR_MIDDLE(addr) & 0xFF;
+       desc->type = type;
+       desc->p = 1;
+       desc->limit1 = (size >> 16) & 0xF;
+       desc->base2 = (PTR_MIDDLE(addr) >> 8) & 0xFF;
+       desc->base3 = PTR_HIGH(addr);
 #else
-               pack_descriptor(tss, (unsigned long)addr,
-                               size,
-                               0x80 | entry, 0);
+
+       pack_descriptor((struct desc_struct *)d, addr, size, 0x80 | type, 0);
 #endif
 }
 
@@ -190,9 +176,8 @@ static inline void __set_tss_desc(unsigned cpu, unsigned int entry, void *addr)
         * -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);
+       set_tssldt_descriptor(&tss, (unsigned long)addr, DESC_TSS,
+               IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1);
        write_gdt_entry(d, entry, &tss, DESC_TSS);
 }
 
@@ -206,8 +191,8 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
                unsigned cpu = smp_processor_id();
                ldt_desc ldt;
 
-               pack_ldt(&ldt, (unsigned long)addr,
-                               entries * sizeof(ldt) - 1);
+               set_tssldt_descriptor(&ldt, (unsigned long)addr,
+                                     DESC_LDT, entries * sizeof(ldt) - 1);
                write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_LDT,
                                &ldt, DESC_LDT);
                __asm__ __volatile__("lldt %w0"::"q" (GDT_ENTRY_LDT*8));
@@ -291,10 +276,16 @@ static inline void load_LDT(mm_context_t *pc)
        preempt_enable();
 }
 
-static inline unsigned long get_desc_base(struct desc_struct *desc)
+static inline unsigned long get_desc_base(const struct desc_struct *desc)
 {
        return desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24);
 }
+
+static inline unsigned long get_desc_limit(const struct desc_struct *desc)
+{
+       return desc->limit0 | (desc->limit << 16);
+}
+
 static inline void _set_gate(int gate, unsigned type, void *addr,
                              unsigned dpl, unsigned ist, unsigned seg)
 {