From 90b8b2a31a4167cf55076799d9750d2bd55fe341 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 30 Jan 2008 13:30:45 +0100 Subject: [PATCH] --- yaml --- r: 79851 b: refs/heads/master c: 91394eb0975b3771dde7071a0825c6df6c20ff8a h: refs/heads/master i: 79849: 281443fa129efcfe45ccc28194a738fb46e8dcb9 79847: 2ea0aa2098ce012802fb5f7c489c395a0cdbf20a v: v3 --- [refs] | 2 +- trunk/arch/x86/ia32/tls32.c | 7 +------ trunk/arch/x86/kernel/process_64.c | 6 +----- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 7bae6a4939fe..41a1e2de4ad3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 859c0a5b9ca8eba2d65fa42f02505d76f8a712c7 +refs/heads/master: 91394eb0975b3771dde7071a0825c6df6c20ff8a diff --git a/trunk/arch/x86/ia32/tls32.c b/trunk/arch/x86/ia32/tls32.c index 1cc4340de3ca..cac4b26b5895 100644 --- a/trunk/arch/x86/ia32/tls32.c +++ b/trunk/arch/x86/ia32/tls32.c @@ -85,11 +85,6 @@ asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info) * Get the current Thread-Local Storage area: */ -#define GET_BASE(desc) ( \ - (((desc)->a >> 16) & 0x0000ffff) | \ - (((desc)->b << 16) & 0x00ff0000) | \ - ( (desc)->b & 0xff000000) ) - #define GET_LIMIT(desc) ( \ ((desc)->a & 0x0ffff) | \ ((desc)->b & 0xf0000) ) @@ -117,7 +112,7 @@ int do_get_thread_area(struct thread_struct *t, struct user_desc __user *u_info) memset(&info, 0, sizeof(struct user_desc)); info.entry_number = idx; - info.base_addr = GET_BASE(desc); + info.base_addr = get_desc_base(desc); info.limit = GET_LIMIT(desc); info.seg_32bit = GET_32BIT(desc); info.contents = GET_CONTENTS(desc); diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c index aa9414ed74c7..9ea1d7546f80 100644 --- a/trunk/arch/x86/kernel/process_64.c +++ b/trunk/arch/x86/kernel/process_64.c @@ -464,11 +464,7 @@ static inline void set_32bit_tls(struct task_struct *t, int tls, u32 addr) static inline u32 read_32bit_tls(struct task_struct *t, int tls) { - struct desc_struct *desc = (void *)t->thread.tls_array; - desc += tls; - return desc->base0 | - (((u32)desc->base1) << 16) | - (((u32)desc->base2) << 24); + return get_desc_base(&t->thread.tls_array[tls]); } /*