[PATCH] xtensa: uapi: Reuse asm-generic ucontext.h

[PATCH] xtensa: uapi: Reuse asm-generic ucontext.h

[Thomas Weißschuh]

Drop the custom definition which is the same as the generic one.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 arch/xtensa/include/asm/Kbuild     |  1 +
 arch/xtensa/include/asm/ucontext.h | 22 ----------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index 13fe45dea296..cfb4c5a22e91 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -6,5 +6,6 @@ generic-y += mcs_spinlock.h
 generic-y += parport.h
 generic-y += qrwlock.h
 generic-y += qspinlock.h
+generic-y += ucontext.h
 generic-y += user.h
 generic-y += text-patching.h
diff --git a/arch/xtensa/include/asm/ucontext.h b/arch/xtensa/include/asm/ucontext.h
deleted file mode 100644
index 94c94ed3e00a..000000000000
--- a/arch/xtensa/include/asm/ucontext.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * include/asm-xtensa/ucontext.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_UCONTEXT_H
-#define _XTENSA_UCONTEXT_H
-
-struct ucontext {
-	unsigned long	  uc_flags;
-	struct ucontext  *uc_link;
-	stack_t		  uc_stack;
-	struct sigcontext uc_mcontext;
-	sigset_t	  uc_sigmask;	/* mask last for extensibility */
-};
-
-#endif /* _XTENSA_UCONTEXT_H */

---
base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f
change-id: 20260314-uapi-ucontext-xtensa-9f1ae76f4c36

Best regards,
-- 
Thomas Weißschuh <linux@weissschuh.net>

Re: [PATCH] xtensa: uapi: Reuse asm-generic ucontext.h

[Max Filippov]

On Sat, Mar 14, 2026 at 5:15 AM Thomas Weißschuh <linux@weissschuh.net> wrote:
>
> Drop the custom definition which is the same as the generic one.
>
> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
> ---
>  arch/xtensa/include/asm/Kbuild     |  1 +
>  arch/xtensa/include/asm/ucontext.h | 22 ----------------------
>  2 files changed, 1 insertion(+), 22 deletions(-)

With this change the build fails, because there's no ucontext.h in the
include/asm-generic, only in the include/uapi/asm-generic, but you're
changing non-uapi part of the xtensa/include.
I've fixed this up and applied the fixed version to my xtensa tree.

-- 
Thanks.
-- Max