Skip to content

Commit 66c1b6d

Browse files
oleg-nesterovKAGA-KOKO
authored andcommitted
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 b9d989c ("x86/asm: Move the thread_info::status field to thread_struct"), then later 37a8f7c ("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: 609c19a ("x86/ptrace: Stop setting TS_COMPAT in ptrace code") Signed-off-by: Oleg Nesterov <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent 5abbe51 commit 66c1b6d

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

arch/x86/include/asm/processor.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -551,15 +551,6 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset,
551551
*size = fpu_kernel_xstate_size;
552552
}
553553

554-
/*
555-
* Thread-synchronous status.
556-
*
557-
* This is different from the flags in that nobody else
558-
* ever touches our thread-synchronous status, so we don't
559-
* have to worry about atomic accesses.
560-
*/
561-
#define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/
562-
563554
static inline void
564555
native_load_sp0(unsigned long sp0)
565556
{

arch/x86/include/asm/thread_info.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,15 @@ static inline int arch_within_stack_frames(const void * const stack,
205205

206206
#endif
207207

208+
/*
209+
* Thread-synchronous status.
210+
*
211+
* This is different from the flags in that nobody else
212+
* ever touches our thread-synchronous status, so we don't
213+
* have to worry about atomic accesses.
214+
*/
215+
#define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/
216+
208217
#ifdef CONFIG_COMPAT
209218
#define TS_I386_REGS_POKED 0x0004 /* regs poked by 32-bit ptracer */
210219
#endif

0 commit comments

Comments
 (0)