2021-05-05 14:16:20

by Eric W. Biederman

Subject: [PATCH v3 08/12] signal: Remove __ARCH_SI_TRAPNO

From: "Eric W. Biederman" <[email protected]>

Now that this define is no longer used remove it from the kernel.

v1: https://lkml.kernel.org/r/[email protected]
Signed-off-by: "Eric W. Biederman" <[email protected]>
---
arch/alpha/include/uapi/asm/siginfo.h | 2 --
arch/mips/include/uapi/asm/siginfo.h | 2 --
arch/sparc/include/uapi/asm/siginfo.h | 3 ---
3 files changed, 7 deletions(-)

diff --git a/arch/alpha/include/uapi/asm/siginfo.h b/arch/alpha/include/uapi/asm/siginfo.h
index 6e1a2af2f962..e08eae88182b 100644
--- a/arch/alpha/include/uapi/asm/siginfo.h
+++ b/arch/alpha/include/uapi/asm/siginfo.h
@@ -2,8 +2,6 @@
#ifndef _ALPHA_SIGINFO_H
#define _ALPHA_SIGINFO_H

-#define __ARCH_SI_TRAPNO
-
#include <asm-generic/siginfo.h>

#endif
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
index c34c7eef0a1c..8cb8bd061a68 100644
--- a/arch/mips/include/uapi/asm/siginfo.h
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -10,9 +10,7 @@
#ifndef _UAPI_ASM_SIGINFO_H
#define _UAPI_ASM_SIGINFO_H

-
#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
-#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ... */

#define __ARCH_HAS_SWAPPED_SIGINFO

diff --git a/arch/sparc/include/uapi/asm/siginfo.h b/arch/sparc/include/uapi/asm/siginfo.h
index 68bdde4c2a2e..0e7c27522aed 100644
--- a/arch/sparc/include/uapi/asm/siginfo.h
+++ b/arch/sparc/include/uapi/asm/siginfo.h
@@ -8,9 +8,6 @@

#endif /* defined(__sparc__) && defined(__arch64__) */

-
-#define __ARCH_SI_TRAPNO
-
#include <asm-generic/siginfo.h>


--
2.30.1

2021-05-05 17:55:20

by Marco Elver

Subject: Re: [PATCH v3 08/12] signal: Remove __ARCH_SI_TRAPNO

On Wed, 5 May 2021 at 16:11, Eric W. Beiderman <[email protected]> wrote:
> From: "Eric W. Biederman" <[email protected]>
>
> Now that this define is no longer used remove it from the kernel.
>
> v1: https://lkml.kernel.org/r/[email protected]
> Signed-off-by: "Eric W. Biederman" <[email protected]>

Reviewed-by: Marco Elver <[email protected]>



> ---
> arch/alpha/include/uapi/asm/siginfo.h | 2 --
> arch/mips/include/uapi/asm/siginfo.h | 2 --
> arch/sparc/include/uapi/asm/siginfo.h | 3 ---
> 3 files changed, 7 deletions(-)
>
> diff --git a/arch/alpha/include/uapi/asm/siginfo.h b/arch/alpha/include/uapi/asm/siginfo.h
> index 6e1a2af2f962..e08eae88182b 100644
> --- a/arch/alpha/include/uapi/asm/siginfo.h
> +++ b/arch/alpha/include/uapi/asm/siginfo.h
> @@ -2,8 +2,6 @@
> #ifndef _ALPHA_SIGINFO_H
> #define _ALPHA_SIGINFO_H
>
> -#define __ARCH_SI_TRAPNO
> -
> #include <asm-generic/siginfo.h>
>
> #endif
> diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
> index c34c7eef0a1c..8cb8bd061a68 100644
> --- a/arch/mips/include/uapi/asm/siginfo.h
> +++ b/arch/mips/include/uapi/asm/siginfo.h
> @@ -10,9 +10,7 @@
> #ifndef _UAPI_ASM_SIGINFO_H
> #define _UAPI_ASM_SIGINFO_H
>
> -
> #define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
> -#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ... */
>
> #define __ARCH_HAS_SWAPPED_SIGINFO
>
> diff --git a/arch/sparc/include/uapi/asm/siginfo.h b/arch/sparc/include/uapi/asm/siginfo.h
> index 68bdde4c2a2e..0e7c27522aed 100644
> --- a/arch/sparc/include/uapi/asm/siginfo.h
> +++ b/arch/sparc/include/uapi/asm/siginfo.h
> @@ -8,9 +8,6 @@
>
> #endif /* defined(__sparc__) && defined(__arch64__) */
>
> -
> -#define __ARCH_SI_TRAPNO
> -
> #include <asm-generic/siginfo.h>
>
>
> --
> 2.30.1