---

yaml --- r: 86591 b: refs/heads/master c: 3d00daf h: refs/heads/master i: 86589: 8f3b2b0 86587: 308c5e3 86583: c24103a 86575: 1a99435 86559: 7367023 86527: 88ffd7f v: v3
git-mirror · Feb 29, 2008 · e5e1964 · e5e1964
1 parent 997a1b1
commit e5e1964
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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,