Commit 8d71d2bf authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Thomas Gleixner
Browse files

x86: Reclaim TIF_IA32 and TIF_X32 



Now that these flags are no longer used, reclaim those TIF bits.

Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201004032536.1229030-11-krisman@collabora.com
parent ff170cd0

arch/x86/include/asm/thread_info.h

+0 −4
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ struct thread_info { 
#define TIF_NEED_FPU_LOAD	14	/* load FPU on return to userspace */

#define TIF_NOCPUID		15	/* CPUID is not accessible in userland */

#define TIF_NOTSC		16	/* TSC is not accessible in userland */

#define TIF_IA32		17	/* IA32 compatibility process */

#define TIF_SLD			18	/* Restore split lock detection on context switch */

#define TIF_MEMDIE		20	/* is terminating due to OOM killer */

#define TIF_POLLING_NRFLAG	21	/* idle is polling for TIF_NEED_RESCHED */
@@ -101,7 +100,6 @@ struct thread_info { 
#define TIF_LAZY_MMU_UPDATES	27	/* task is updating the mmu lazily */

#define TIF_SYSCALL_TRACEPOINT	28	/* syscall tracepoint instrumentation */

#define TIF_ADDR32		29	/* 32-bit address space on 64 bits */

#define TIF_X32			30	/* 32-bit native x86-64 binary */



#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
@@ -120,7 +118,6 @@ struct thread_info { 
#define _TIF_NEED_FPU_LOAD	(1 << TIF_NEED_FPU_LOAD)

#define _TIF_NOCPUID		(1 << TIF_NOCPUID)

#define _TIF_NOTSC		(1 << TIF_NOTSC)

#define _TIF_IA32		(1 << TIF_IA32)

#define _TIF_SLD		(1 << TIF_SLD)

#define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)

#define _TIF_IO_BITMAP		(1 << TIF_IO_BITMAP)
@@ -129,7 +126,6 @@ struct thread_info { 
#define _TIF_LAZY_MMU_UPDATES	(1 << TIF_LAZY_MMU_UPDATES)

#define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)

#define _TIF_ADDR32		(1 << TIF_ADDR32)

#define _TIF_X32		(1 << TIF_X32)



/* flags to check in __switch_to() */

#define _TIF_WORK_CTXSW_BASE					\

arch/x86/kernel/process_64.c

+0 −6
Original line number Diff line number Diff line
@@ -640,9 +640,7 @@ void set_personality_64bit(void) 
	/* inherit personality from parent */



	/* Make sure to be in 64bit mode */

	clear_thread_flag(TIF_IA32);

	clear_thread_flag(TIF_ADDR32);

	clear_thread_flag(TIF_X32);

	/* Pretend that this comes from a 64bit execve */

	task_pt_regs(current)->orig_ax = __NR_execve;

	current_thread_info()->status &= ~TS_COMPAT;
@@ -659,8 +657,6 @@ void set_personality_64bit(void) 
static void __set_personality_x32(void)

{

#ifdef CONFIG_X86_X32

	clear_thread_flag(TIF_IA32);

	set_thread_flag(TIF_X32);

	if (current->mm)

		current->mm->context.flags = 0;
@@ -681,8 +677,6 @@ static void __set_personality_x32(void) 
static void __set_personality_ia32(void)

{

#ifdef CONFIG_IA32_EMULATION

	set_thread_flag(TIF_IA32);

	clear_thread_flag(TIF_X32);

	if (current->mm) {

		/*

		 * uprobes applied to this MM need to know this and