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

Commit 49eaeb4b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

signals: ia64 renumber TIF_RESTORE_SIGMASK 



TIF_RESTORE_SIGMASK no longer needs to be in the _TIF_WORK_* masks.
Those low bits are scarce.  Renumber TIF_RESTORE_SIGMASK to free one up.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 02a029b3

arch/ia64/kernel/process.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ do_notify_resume_user (sigset_t *unused, struct sigscratch *scr, long in_syscall 
#endif

#endif





	/* deal with pending signal delivery */

	/* deal with pending signal delivery */

	if (test_thread_flag(TIF_SIGPENDING)||test_thread_flag(TIF_RESTORE_SIGMASK))

	if (test_thread_flag(TIF_SIGPENDING))

		ia64_do_signal(scr, in_syscall);

		ia64_do_signal(scr, in_syscall);





	/* copy user rbs to kernel rbs */

	/* copy user rbs to kernel rbs */

include/asm-ia64/thread_info.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -101,7 +101,6 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk); 
#define TIF_SYSCALL_TRACE	2	/* syscall trace active */

#define TIF_SYSCALL_TRACE	2	/* syscall trace active */

#define TIF_SYSCALL_AUDIT	3	/* syscall auditing active */

#define TIF_SYSCALL_AUDIT	3	/* syscall auditing active */

#define TIF_SINGLESTEP		4	/* restore singlestep on return to user mode */

#define TIF_SINGLESTEP		4	/* restore singlestep on return to user mode */

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

#define TIF_NOTIFY_RESUME	6	/* resumption notification requested */

#define TIF_NOTIFY_RESUME	6	/* resumption notification requested */

#define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */

#define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */

#define TIF_MEMDIE		17

#define TIF_MEMDIE		17
@@ -109,6 +108,7 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk); 
#define TIF_DB_DISABLED		19	/* debug trap disabled for fsyscall */

#define TIF_DB_DISABLED		19	/* debug trap disabled for fsyscall */

#define TIF_FREEZE		20	/* is freezing for suspend */

#define TIF_FREEZE		20	/* is freezing for suspend */

#define TIF_RESTORE_RSE		21	/* user RBS is newer than kernel RBS */

#define TIF_RESTORE_RSE		21	/* user RBS is newer than kernel RBS */

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





#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
@@ -126,8 +126,7 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk); 




/* "work to do on user-return" bits */

/* "work to do on user-return" bits */

#define TIF_ALLWORK_MASK	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SYSCALL_AUDIT|\

#define TIF_ALLWORK_MASK	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SYSCALL_AUDIT|\

				 _TIF_NEED_RESCHED| _TIF_SYSCALL_TRACE|\

				 _TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE)

				 _TIF_RESTORE_SIGMASK)

/* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */

/* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */

#define TIF_WORK_MASK		(TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))

#define TIF_WORK_MASK		(TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))