1 files changed, 12 insertions, 11 deletions

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 07d69f262337..466b9284ed2f 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -168,13 +168,13 @@ ENTRY(ret_from_fork)
         CFI_ADJUST_CFA_OFFSET -4
         call schedule_tail
         GET_THREAD_INFO(%rcx)
-        testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),threadinfo_flags(%rcx)
+        testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
         jnz rff_trace
 rff_action:     
         RESTORE_REST
         testl $3,CS-ARGOFFSET(%rsp)     # from kernel_thread?
         je   int_ret_from_sys_call
-        testl $_TIF_IA32,threadinfo_flags(%rcx)
+        testl $_TIF_IA32,TI_flags(%rcx)
         jnz  int_ret_from_sys_call
         RESTORE_TOP_OF_STACK %rdi,ARGOFFSET
         jmp ret_from_sys_call
@@ -243,7 +243,8 @@ ENTRY(system_call_after_swapgs)
         movq  %rcx,RIP-ARGOFFSET(%rsp)
         CFI_REL_OFFSET rip,RIP-ARGOFFSET
         GET_THREAD_INFO(%rcx)
-        testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%rcx)
+        testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP), \
+                TI_flags(%rcx)
         jnz tracesys
         cmpq $__NR_syscall_max,%rax
         ja badsys
@@ -262,7 +263,7 @@ sysret_check:
         GET_THREAD_INFO(%rcx)
         DISABLE_INTERRUPTS(CLBR_NONE)
         TRACE_IRQS_OFF
-        movl threadinfo_flags(%rcx),%edx
+        movl TI_flags(%rcx),%edx
         andl %edi,%edx
         jnz  sysret_careful 
         CFI_REMEMBER_STATE
@@ -347,10 +348,10 @@ int_ret_from_sys_call:
 int_with_check:
         LOCKDEP_SYS_EXIT_IRQ
         GET_THREAD_INFO(%rcx)
-        movl threadinfo_flags(%rcx),%edx
+        movl TI_flags(%rcx),%edx
         andl %edi,%edx
         jnz   int_careful
-        andl    $~TS_COMPAT,threadinfo_status(%rcx)
+        andl    $~TS_COMPAT,TI_status(%rcx)
         jmp   retint_swapgs
 
         /* Either reschedule or signal or syscall exit tracking needed. */
@@ -558,7 +559,7 @@ retint_with_reschedule:
         movl $_TIF_WORK_MASK,%edi
 retint_check:
         LOCKDEP_SYS_EXIT_IRQ
-        movl threadinfo_flags(%rcx),%edx
+        movl TI_flags(%rcx),%edx
         andl %edi,%edx
         CFI_REMEMBER_STATE
         jnz  retint_careful
@@ -654,9 +655,9 @@ retint_signal:
         /* Returning to kernel space. Check if we need preemption */
         /* rcx:  threadinfo. interrupts off. */
 ENTRY(retint_kernel)
-        cmpl $0,threadinfo_preempt_count(%rcx)
+        cmpl $0,TI_preempt_count(%rcx)
         jnz  retint_restore_args
-        bt  $TIF_NEED_RESCHED,threadinfo_flags(%rcx)
+        bt  $TIF_NEED_RESCHED,TI_flags(%rcx)
         jnc  retint_restore_args
         bt   $9,EFLAGS-ARGOFFSET(%rsp)  /* interrupts off? */
         jnc  retint_restore_args
@@ -819,7 +820,7 @@ paranoid_restore\trace:
         jmp irq_return
 paranoid_userspace\trace:
         GET_THREAD_INFO(%rcx)
-        movl threadinfo_flags(%rcx),%ebx
+        movl TI_flags(%rcx),%ebx
         andl $_TIF_WORK_MASK,%ebx
         jz paranoid_swapgs\trace
         movq %rsp,%rdi                  /* &pt_regs */
@@ -917,7 +918,7 @@ error_exit:
         testl %eax,%eax
         jne  retint_kernel
         LOCKDEP_SYS_EXIT_IRQ
-        movl  threadinfo_flags(%rcx),%edx
+        movl  TI_flags(%rcx),%edx
         movl  $_TIF_WORK_MASK,%edi
         andl  %edi,%edx
         jnz  retint_careful