arm64: mte: Add specific SIGSEGV codes

Add MTE-specific SIGSEGV codes to siginfo.h and update the x86
BUILD_BUG_ON(NSIGSEGV != 7) compile check.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
[catalin.marinas@arm.com: renamed precise/imprecise to sync/async]
[catalin.marinas@arm.com: dropped #ifdef __aarch64__, renumbered]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Will Deacon <will@kernel.org>

diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c
index 9ccbf0576cd0ebe6b3cbb30d7f141fac1681ad13..a7f3e12cfbdb8b9001b06a1968c2753eb38e593a 100644 (file)
--- a/arch/x86/kernel/signal_compat.c
+++ b/arch/x86/kernel/signal_compat.c
@@ -27,7 +27,7 @@ static inline void signal_compat_build_tests(void)
         */
        BUILD_BUG_ON(NSIGILL  != 11);
        BUILD_BUG_ON(NSIGFPE  != 15);
-       BUILD_BUG_ON(NSIGSEGV != 7);
+       BUILD_BUG_ON(NSIGSEGV != 9);
        BUILD_BUG_ON(NSIGBUS  != 5);
        BUILD_BUG_ON(NSIGTRAP != 5);
        BUILD_BUG_ON(NSIGCHLD != 6);

diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index cb3d6c2671812bc1bb5f99226c93a92be17a3e8b..7aacf9389010f93638b106d408a746923fd3cb81 100644 (file)
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -229,7 +229,9 @@ typedef struct siginfo {
 #define SEGV_ACCADI    5       /* ADI not enabled for mapped object */
 #define SEGV_ADIDERR   6       /* Disrupting MCD error */
 #define SEGV_ADIPERR   7       /* Precise MCD exception */
-#define NSIGSEGV       7
+#define SEGV_MTEAERR   8       /* Asynchronous ARM MTE error */
+#define SEGV_MTESERR   9       /* Synchronous ARM MTE exception */
+#define NSIGSEGV       9
 
 /*
  * SIGBUS si_codes