Commit 66c1b6d7 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Thomas Gleixner
Browse files

x86: Move TS_COMPAT back to asm/thread_info.h 



Move TS_COMPAT back to asm/thread_info.h, close to TS_I386_REGS_POKED.

It was moved to asm/processor.h by b9d989c7 ("x86/asm: Move the
thread_info::status field to thread_struct"), then later 37a8f7c3
("x86/asm: Move 'status' from thread_struct to thread_info") moved the
'status' field back but TS_COMPAT was forgotten.

Preparatory patch to fix the COMPAT case for get_nr_restart_syscall()

Fixes: 609c19a3 ("x86/ptrace: Stop setting TS_COMPAT in ptrace code")
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210201174649.GA17880@redhat.com
parent 5abbe51a

arch/x86/include/asm/processor.h

+0 −9
Original line number Diff line number Diff line
@@ -551,15 +551,6 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset, 
	*size = fpu_kernel_xstate_size;

}



/*

 * Thread-synchronous status.

 *

 * This is different from the flags in that nobody else

 * ever touches our thread-synchronous status, so we don't

 * have to worry about atomic accesses.

 */

#define TS_COMPAT		0x0002	/* 32bit syscall active (64BIT)*/



static inline void

native_load_sp0(unsigned long sp0)

{

arch/x86/include/asm/thread_info.h

+9 −0
Original line number Diff line number Diff line
@@ -205,6 +205,15 @@ static inline int arch_within_stack_frames(const void * const stack, 


#endif



/*

 * Thread-synchronous status.

 *

 * This is different from the flags in that nobody else

 * ever touches our thread-synchronous status, so we don't

 * have to worry about atomic accesses.

 */

#define TS_COMPAT		0x0002	/* 32bit syscall active (64BIT)*/



#ifdef CONFIG_COMPAT

#define TS_I386_REGS_POKED	0x0004	/* regs poked by 32-bit ptracer */

#endif