3 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
index ee1c3f635157..7eaaf0123b4d 100644
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
@@ -40,7 +40,7 @@ ENTRY(copy_to_user)
        movq %rdi,%rcx
        addq %rdx,%rcx
        jc  bad_to_user
-        cmpq threadinfo_addr_limit(%rax),%rcx
+        cmpq TI_addr_limit(%rax),%rcx
        jae bad_to_user
        xorl %eax,%eax  /* clear zero flag */
        ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
@@ -65,7 +65,7 @@ ENTRY(copy_from_user)
        movq %rsi,%rcx
        addq %rdx,%rcx
        jc  bad_from_user
-        cmpq threadinfo_addr_limit(%rax),%rcx
+        cmpq TI_addr_limit(%rax),%rcx
        jae  bad_from_user
        movl $1,%ecx    /* set zero flag */
        ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
diff --git a/arch/x86/lib/getuser_64.S b/arch/x86/lib/getuser_64.S
index df37d3a9ba2a..0ec7890f9dcc 100644
--- a/arch/x86/lib/getuser_64.S
+++ b/arch/x86/lib/getuser_64.S
@@ -37,7 +37,7 @@
 ENTRY(__get_user_1)
        CFI_STARTPROC
        GET_THREAD_INFO(%rdx)
-        cmpq threadinfo_addr_limit(%rdx),%rax
+        cmpq TI_addr_limit(%rdx),%rax
        jae bad_get_user
 1:      movzb (%rax),%edx
        xorl %eax,%eax
@@ -50,7 +50,7 @@ ENTRY(__get_user_2)
        addq $1,%rax
        jc bad_get_user
        GET_THREAD_INFO(%rdx)
-        cmpq threadinfo_addr_limit(%rdx),%rax
+        cmpq TI_addr_limit(%rdx),%rax
        jae bad_get_user
 2:      movzwl -1(%rax),%edx
        xorl %eax,%eax
@@ -63,7 +63,7 @@ ENTRY(__get_user_4)
        addq $3,%rax
        jc bad_get_user
        GET_THREAD_INFO(%rdx)
-        cmpq threadinfo_addr_limit(%rdx),%rax
+        cmpq TI_addr_limit(%rdx),%rax
        jae bad_get_user
 3:      movl -3(%rax),%edx
        xorl %eax,%eax
@@ -76,7 +76,7 @@ ENTRY(__get_user_8)
        addq $7,%rax
        jc bad_get_user
        GET_THREAD_INFO(%rdx)
-        cmpq threadinfo_addr_limit(%rdx),%rax
+        cmpq TI_addr_limit(%rdx),%rax
        jae     bad_get_user
 4:      movq -7(%rax),%rdx
        xorl %eax,%eax
diff --git a/arch/x86/lib/putuser_64.S b/arch/x86/lib/putuser_64.S
index 4989f5a8fa9b..940796fa0d98 100644
--- a/arch/x86/lib/putuser_64.S
+++ b/arch/x86/lib/putuser_64.S
@@ -35,7 +35,7 @@
 ENTRY(__put_user_1)
        CFI_STARTPROC
        GET_THREAD_INFO(%r8)
-        cmpq threadinfo_addr_limit(%r8),%rcx
+        cmpq TI_addr_limit(%r8),%rcx
        jae bad_put_user
 1:      movb %dl,(%rcx)
        xorl %eax,%eax
@@ -48,7 +48,7 @@ ENTRY(__put_user_2)
        GET_THREAD_INFO(%r8)
        addq $1,%rcx
        jc 20f
-        cmpq threadinfo_addr_limit(%r8),%rcx
+        cmpq TI_addr_limit(%r8),%rcx
        jae 20f
        decq %rcx
 2:      movw %dx,(%rcx)
@@ -64,7 +64,7 @@ ENTRY(__put_user_4)
        GET_THREAD_INFO(%r8)
        addq $3,%rcx
        jc 30f
-        cmpq threadinfo_addr_limit(%r8),%rcx
+        cmpq TI_addr_limit(%r8),%rcx
        jae 30f
        subq $3,%rcx
 3:      movl %edx,(%rcx)
@@ -80,7 +80,7 @@ ENTRY(__put_user_8)
        GET_THREAD_INFO(%r8)
        addq $7,%rcx
        jc 40f
-        cmpq threadinfo_addr_limit(%r8),%rcx
+        cmpq TI_addr_limit(%r8),%rcx
        jae 40f
        subq $7,%rcx
 4:      movq %rdx,(%rcx)

diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index ee1c3f635157..7eaaf0123b4d 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S
@@ -40,7 +40,7 @@ ENTRY(copy_to_user)
40	movq %rdi,%rcx	40	movq %rdi,%rcx
41	addq %rdx,%rcx	41	addq %rdx,%rcx
42	jc bad_to_user	42	jc bad_to_user
43	cmpq threadinfo_addr_limit(%rax),%rcx	43	cmpq TI_addr_limit(%rax),%rcx
44	jae bad_to_user	44	jae bad_to_user
45	xorl %eax,%eax /* clear zero flag */	45	xorl %eax,%eax /* clear zero flag */
46	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string	46	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
@@ -65,7 +65,7 @@ ENTRY(copy_from_user)
65	movq %rsi,%rcx	65	movq %rsi,%rcx
66	addq %rdx,%rcx	66	addq %rdx,%rcx
67	jc bad_from_user	67	jc bad_from_user
68	cmpq threadinfo_addr_limit(%rax),%rcx	68	cmpq TI_addr_limit(%rax),%rcx
69	jae bad_from_user	69	jae bad_from_user
70	movl $1,%ecx /* set zero flag */	70	movl $1,%ecx /* set zero flag */
71	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string	71	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string


diff --git a/arch/x86/lib/getuser_64.S b/arch/x86/lib/getuser_64.S index df37d3a9ba2a..0ec7890f9dcc 100644 --- a/arch/x86/lib/getuser_64.S +++ b/arch/x86/lib/getuser_64.S
@@ -37,7 +37,7 @@
37	ENTRY(__get_user_1)	37	ENTRY(__get_user_1)
38	CFI_STARTPROC	38	CFI_STARTPROC
39	GET_THREAD_INFO(%rdx)	39	GET_THREAD_INFO(%rdx)
40	cmpq threadinfo_addr_limit(%rdx),%rax	40	cmpq TI_addr_limit(%rdx),%rax
41	jae bad_get_user	41	jae bad_get_user
42	1: movzb (%rax),%edx	42	1: movzb (%rax),%edx
43	xorl %eax,%eax	43	xorl %eax,%eax
@@ -50,7 +50,7 @@ ENTRY(__get_user_2)
50	addq $1,%rax	50	addq $1,%rax
51	jc bad_get_user	51	jc bad_get_user
52	GET_THREAD_INFO(%rdx)	52	GET_THREAD_INFO(%rdx)
53	cmpq threadinfo_addr_limit(%rdx),%rax	53	cmpq TI_addr_limit(%rdx),%rax
54	jae bad_get_user	54	jae bad_get_user
55	2: movzwl -1(%rax),%edx	55	2: movzwl -1(%rax),%edx
56	xorl %eax,%eax	56	xorl %eax,%eax
@@ -63,7 +63,7 @@ ENTRY(__get_user_4)
63	addq $3,%rax	63	addq $3,%rax
64	jc bad_get_user	64	jc bad_get_user
65	GET_THREAD_INFO(%rdx)	65	GET_THREAD_INFO(%rdx)
66	cmpq threadinfo_addr_limit(%rdx),%rax	66	cmpq TI_addr_limit(%rdx),%rax
67	jae bad_get_user	67	jae bad_get_user
68	3: movl -3(%rax),%edx	68	3: movl -3(%rax),%edx
69	xorl %eax,%eax	69	xorl %eax,%eax
@@ -76,7 +76,7 @@ ENTRY(__get_user_8)
76	addq $7,%rax	76	addq $7,%rax
77	jc bad_get_user	77	jc bad_get_user
78	GET_THREAD_INFO(%rdx)	78	GET_THREAD_INFO(%rdx)
79	cmpq threadinfo_addr_limit(%rdx),%rax	79	cmpq TI_addr_limit(%rdx),%rax
80	jae bad_get_user	80	jae bad_get_user
81	4: movq -7(%rax),%rdx	81	4: movq -7(%rax),%rdx
82	xorl %eax,%eax	82	xorl %eax,%eax


diff --git a/arch/x86/lib/putuser_64.S b/arch/x86/lib/putuser_64.S index 4989f5a8fa9b..940796fa0d98 100644 --- a/arch/x86/lib/putuser_64.S +++ b/arch/x86/lib/putuser_64.S
@@ -35,7 +35,7 @@
35	ENTRY(__put_user_1)	35	ENTRY(__put_user_1)
36	CFI_STARTPROC	36	CFI_STARTPROC
37	GET_THREAD_INFO(%r8)	37	GET_THREAD_INFO(%r8)
38	cmpq threadinfo_addr_limit(%r8),%rcx	38	cmpq TI_addr_limit(%r8),%rcx
39	jae bad_put_user	39	jae bad_put_user
40	1: movb %dl,(%rcx)	40	1: movb %dl,(%rcx)
41	xorl %eax,%eax	41	xorl %eax,%eax
@@ -48,7 +48,7 @@ ENTRY(__put_user_2)
48	GET_THREAD_INFO(%r8)	48	GET_THREAD_INFO(%r8)
49	addq $1,%rcx	49	addq $1,%rcx
50	jc 20f	50	jc 20f
51	cmpq threadinfo_addr_limit(%r8),%rcx	51	cmpq TI_addr_limit(%r8),%rcx
52	jae 20f	52	jae 20f
53	decq %rcx	53	decq %rcx
54	2: movw %dx,(%rcx)	54	2: movw %dx,(%rcx)
@@ -64,7 +64,7 @@ ENTRY(__put_user_4)
64	GET_THREAD_INFO(%r8)	64	GET_THREAD_INFO(%r8)
65	addq $3,%rcx	65	addq $3,%rcx
66	jc 30f	66	jc 30f
67	cmpq threadinfo_addr_limit(%r8),%rcx	67	cmpq TI_addr_limit(%r8),%rcx
68	jae 30f	68	jae 30f
69	subq $3,%rcx	69	subq $3,%rcx
70	3: movl %edx,(%rcx)	70	3: movl %edx,(%rcx)
@@ -80,7 +80,7 @@ ENTRY(__put_user_8)
80	GET_THREAD_INFO(%r8)	80	GET_THREAD_INFO(%r8)
81	addq $7,%rcx	81	addq $7,%rcx
82	jc 40f	82	jc 40f
83	cmpq threadinfo_addr_limit(%r8),%rcx	83	cmpq TI_addr_limit(%r8),%rcx
84	jae 40f	84	jae 40f
85	subq $7,%rcx	85	subq $7,%rcx
86	4: movq %rdx,(%rcx)	86	4: movq %rdx,(%rcx)