diff options
-rw-r--r-- | arch/s390/kernel/entry.S | 14 | ||||
-rw-r--r-- | arch/s390/kernel/entry64.S | 12 | ||||
-rw-r--r-- | include/asm-s390/thread_info.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 6766e37fe8ea..bdbb3bcd78a5 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
@@ -49,9 +49,9 @@ SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC | |||
49 | SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP | 49 | SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP |
50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE | 50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE |
51 | 51 | ||
52 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \ | 52 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ |
53 | _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP ) | 53 | _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 | \ |
55 | _TIF_MCCK_PENDING) | 55 | _TIF_MCCK_PENDING) |
56 | 56 | ||
57 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER | 57 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER |
@@ -316,7 +316,7 @@ sysc_work: | |||
316 | bo BASED(sysc_mcck_pending) | 316 | bo BASED(sysc_mcck_pending) |
317 | tm __TI_flags+3(%r9),_TIF_NEED_RESCHED | 317 | tm __TI_flags+3(%r9),_TIF_NEED_RESCHED |
318 | bo BASED(sysc_reschedule) | 318 | bo BASED(sysc_reschedule) |
319 | tm __TI_flags+3(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK) | 319 | tm __TI_flags+3(%r9),_TIF_SIGPENDING |
320 | bnz BASED(sysc_sigpending) | 320 | bnz BASED(sysc_sigpending) |
321 | tm __TI_flags+3(%r9),_TIF_RESTART_SVC | 321 | tm __TI_flags+3(%r9),_TIF_RESTART_SVC |
322 | bo BASED(sysc_restart) | 322 | bo BASED(sysc_restart) |
@@ -342,7 +342,7 @@ sysc_mcck_pending: | |||
342 | br %r1 # TIF bit will be cleared by handler | 342 | br %r1 # TIF bit will be cleared by handler |
343 | 343 | ||
344 | # | 344 | # |
345 | # _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal | 345 | # _TIF_SIGPENDING is set, call do_signal |
346 | # | 346 | # |
347 | sysc_sigpending: | 347 | sysc_sigpending: |
348 | ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP | 348 | ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP |
@@ -657,7 +657,7 @@ io_work: | |||
657 | lr %r15,%r1 | 657 | lr %r15,%r1 |
658 | # | 658 | # |
659 | # One of the work bits is on. Find out which one. | 659 | # 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 |
661 | # and _TIF_MCCK_PENDING | 661 | # and _TIF_MCCK_PENDING |
662 | # | 662 | # |
663 | io_work_loop: | 663 | io_work_loop: |
@@ -665,7 +665,7 @@ io_work_loop: | |||
665 | bo BASED(io_mcck_pending) | 665 | bo BASED(io_mcck_pending) |
666 | tm __TI_flags+3(%r9),_TIF_NEED_RESCHED | 666 | tm __TI_flags+3(%r9),_TIF_NEED_RESCHED |
667 | bo BASED(io_reschedule) | 667 | bo BASED(io_reschedule) |
668 | tm __TI_flags+3(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK) | 668 | tm __TI_flags+3(%r9),_TIF_SIGPENDING |
669 | bnz BASED(io_sigpending) | 669 | bnz BASED(io_sigpending) |
670 | b BASED(io_restore) | 670 | b BASED(io_restore) |
671 | io_work_done: | 671 | io_work_done: |
@@ -693,7 +693,7 @@ io_reschedule: | |||
693 | b BASED(io_work_loop) | 693 | b BASED(io_work_loop) |
694 | 694 | ||
695 | # | 695 | # |
696 | # _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal | 696 | # _TIF_SIGPENDING is set, call do_signal |
697 | # | 697 | # |
698 | io_sigpending: | 698 | io_sigpending: |
699 | TRACE_IRQS_ON | 699 | TRACE_IRQS_ON |
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index cd959c0b2e16..5a4a7bcd2bba 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
@@ -52,9 +52,9 @@ SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE | |||
52 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER | 52 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER |
53 | STACK_SIZE = 1 << STACK_SHIFT | 53 | STACK_SIZE = 1 << STACK_SHIFT |
54 | 54 | ||
55 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \ | 55 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \ |
56 | _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP ) | 56 | _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 | \ |
58 | _TIF_MCCK_PENDING) | 58 | _TIF_MCCK_PENDING) |
59 | 59 | ||
60 | #define BASED(name) name-system_call(%r13) | 60 | #define BASED(name) name-system_call(%r13) |
@@ -308,7 +308,7 @@ sysc_work: | |||
308 | jo sysc_mcck_pending | 308 | jo sysc_mcck_pending |
309 | tm __TI_flags+7(%r9),_TIF_NEED_RESCHED | 309 | tm __TI_flags+7(%r9),_TIF_NEED_RESCHED |
310 | jo sysc_reschedule | 310 | jo sysc_reschedule |
311 | tm __TI_flags+7(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK) | 311 | tm __TI_flags+7(%r9),_TIF_SIGPENDING |
312 | jnz sysc_sigpending | 312 | jnz sysc_sigpending |
313 | tm __TI_flags+7(%r9),_TIF_RESTART_SVC | 313 | tm __TI_flags+7(%r9),_TIF_RESTART_SVC |
314 | jo sysc_restart | 314 | jo sysc_restart |
@@ -332,7 +332,7 @@ sysc_mcck_pending: | |||
332 | jg s390_handle_mcck # TIF bit will be cleared by handler | 332 | jg s390_handle_mcck # TIF bit will be cleared by handler |
333 | 333 | ||
334 | # | 334 | # |
335 | # _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal | 335 | # _TIF_SIGPENDING is set, call do_signal |
336 | # | 336 | # |
337 | sysc_sigpending: | 337 | sysc_sigpending: |
338 | ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP | 338 | ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP |
@@ -648,7 +648,7 @@ io_work_loop: | |||
648 | jo io_mcck_pending | 648 | jo io_mcck_pending |
649 | tm __TI_flags+7(%r9),_TIF_NEED_RESCHED | 649 | tm __TI_flags+7(%r9),_TIF_NEED_RESCHED |
650 | jo io_reschedule | 650 | jo io_reschedule |
651 | tm __TI_flags+7(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK) | 651 | tm __TI_flags+7(%r9),_TIF_SIGPENDING |
652 | jnz io_sigpending | 652 | jnz io_sigpending |
653 | j io_restore | 653 | j io_restore |
654 | io_work_done: | 654 | io_work_done: |
@@ -674,7 +674,7 @@ io_reschedule: | |||
674 | j io_work_loop | 674 | j io_work_loop |
675 | 675 | ||
676 | # | 676 | # |
677 | # _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal | 677 | # _TIF_SIGPENDING or is set, call do_signal |
678 | # | 678 | # |
679 | io_sigpending: | 679 | io_sigpending: |
680 | TRACE_IRQS_ON | 680 | TRACE_IRQS_ON |
diff --git a/include/asm-s390/thread_info.h b/include/asm-s390/thread_info.h index 0a518915bf90..99bbed99a3b2 100644 --- a/include/asm-s390/thread_info.h +++ b/include/asm-s390/thread_info.h | |||
@@ -89,7 +89,6 @@ static inline struct thread_info *current_thread_info(void) | |||
89 | * thread information flags bit numbers | 89 | * thread information flags bit numbers |
90 | */ | 90 | */ |
91 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | 91 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ |
92 | #define TIF_RESTORE_SIGMASK 1 /* restore signal mask in do_signal() */ | ||
93 | #define TIF_SIGPENDING 2 /* signal pending */ | 92 | #define TIF_SIGPENDING 2 /* signal pending */ |
94 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ | 93 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ |
95 | #define TIF_RESTART_SVC 4 /* restart svc with new svc number */ | 94 | #define TIF_RESTART_SVC 4 /* restart svc with new svc number */ |
@@ -101,6 +100,7 @@ static inline struct thread_info *current_thread_info(void) | |||
101 | TIF_NEED_RESCHED */ | 100 | TIF_NEED_RESCHED */ |
102 | #define TIF_31BIT 18 /* 32bit process */ | 101 | #define TIF_31BIT 18 /* 32bit process */ |
103 | #define TIF_MEMDIE 19 | 102 | #define TIF_MEMDIE 19 |
103 | #define TIF_RESTORE_SIGMASK 20 /* restore signal mask in do_signal() */ | ||
104 | 104 | ||
105 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 105 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
106 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) | 106 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) |