From: Quanyang Wang <quanyang.w...@windriver.com> In upstream commit 7578a7c0f296b ("ARM: renumber bits related to _TIF_WORK_MASK"), the macros TIF_SYSCALL_AUDIT,TIF_SYSCALL_TRACEPOINT and TIF_SECCOMP have been redefined to 21~23. But during merging, the old values are brought back and now these macros are defined twice, so we need drop the old values and place TIF_NOTIFY_SIGNAL and TIF_NEED_RESCHED_LAZY in the right position.
It's to fix the warning: arch/arm/include/asm/thread_info.h:136: warning: "TIF_NOTIFY_SIGNAL" redefined 136 | #define TIF_NOTIFY_SIGNAL 8 /* signal notifications exist */ | arch/arm/include/asm/thread_info.h:132: note: this is the location of the previous definition 132 | #define TIF_NOTIFY_SIGNAL 4 /* signal notifications exist */ Signed-off-by: Quanyang Wang <quanyang.w...@windriver.com> --- Hi Bruce, Would you please help merge this patch to the branch: v6.1/standard/preempt-rt/base Thanks, Quanyang --- arch/arm/include/asm/thread_info.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index a0960a7ecb1f0..ffcbf8ebed4bf 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -130,11 +130,7 @@ 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_NOTIFY_SIGNAL 8 /* signal notifications exist */ -#define TIF_NEED_RESCHED_LAZY 9 +#define TIF_NEED_RESCHED_LAZY 5 #define TIF_USING_IWMMXT 17 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ -- 2.36.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12628): https://lists.yoctoproject.org/g/linux-yocto/message/12628 Mute This Topic: https://lists.yoctoproject.org/mt/99006201/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-