From: Kevin Hao <[email protected]>

The commit 82f18d6a09c0 ("arm: merge fixup for duplicate
TIF_NOTIFY_SIGNAL and other TIF_*") tried to fix the duplicate macro
warning on rt kernel. But after that change, the new values of the TIF_*
would cause the following assembler errors:
  arch/arm/kernel/entry-common.S: Assembler messages:
  arch/arm/kernel/entry-common.S:103: Error: invalid constant (1000e0) after 
fixup
  arch/arm/kernel/entry-common.S:286: Error: invalid constant (1000e0) after 
fixup

So adjust the value of TIF_* to make the assembler happy. After this
change, the TIF_* macros are the same as the ones in linux-6.2.y-rt.

Signed-off-by: Kevin Hao <[email protected]>
---
Hi Bruce,

Please help me merge this into the v5.15/standard/preempt-rt/base
branch.

 arch/arm/include/asm/thread_info.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/include/asm/thread_info.h 
b/arch/arm/include/asm/thread_info.h
index dc192d3bb4f8..d0ad47b598ee 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -135,15 +135,15 @@ extern int vfp_restore_user_hwstate(struct user_vfp *,
 #define TIF_NOTIFY_RESUME      2       /* callback before returning to user */
 #define TIF_UPROBE             3       /* breakpointed or singlestepping */
 #define TIF_NOTIFY_SIGNAL      4       /* signal notifications exist */
-#define TIF_SYSCALL_AUDIT      5       /* syscall auditing active */
-#define TIF_SYSCALL_TRACEPOINT 6       /* syscall tracepoint instrumentation */
-#define TIF_SECCOMP            7       /* seccomp syscall filtering active */
-#define TIF_NEED_RESCHED_LAZY  8
+#define TIF_NEED_RESCHED_LAZY  5
 
 #define TIF_USING_IWMMXT       17
 #define TIF_MEMDIE             18      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK    19
 #define TIF_SYSCALL_TRACE      20      /* syscall trace active */
+#define TIF_SYSCALL_AUDIT      21      /* syscall auditing active */
+#define TIF_SYSCALL_TRACEPOINT 22      /* syscall tracepoint instrumentation */
+#define TIF_SECCOMP            23      /* seccomp syscall filtering active */
 
 
 #define _TIF_SIGPENDING                (1 << TIF_SIGPENDING)
-- 
2.38.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12137): 
https://lists.yoctoproject.org/g/linux-yocto/message/12137
Mute This Topic: https://lists.yoctoproject.org/mt/96737798/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to