[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-73bb4d6cd192b8629c5125aaada9892d9fc986b6@git.kernel.org>
Date: Mon, 14 May 2018 05:39:46 -0700
From: tip-bot for Ingo Molnar <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, dave.hansen@...ux.intel.com,
torvalds@...ux-foundation.org, mingo@...nel.org,
linux-kernel@...r.kernel.org, tglx@...utronix.de,
peterz@...radead.org
Subject: [tip:x86/urgent] x86/mpx/selftests: Adjust the self-test to fresh
distros that export the MPX ABI
Commit-ID: 73bb4d6cd192b8629c5125aaada9892d9fc986b6
Gitweb: https://git.kernel.org/tip/73bb4d6cd192b8629c5125aaada9892d9fc986b6
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Mon, 14 May 2018 10:59:08 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 14 May 2018 11:14:45 +0200
x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI
Fix this warning:
mpx-mini-test.c:422:0: warning: "SEGV_BNDERR" redefined
Cc: Dave Hansen <dave.hansen@...ux.intel.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: akpm@...ux-foundation.org
Cc: dave.hansen@...el.com
Cc: linux-mm@...ck.org
Cc: linuxram@...ibm.com
Cc: mpe@...erman.id.au
Cc: shakeelb@...gle.com
Cc: shuah@...nel.org
Link: http://lkml.kernel.org/r/20180514085908.GA12798@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
tools/testing/selftests/x86/mpx-mini-test.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/x86/mpx-mini-test.c b/tools/testing/selftests/x86/mpx-mini-test.c
index 9c0325e1ea68..50f7e9272481 100644
--- a/tools/testing/selftests/x86/mpx-mini-test.c
+++ b/tools/testing/selftests/x86/mpx-mini-test.c
@@ -368,6 +368,11 @@ static int expected_bnd_index = -1;
uint64_t shadow_plb[NR_MPX_BOUNDS_REGISTERS][2]; /* shadow MPX bound registers */
unsigned long shadow_map[NR_MPX_BOUNDS_REGISTERS];
+/* Failed address bound checks: */
+#ifndef SEGV_BNDERR
+# define SEGV_BNDERR 3
+#endif
+
/*
* The kernel is supposed to provide some information about the bounds
* exception in the siginfo. It should match what we have in the bounds
@@ -419,8 +424,6 @@ void handler(int signum, siginfo_t *si, void *vucontext)
br_count++;
dprintf1("#BR 0x%jx (total seen: %d)\n", status, br_count);
-#define SEGV_BNDERR 3 /* failed address bound checks */
-
dprintf2("Saw a #BR! status 0x%jx at %016lx br_reason: %jx\n",
status, ip, br_reason);
dprintf2("si_signo: %d\n", si->si_signo);
Powered by blists - more mailing lists