Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / tls.c

diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index 022bcaa3b42ed0c9e270a9734ad36c77bd3092f0..6bb7b8579e70e0a73a67ddcb9f69c01696bb6413 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"
 
@@ -92,7 +93,7 @@ int do_set_thread_area(struct task_struct *p, int idx,
 asmlinkage int sys_set_thread_area(struct user_desc __user *u_info)
 {
        int ret = do_set_thread_area(current, -1, u_info, 1);
-       prevent_tail_call(ret);
+       asmlinkage_protect(1, ret, u_info);
        return ret;
 }
 
@@ -142,7 +143,7 @@ int do_get_thread_area(struct task_struct *p, int idx,
 asmlinkage int sys_get_thread_area(struct user_desc __user *u_info)
 {
        int ret = do_get_thread_area(current, -1, u_info);
-       prevent_tail_call(ret);
+       asmlinkage_protect(1, ret, u_info);
        return ret;
 }