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

Commit 1c7d06d4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

revert: thread_info.h change 



temporarily revert parts of "signals: x86 TS_RESTORE_SIGMASK".

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 492c2e47

include/asm-x86/thread_info_32.h

+2 −11
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static inline struct thread_info *current_thread_info(void) 
#define TIF_SYSCALL_EMU		5	/* syscall emulation active */

#define TIF_SYSCALL_AUDIT	6	/* syscall auditing active */

#define TIF_SECCOMP		7	/* secure computing */

#define TIF_RESTORE_SIGMASK	8	/* restore signal mask in do_signal() */

#define TIF_HRTICK_RESCHED	9	/* reprogram hrtick timer */

#define TIF_MEMDIE		16

#define TIF_DEBUG		17	/* uses debug registers */
@@ -150,6 +151,7 @@ static inline struct thread_info *current_thread_info(void) 
#define _TIF_SYSCALL_EMU	(1 << TIF_SYSCALL_EMU)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)

#define _TIF_RESTORE_SIGMASK	(1 << TIF_RESTORE_SIGMASK)

#define _TIF_HRTICK_RESCHED	(1 << TIF_HRTICK_RESCHED)

#define _TIF_DEBUG		(1 << TIF_DEBUG)

#define _TIF_IO_BITMAP		(1 << TIF_IO_BITMAP)
@@ -186,20 +188,9 @@ static inline struct thread_info *current_thread_info(void) 
					   this quantum (SMP) */

#define TS_POLLING		0x0002	/* True if in idle loop

					   and not sleeping */

#define TS_RESTORE_SIGMASK	0x0004	/* restore signal mask in do_signal() */



#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)



#ifndef __ASSEMBLY__

#define HAVE_SET_RESTORE_SIGMASK	1

static inline void set_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	ti->status |= TS_RESTORE_SIGMASK;

	set_bit(TIF_SIGPENDING, &ti->flags);

}

#endif	/* !__ASSEMBLY__ */



#endif /* __KERNEL__ */



#endif /* _ASM_THREAD_INFO_H */

include/asm-x86/thread_info_64.h

+2 −11
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static inline struct thread_info *stack_thread_info(void) 
#define TIF_IRET		5	/* force IRET */

#define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */

#define TIF_SECCOMP		8	/* secure computing */

#define TIF_RESTORE_SIGMASK	9	/* restore signal mask in do_signal */

#define TIF_MCE_NOTIFY		10	/* notify userspace of an MCE */

#define TIF_HRTICK_RESCHED	11	/* reprogram hrtick timer */

/* 16 free */
@@ -132,6 +133,7 @@ static inline struct thread_info *stack_thread_info(void) 
#define _TIF_IRET		(1 << TIF_IRET)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)

#define _TIF_RESTORE_SIGMASK	(1 << TIF_RESTORE_SIGMASK)

#define _TIF_MCE_NOTIFY		(1 << TIF_MCE_NOTIFY)

#define _TIF_HRTICK_RESCHED	(1 << TIF_HRTICK_RESCHED)

#define _TIF_IA32		(1 << TIF_IA32)
@@ -176,20 +178,9 @@ static inline struct thread_info *stack_thread_info(void) 
#define TS_COMPAT		0x0002	/* 32bit syscall active */

#define TS_POLLING		0x0004	/* true if in idle loop

					   and not sleeping */

#define TS_RESTORE_SIGMASK	0x0008	/* restore signal mask in do_signal() */



#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)



#ifndef __ASSEMBLY__

#define HAVE_SET_RESTORE_SIGMASK	1

static inline void set_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	ti->status |= TS_RESTORE_SIGMASK;

	set_bit(TIF_SIGPENDING, &ti->flags);

}

#endif	/* !__ASSEMBLY__ */



#endif /* __KERNEL__ */



#endif /* _ASM_THREAD_INFO_H */