2020-08-26 12:31:37

by Geert Uytterhoeven

[permalink] [raw]
Subject: [PATCH] m68k: Revive _TIF_* masks

While the core m68k code does not use the _TIF_* masks anymore, there
exists generic code that relies on their presence. Fortunately none of
that code is used on m68k, currently.

Re-add the various _TIF_* masks, which were removed in commit
cddafa3500fde4a0 ("m68k/m68knommu: merge MMU and non-MMU
thread_info.h"), to avoid future nasty surprises.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/asm/thread_info.h | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
index 015f1ca383053a39..3689c6718c883d23 100644
--- a/arch/m68k/include/asm/thread_info.h
+++ b/arch/m68k/include/asm/thread_info.h
@@ -68,4 +68,12 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_MEMDIE 16 /* is terminating due to OOM killer */
#define TIF_RESTORE_SIGMASK 18 /* restore signal mask in do_signal */

+#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
+#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
+#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
+#define _TIF_DELAYED_TRACE (1 << TIF_DELAYED_TRACE)
+#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
+#define _TIF_MEMDIE (1 << TIF_MEMDIE)
+#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
+
#endif /* _ASM_M68K_THREAD_INFO_H */
--
2.17.1


2020-08-27 00:16:54

by Greg Ungerer

[permalink] [raw]
Subject: Re: [PATCH] m68k: Revive _TIF_* masks

Hi Geert,

On 26/8/20 10:29 pm, Geert Uytterhoeven wrote:
> While the core m68k code does not use the _TIF_* masks anymore, there
> exists generic code that relies on their presence. Fortunately none of
> that code is used on m68k, currently.
>
> Re-add the various _TIF_* masks, which were removed in commit
> cddafa3500fde4a0 ("m68k/m68knommu: merge MMU and non-MMU
> thread_info.h"), to avoid future nasty surprises.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Acked-by: Greg Ungerer <[email protected]>

Regards
Greg


> arch/m68k/include/asm/thread_info.h | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
> index 015f1ca383053a39..3689c6718c883d23 100644
> --- a/arch/m68k/include/asm/thread_info.h
> +++ b/arch/m68k/include/asm/thread_info.h
> @@ -68,4 +68,12 @@ static inline struct thread_info *current_thread_info(void)
> #define TIF_MEMDIE 16 /* is terminating due to OOM killer */
> #define TIF_RESTORE_SIGMASK 18 /* restore signal mask in do_signal */
>
> +#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
> +#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
> +#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
> +#define _TIF_DELAYED_TRACE (1 << TIF_DELAYED_TRACE)
> +#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
> +#define _TIF_MEMDIE (1 << TIF_MEMDIE)
> +#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
> +
> #endif /* _ASM_M68K_THREAD_INFO_H */
>

2020-09-07 08:52:29

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] m68k: Revive _TIF_* masks

On Wed, Aug 26, 2020 at 2:29 PM Geert Uytterhoeven <[email protected]> wrote:
> While the core m68k code does not use the _TIF_* masks anymore, there
> exists generic code that relies on their presence. Fortunately none of
> that code is used on m68k, currently.
>
> Re-add the various _TIF_* masks, which were removed in commit
> cddafa3500fde4a0 ("m68k/m68knommu: merge MMU and non-MMU
> thread_info.h"), to avoid future nasty surprises.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Thanks, queueing in the m68k for-v5.10 branch.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds