m68k: Revive _TIF_* masks
diff mbox series

Message ID 20200826122923.22821-1-geert@linux-m68k.org
State Accepted
Commit 62148d98590191f0515e89e7a6eed47bc5c51ae8
Headers show
Series
  • m68k: Revive _TIF_* masks
Related show

Commit Message

Geert Uytterhoeven Aug. 26, 2020, 12:29 p.m. UTC
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 <geert@linux-m68k.org>
---
 arch/m68k/include/asm/thread_info.h | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Greg Ungerer Aug. 27, 2020, 12:14 a.m. UTC | #1
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 <geert@linux-m68k.org>

Acked-by: Greg Ungerer <gerg@linux-m68k.org>

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 */
>
Geert Uytterhoeven Sept. 7, 2020, 8:50 a.m. UTC | #2
On Wed, Aug 26, 2020 at 2:29 PM Geert Uytterhoeven <geert@linux-m68k.org> 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 <geert@linux-m68k.org>

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

Gr{oetje,eeting}s,

                        Geert

Patch
diff mbox series

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 */