In message: [PATCH v5.15-rt] arm: merge fixup for duplicate TIF_NOTIFY_SIGNAL
and other TIF_*
on 27/01/2023 Paul Gortmaker wrote:
> This linux-stable backport:
>
> commit 855edc4ec64c197427e492c029dbf3230cc5f94c
> Author: Jens Axboe
> Date: Wed Jan 4 07:48:37 2023 -0700
>
> ARM: renumber bits related to _TIF_WORK_MASK
>
> commit 191f8453fc99a537ea78b727acea739782378b0d upstream.
>
> conflicts with the preempt-lazy patches from the -rt folks, resulting
> in some post merge duplicates and compile failures like:
>
> arch/arm/include/asm/thread_info.h:141: error: "TIF_NOTIFY_SIGNAL"
> redefined [-Werror]
>
> Ideally I would have copied the thread_info directly from the v5.15-rt
> branch of linux-stable-rt[1] so that we'd stay exactly aligned with -rt
> upstream for when/if we integrate future updates from the preempt-rt
> people, but they haven't yet integrated the v5.15.87 with the offending
> change yet.
>
> [1] git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git
>
> Signed-off-by: Paul Gortmaker
Thanks Paul.
There was a minor conflict on some of the preempt-rt BSP branches,
but it was easy enough to fix up. Hopefully we now have the TIF_
flags correct everywhere.
Bruce
>
> diff --git a/arch/arm/include/asm/thread_info.h
> b/arch/arm/include/asm/thread_info.h
> index 37124cda2ca7..3c1c08b27580 100644
> --- a/arch/arm/include/asm/thread_info.h
> +++ b/arch/arm/include/asm/thread_info.h
> @@ -134,16 +134,12 @@ extern int vfp_restore_user_hwstate(struct user_vfp *,
> #define TIF_SYSCALL_AUDIT5 /* syscall auditing active */
> #define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint
> instrumentation */
> #define TIF_SECCOMP 7 /* seccomp syscall filtering active */
> -#define TIF_NOTIFY_SIGNAL8 /* signal notifications exist */
> -#define TIF_NEED_RESCHED_LAZY9
> +#define TIF_NEED_RESCHED_LAZY8
>
> #define TIF_USING_IWMMXT 17
> #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
> #define TIF_RESTORE_SIGMASK 19
> #define TIF_SYSCALL_TRACE20 /* syscall trace active */
> -#define TIF_SYSCALL_AUDIT21 /* 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.17.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12126):
https://lists.yoctoproject.org/g/linux-yocto/message/12126
Mute This Topic: https://lists.yoctoproject.org/mt/96573785/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
