Skip to content

Commit 02a029b

Browse files
Roland McGrathtorvalds
Roland McGrath
authored and
torvalds
committed
signals: s390: renumber TIF_RESTORE_SIGMASK
TIF_RESTORE_SIGMASK no longer needs to be in the _TIF_WORK_* masks. Those low bits are scarce, and are all used up now. Renumber TIF_RESTORE_SIGMASK to free one up. Signed-off-by: Roland 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 7648d96 commit 02a029b

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎arch/s390/kernel/entry.S

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC
4949
SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP
5050
SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE
5151

52-
_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
52+
_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
5353
_TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP )
54-
_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
54+
_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
5555
_TIF_MCCK_PENDING)
5656

5757
STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
@@ -316,7 +316,7 @@ sysc_work:
316316
bo BASED(sysc_mcck_pending)
317317
tm __TI_flags+3(%r9),_TIF_NEED_RESCHED
318318
bo BASED(sysc_reschedule)
319-
tm __TI_flags+3(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
319+
tm __TI_flags+3(%r9),_TIF_SIGPENDING
320320
bnz BASED(sysc_sigpending)
321321
tm __TI_flags+3(%r9),_TIF_RESTART_SVC
322322
bo BASED(sysc_restart)
@@ -342,7 +342,7 @@ sysc_mcck_pending:
342342
br %r1 # TIF bit will be cleared by handler
343343

344344
#
345-
# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
345+
# _TIF_SIGPENDING is set, call do_signal
346346
#
347347
sysc_sigpending:
348348
ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP
@@ -657,15 +657,15 @@ io_work:
657657
lr %r15,%r1
658658
#
659659
# One of the work bits is on. Find out which one.
660-
# Checked are: _TIF_SIGPENDING, _TIF_RESTORE_SIGMASK, _TIF_NEED_RESCHED
660+
# Checked are: _TIF_SIGPENDING, _TIF_NEED_RESCHED
661661
# and _TIF_MCCK_PENDING
662662
#
663663
io_work_loop:
664664
tm __TI_flags+3(%r9),_TIF_MCCK_PENDING
665665
bo BASED(io_mcck_pending)
666666
tm __TI_flags+3(%r9),_TIF_NEED_RESCHED
667667
bo BASED(io_reschedule)
668-
tm __TI_flags+3(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
668+
tm __TI_flags+3(%r9),_TIF_SIGPENDING
669669
bnz BASED(io_sigpending)
670670
b BASED(io_restore)
671671
io_work_done:
@@ -693,7 +693,7 @@ io_reschedule:
693693
b BASED(io_work_loop)
694694

695695
#
696-
# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
696+
# _TIF_SIGPENDING is set, call do_signal
697697
#
698698
io_sigpending:
699699
TRACE_IRQS_ON

‎arch/s390/kernel/entry64.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE
5252
STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
5353
STACK_SIZE = 1 << STACK_SHIFT
5454

55-
_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
55+
_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
5656
_TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP )
57-
_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
57+
_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
5858
_TIF_MCCK_PENDING)
5959

6060
#define BASED(name) name-system_call(%r13)
@@ -308,7 +308,7 @@ sysc_work:
308308
jo sysc_mcck_pending
309309
tm __TI_flags+7(%r9),_TIF_NEED_RESCHED
310310
jo sysc_reschedule
311-
tm __TI_flags+7(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
311+
tm __TI_flags+7(%r9),_TIF_SIGPENDING
312312
jnz sysc_sigpending
313313
tm __TI_flags+7(%r9),_TIF_RESTART_SVC
314314
jo sysc_restart
@@ -332,7 +332,7 @@ sysc_mcck_pending:
332332
jg s390_handle_mcck # TIF bit will be cleared by handler
333333

334334
#
335-
# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
335+
# _TIF_SIGPENDING is set, call do_signal
336336
#
337337
sysc_sigpending:
338338
ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP
@@ -648,7 +648,7 @@ io_work_loop:
648648
jo io_mcck_pending
649649
tm __TI_flags+7(%r9),_TIF_NEED_RESCHED
650650
jo io_reschedule
651-
tm __TI_flags+7(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
651+
tm __TI_flags+7(%r9),_TIF_SIGPENDING
652652
jnz io_sigpending
653653
j io_restore
654654
io_work_done:
@@ -674,7 +674,7 @@ io_reschedule:
674674
j io_work_loop
675675

676676
#
677-
# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
677+
# _TIF_SIGPENDING or is set, call do_signal
678678
#
679679
io_sigpending:
680680
TRACE_IRQS_ON

‎include/asm-s390/thread_info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ static inline struct thread_info *current_thread_info(void)
8989
* thread information flags bit numbers
9090
*/
9191
#define TIF_SYSCALL_TRACE 0 /* syscall trace active */
92-
#define TIF_RESTORE_SIGMASK 1 /* restore signal mask in do_signal() */
9392
#define TIF_SIGPENDING 2 /* signal pending */
9493
#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
9594
#define TIF_RESTART_SVC 4 /* restart svc with new svc number */
@@ -101,6 +100,7 @@ static inline struct thread_info *current_thread_info(void)
101100
TIF_NEED_RESCHED */
102101
#define TIF_31BIT 18 /* 32bit process */
103102
#define TIF_MEMDIE 19
103+
#define TIF_RESTORE_SIGMASK 20 /* restore signal mask in do_signal() */
104104

105105
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
106106
#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)

0 commit comments

Comments
 (0)