diff --git a/[refs] b/[refs] index 6c8e4aa895a6..7bae6a4939fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cadd516422d9382313144aa58f9e46ee7a2c0a28 +refs/heads/master: 859c0a5b9ca8eba2d65fa42f02505d76f8a712c7 diff --git a/trunk/include/asm-x86/desc_64.h b/trunk/include/asm-x86/desc_64.h index 7d48df72aef2..230ac6e50a0f 100644 --- a/trunk/include/asm-x86/desc_64.h +++ b/trunk/include/asm-x86/desc_64.h @@ -215,6 +215,16 @@ static inline void load_LDT(mm_context_t *pc) extern struct desc_ptr idt_descr; +static inline unsigned long get_desc_base(const void *ptr) +{ + const u32 *desc = ptr; + unsigned long base; + base = ((desc[0] >> 16) & 0x0000ffff) | + ((desc[1] << 16) & 0x00ff0000) | + (desc[1] & 0xff000000); + return base; +} + #endif /* !__ASSEMBLY__ */ #endif