Merge branch 'kvm-updates/2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git...

[safe/jmp/linux-2.6] / arch / x86 / kernel / tls.c

diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index 6dfd4e7..6bb7b85 100644 (file)
--- a/arch/x86/kernel/tls.c
+++ b/arch/x86/kernel/tls.c
@@ -10,6 +10,7 @@
 #include <asm/ldt.h>
 #include <asm/processor.h>
 #include <asm/proto.h>
+#include <asm/syscalls.h>
 
 #include "tls.h"
 
@@ -91,7 +92,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);
+       asmlinkage_protect(1, ret, u_info);
+       return ret;
 }
 
 
@@ -139,7 +142,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);
+       asmlinkage_protect(1, ret, u_info);
+       return ret;
 }
 
 int regset_tls_active(struct task_struct *target,