|
 |
384337 |
commit 73354cff1aae409d6ef7d8a539a2a0a09c2480f9
|
|
|
384337 |
Author: Dmitry V. Levin <ldv@altlinux.org>
|
|
|
384337 |
Date: Wed Nov 1 00:20:44 2017 +0000
|
|
|
384337 |
|
|
|
384337 |
Update MEMBARRIER_CMD_* constants
|
|
|
384337 |
|
|
|
384337 |
* xlat/membarrier_cmds.in: Add MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED
|
|
|
384337 |
introduced by kernel commit v4.14-rc6~26.
|
|
|
384337 |
* tests/membarrier.c (main): Update expected output.
|
|
|
384337 |
|
|
|
384337 |
diff --git a/tests/membarrier.c b/tests/membarrier.c
|
|
|
384337 |
index 7d79724..75a8469 100644
|
|
|
384337 |
--- a/tests/membarrier.c
|
|
|
384337 |
+++ b/tests/membarrier.c
|
|
|
384337 |
@@ -55,6 +55,11 @@ main(void)
|
|
|
384337 |
text = "MEMBARRIER_CMD_SHARED|"
|
|
|
384337 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
384337 |
break;
|
|
|
384337 |
+ case 1|8|16:
|
|
|
384337 |
+ text = "MEMBARRIER_CMD_SHARED|"
|
|
|
384337 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
384337 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
384337 |
+ break;
|
|
|
384337 |
default:
|
|
|
384337 |
error_msg_and_fail("membarrier returned %#x, does"
|
|
|
384337 |
" the test have to be updated?", rc);
|
|
|
a22256 |
diff --git a/tests-m32/membarrier.c b/tests-m32/membarrier.c
|
|
|
a22256 |
index 7d79724..75a8469 100644
|
|
|
a22256 |
--- a/tests-m32/membarrier.c
|
|
|
a22256 |
+++ b/tests-m32/membarrier.c
|
|
|
a22256 |
@@ -55,6 +55,11 @@ main(void)
|
|
|
a22256 |
text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
+ case 1|8|16:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
default:
|
|
|
a22256 |
error_msg_and_fail("membarrier returned %#x, does"
|
|
|
a22256 |
" the test have to be updated?", rc);
|
|
|
a22256 |
diff --git a/tests-mx32/membarrier.c b/tests-mx32/membarrier.c
|
|
|
a22256 |
index 7d79724..75a8469 100644
|
|
|
a22256 |
--- a/tests-mx32/membarrier.c
|
|
|
a22256 |
+++ b/tests-mx32/membarrier.c
|
|
|
a22256 |
@@ -55,6 +55,11 @@ main(void)
|
|
|
a22256 |
text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
"MEMBARRIER_CMD_PRIVATE_EXPEDITED";
|
|
|
a22256 |
break;
|
|
|
a22256 |
+ case 1|8|16:
|
|
|
a22256 |
+ text = "MEMBARRIER_CMD_SHARED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_PRIVATE_EXPEDITED|"
|
|
|
a22256 |
+ "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED";
|
|
|
a22256 |
+ break;
|
|
|
a22256 |
default:
|
|
|
a22256 |
error_msg_and_fail("membarrier returned %#x, does"
|
|
|
a22256 |
" the test have to be updated?", rc);
|
|
|
384337 |
diff --git a/xlat/membarrier_cmds.in b/xlat/membarrier_cmds.in
|
|
|
384337 |
index 3baef17..e4fe06a 100644
|
|
|
384337 |
--- a/xlat/membarrier_cmds.in
|
|
|
384337 |
+++ b/xlat/membarrier_cmds.in
|
|
|
384337 |
@@ -1,3 +1,4 @@
|
|
|
384337 |
MEMBARRIER_CMD_QUERY 0
|
|
|
384337 |
MEMBARRIER_CMD_SHARED 1
|
|
|
384337 |
MEMBARRIER_CMD_PRIVATE_EXPEDITED 8
|
|
|
384337 |
+MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16
|
|
|
384337 |
diff -rup a/xlat/membarrier_cmds.h b/xlat/membarrier_cmds.h
|
|
|
384337 |
--- a/xlat/membarrier_cmds.h 2016-05-31 07:35:42.000000000 -0400
|
|
|
384337 |
+++ b/xlat/membarrier_cmds.h 2018-02-05 19:44:34.045234830 -0500
|
|
|
384337 |
@@ -5,6 +5,12 @@
|
|
|
384337 |
#if !(defined(MEMBARRIER_CMD_SHARED) || (defined(HAVE_DECL_MEMBARRIER_CMD_SHARED) && HAVE_DECL_MEMBARRIER_CMD_SHARED))
|
|
|
384337 |
# define MEMBARRIER_CMD_SHARED 1
|
|
|
384337 |
#endif
|
|
|
384337 |
+#if !(defined(MEMBARRIER_CMD_PRIVATE_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED))
|
|
|
384337 |
+# define MEMBARRIER_CMD_PRIVATE_EXPEDITED 8
|
|
|
384337 |
+#endif
|
|
|
384337 |
+#if !(defined(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED))
|
|
|
384337 |
+# define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16
|
|
|
384337 |
+#endif
|
|
|
384337 |
|
|
|
384337 |
#ifdef IN_MPERS
|
|
|
384337 |
|
|
|
384337 |
@@ -16,6 +22,8 @@ static
|
|
|
384337 |
const struct xlat membarrier_cmds[] = {
|
|
|
384337 |
XLAT(MEMBARRIER_CMD_QUERY),
|
|
|
384337 |
XLAT(MEMBARRIER_CMD_SHARED),
|
|
|
384337 |
+ XLAT(MEMBARRIER_CMD_PRIVATE_EXPEDITED),
|
|
|
384337 |
+ XLAT(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED),
|
|
|
384337 |
XLAT_END
|
|
|
384337 |
};
|
|
|
384337 |
|