Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / x86 / lib / putuser.S

diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
index e0817a12d32362b4e69687c7b09e424580616e5d..c891ece81e5b11a9b2337eac142c65c95286ad72 100644 (file)
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
@@ -29,14 +29,14 @@
  * as they get called from within inline assembly.
  */
 
-#define ENTER  GET_THREAD_INFO(%_ASM_BX)
+#define ENTER  mov PER_CPU_VAR(current_task), %_ASM_BX
 #define EXIT   ASM_CLAC ;      \
                ret
 
 .text
 ENTRY(__put_user_1)
        ENTER
-       cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
+       cmp TASK_addr_limit(%_ASM_BX),%_ASM_CX
        jae bad_put_user
        ASM_STAC
 1:     movb %al,(%_ASM_CX)
@@ -46,7 +46,7 @@ ENDPROC(__put_user_1)
 
 ENTRY(__put_user_2)
        ENTER
-       mov TI_addr_limit(%_ASM_BX),%_ASM_BX
+       mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
        sub $1,%_ASM_BX
        cmp %_ASM_BX,%_ASM_CX
        jae bad_put_user
@@ -58,7 +58,7 @@ ENDPROC(__put_user_2)
 
 ENTRY(__put_user_4)
        ENTER
-       mov TI_addr_limit(%_ASM_BX),%_ASM_BX
+       mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
        sub $3,%_ASM_BX
        cmp %_ASM_BX,%_ASM_CX
        jae bad_put_user
@@ -70,7 +70,7 @@ ENDPROC(__put_user_4)
 
 ENTRY(__put_user_8)
        ENTER
-       mov TI_addr_limit(%_ASM_BX),%_ASM_BX
+       mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
        sub $7,%_ASM_BX
        cmp %_ASM_BX,%_ASM_CX
        jae bad_put_user