commit 73354cff1aae409d6ef7d8a539a2a0a09c2480f9 Author: Dmitry V. Levin Date: Wed Nov 1 00:20:44 2017 +0000 Update MEMBARRIER_CMD_* constants * xlat/membarrier_cmds.in: Add MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED introduced by kernel commit v4.14-rc6~26. * tests/membarrier.c (main): Update expected output. diff -rup a/tests/membarrier.c b/tests/membarrier.c --- a/tests/membarrier.c 2018-03-07 16:10:10.000000000 -0500 +++ b/tests/membarrier.c 2018-03-07 16:10:36.596808428 -0500 @@ -55,6 +55,11 @@ main(void) text = "MEMBARRIER_CMD_SHARED|" "MEMBARRIER_CMD_PRIVATE_EXPEDITED"; break; + case 1|8|16: + text = "MEMBARRIER_CMD_SHARED|" + "MEMBARRIER_CMD_PRIVATE_EXPEDITED|" + "MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED"; + break; default: error_msg_and_fail("membarrier returned %#x, does" " the test have to be updated?", rc); diff -rup a/xlat/membarrier_cmds.h b/xlat/membarrier_cmds.h --- a/xlat/membarrier_cmds.h 2018-03-07 16:10:10.000000000 -0500 +++ b/xlat/membarrier_cmds.h 2018-03-07 16:10:41.723750016 -0500 @@ -8,6 +8,9 @@ #if !(defined(MEMBARRIER_CMD_PRIVATE_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_PRIVATE_EXPEDITED)) # define MEMBARRIER_CMD_PRIVATE_EXPEDITED 8 #endif +#if !(defined(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) || (defined(HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED) && HAVE_DECL_MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED)) +# define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16 +#endif #ifdef IN_MPERS @@ -20,6 +23,7 @@ const struct xlat membarrier_cmds[] = { XLAT(MEMBARRIER_CMD_QUERY), XLAT(MEMBARRIER_CMD_SHARED), XLAT(MEMBARRIER_CMD_PRIVATE_EXPEDITED), + XLAT(MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED), XLAT_END }; diff -rup a/xlat/membarrier_cmds.in b/xlat/membarrier_cmds.in --- a/xlat/membarrier_cmds.in 2018-03-07 16:10:10.000000000 -0500 +++ b/xlat/membarrier_cmds.in 2018-03-07 16:10:36.597808417 -0500 @@ -1,3 +1,4 @@ MEMBARRIER_CMD_QUERY 0 MEMBARRIER_CMD_SHARED 1 MEMBARRIER_CMD_PRIVATE_EXPEDITED 8 +MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED 16