Commit 00c1bb13 authored by Christoph Lameter's avatar Christoph Lameter Committed by Ingo Molnar
Browse files

x86: thread_info: merge tif masks 



The TIF masks are basically the same. x86_32 also has _TIF_SYSCALL_EMU which is
zero for the 64 bit case. The tif masks become the same.

x86_64 has an additional _TIF_DONOTIFY_MASK. Does not hurt for the 32 bit case
since it is only used in x86_64 arch code.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e57549b0

include/asm-x86/thread_info.h

+21 −30
Original line number Diff line number Diff line
@@ -123,6 +123,27 @@ struct thread_info { 
#define _TIF_DS_AREA_MSR	(1 << TIF_DS_AREA_MSR)

#define _TIF_BTS_TRACE_TS	(1 << TIF_BTS_TRACE_TS)



/* work to do on interrupt/exception return */

#define _TIF_WORK_MASK							\

	(0x0000FFFF &							\

	 ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|	\

	 _TIF_SECCOMP|_TIF_SYSCALL_EMU))



/* work to do on any return to user space */

#define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP)



#define _TIF_DO_NOTIFY_MASK						\

	(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED)



/* flags to check in __switch_to() */

#define _TIF_WORK_CTXSW							\

	(_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS| \

								_TIF_NOTSC)



#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW

#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)





#define PREEMPT_ACTIVE		0x10000000



#ifdef CONFIG_X86_32
@@ -174,20 +195,6 @@ static inline struct thread_info *current_thread_info(void) 


#endif



/* work to do on interrupt/exception return */

#define _TIF_WORK_MASK							\

	(0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT |	\

			_TIF_SECCOMP | _TIF_SYSCALL_EMU))

/* work to do on any return to u-space */

#define _TIF_ALLWORK_MASK	(0x0000FFFF & ~_TIF_SECCOMP)



/* flags to check in __switch_to() */

#define _TIF_WORK_CTXSW						\

	(_TIF_IO_BITMAP | _TIF_NOTSC | _TIF_DEBUGCTLMSR |	\

	 _TIF_DS_AREA_MSR | _TIF_BTS_TRACE_TS)

#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW

#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW | _TIF_DEBUG)



#else /* X86_32 */



#include <asm/pda.h>
@@ -231,22 +238,6 @@ static inline struct thread_info *stack_thread_info(void) 


#endif



/* work to do on interrupt/exception return */

#define _TIF_WORK_MASK							\

	(0x0000FFFF &							\

	 ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|_TIF_SECCOMP))

/* work to do on any return to user space */

#define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP)



#define _TIF_DO_NOTIFY_MASK						\

	(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED)



/* flags to check in __switch_to() */

#define _TIF_WORK_CTXSW							\

	(_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS|_TIF_NOTSC)

#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW

#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)



#endif /* !X86_32 */



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE