Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a404842 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Jiri Kosina
Browse files

x86/entry: define _TIF_ALLWORK_MASK flags explicitly 



The _TIF_ALLWORK_MASK macro automatically includes the least-significant
16 bits of the thread_info flags, which is less than obvious and tends
to create confusion and surprises when reading or modifying the code.

Define the flags explicitly.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Reviewed-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Acked-by: Ingo Molnar <mingo@kernel.org>        # for the x86 changes
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent af085d90

arch/x86/include/asm/thread_info.h

+5 −6
Original line number Diff line number Diff line
@@ -73,9 +73,6 @@ struct thread_info { 
 * thread information flags

 * - these are process state flags that various assembly files

 *   may need to access

 * - pending work-to-be-done flags are in LSW

 * - other flags in MSW

 * Warning: layout of LSW is hardcoded in entry.S

 */

#define TIF_SYSCALL_TRACE	0	/* syscall trace active */

#define TIF_NOTIFY_RESUME	1	/* callback before returning to user */
@@ -103,8 +100,8 @@ struct thread_info { 
#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)

#define _TIF_SINGLESTEP		(1 << TIF_SINGLESTEP)

#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)

#define _TIF_SINGLESTEP		(1 << TIF_SINGLESTEP)

#define _TIF_SYSCALL_EMU	(1 << TIF_SYSCALL_EMU)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)
@@ -133,8 +130,10 @@ struct thread_info { 


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

#define _TIF_ALLWORK_MASK						\

	((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT |	\

	_TIF_NOHZ)

	(_TIF_SYSCALL_TRACE | _TIF_NOTIFY_RESUME | _TIF_SIGPENDING |	\

	 _TIF_NEED_RESCHED | _TIF_SINGLESTEP | _TIF_SYSCALL_EMU |	\

	 _TIF_SYSCALL_AUDIT | _TIF_USER_RETURN_NOTIFY | _TIF_UPROBE |	\

	 _TIF_NOHZ | _TIF_SYSCALL_TRACEPOINT)



/* flags to check in __switch_to() */

#define _TIF_WORK_CTXSW							\