livepatch/s390: reorganize TIF thread flag bits

Group the TIF thread flag bits by their inclusion in the _TIF_WORK and
_TIF_TRACE macros.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 14 insertions, 8 deletions

diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index a5b54a445eb8..4977668788d7 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -51,14 +51,12 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
 /*
  * thread information flags bit numbers
  */
+/* _TIF_WORK bits */
 #define TIF_NOTIFY_RESUME       0       /* callback before returning to user */
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_SYSCALL_TRACE       3       /* syscall trace active */
-#define TIF_SYSCALL_AUDIT       4       /* syscall auditing active */
-#define TIF_SECCOMP             5       /* secure computing */
-#define TIF_SYSCALL_TRACEPOINT  6       /* syscall tracepoint instrumentation */
-#define TIF_UPROBE              7       /* breakpointed or single-stepping */
+#define TIF_UPROBE              3       /* breakpointed or single-stepping */
+
 #define TIF_31BIT               16      /* 32bit process */
 #define TIF_MEMDIE              17      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     18      /* restore signal mask in do_signal() */
@@ -66,15 +64,23 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
 #define TIF_BLOCK_STEP          20      /* This task is block stepped */
 #define TIF_UPROBE_SINGLESTEP   21      /* This task is uprobe single stepped */
 
+/* _TIF_TRACE bits */
+#define TIF_SYSCALL_TRACE       24      /* syscall trace active */
+#define TIF_SYSCALL_AUDIT       25      /* syscall auditing active */
+#define TIF_SECCOMP             26      /* secure computing */
+#define TIF_SYSCALL_TRACEPOINT  27      /* syscall tracepoint instrumentation */
+
 #define _TIF_NOTIFY_RESUME      _BITUL(TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         _BITUL(TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       _BITUL(TIF_NEED_RESCHED)
+#define _TIF_UPROBE             _BITUL(TIF_UPROBE)
+
+#define _TIF_31BIT              _BITUL(TIF_31BIT)
+#define _TIF_SINGLE_STEP        _BITUL(TIF_SINGLE_STEP)
+
 #define _TIF_SYSCALL_TRACE      _BITUL(TIF_SYSCALL_TRACE)
 #define _TIF_SYSCALL_AUDIT      _BITUL(TIF_SYSCALL_AUDIT)
 #define _TIF_SECCOMP            _BITUL(TIF_SECCOMP)
 #define _TIF_SYSCALL_TRACEPOINT _BITUL(TIF_SYSCALL_TRACEPOINT)
-#define _TIF_UPROBE             _BITUL(TIF_UPROBE)
-#define _TIF_31BIT              _BITUL(TIF_31BIT)
-#define _TIF_SINGLE_STEP        _BITUL(TIF_SINGLE_STEP)
 
 #endif /* _ASM_THREAD_INFO_H */