From e5e1964187822f64bb1b0ce61c11d15b2dfce086 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 26 Feb 2008 13:00:18 -0800 Subject: [PATCH] --- yaml --- r: 86591 b: refs/heads/master c: 3d00daf44654dc75629caf42816ac4e293658724 h: refs/heads/master i: 86589: 8f3b2b0b378cc3159cfb5029c1636d84e727c841 86587: 308c5e3dc5174ba9498f0af1eed46201c06e4683 86583: c24103a52d565a6800d17822ab3a9b2ee7302203 86575: 1a99435144579f22bae22ac2e357d04a8dec4489 86559: 73670233299d4eb446ba2b0d02407ac55eca1daf 86527: 88ffd7fa6dae04f7aa7eab83a467f77b3865c589 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tls.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92bc1b8b1e79..91030d485ce8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0f4133b8f70769bc8dda977feb9a29109d6ccca +refs/heads/master: 3d00daf44654dc75629caf42816ac4e293658724 diff --git a/trunk/arch/x86/kernel/tls.c b/trunk/arch/x86/kernel/tls.c index 6dfd4e76661a..022bcaa3b42e 100644 --- a/trunk/arch/x86/kernel/tls.c +++ b/trunk/arch/x86/kernel/tls.c @@ -91,7 +91,9 @@ int do_set_thread_area(struct task_struct *p, int idx, asmlinkage int sys_set_thread_area(struct user_desc __user *u_info) { - return do_set_thread_area(current, -1, u_info, 1); + int ret = do_set_thread_area(current, -1, u_info, 1); + prevent_tail_call(ret); + return ret; } @@ -139,7 +141,9 @@ int do_get_thread_area(struct task_struct *p, int idx, asmlinkage int sys_get_thread_area(struct user_desc __user *u_info) { - return do_get_thread_area(current, -1, u_info); + int ret = do_get_thread_area(current, -1, u_info); + prevent_tail_call(ret); + return ret; } int regset_tls_active(struct task_struct *target,