kselftest/arm64: Remove local definitions of MTE prctls
authorMark Brown <broonie@kernel.org>
Wed, 26 Jan 2022 17:44:21 +0000 (17:44 +0000)
committerWill Deacon <will@kernel.org>
Tue, 15 Feb 2022 15:59:20 +0000 (15:59 +0000)
The GCR EL1 test unconditionally includes local definitions of the prctls
it tests. Since not only will the kselftest build infrastructure ensure
that the in tree uapi headers are available but the toolchain being used to
build kselftest may ensure that system uapi headers with MTE support are
available this causes the compiler to warn about duplicate definitions.
Remove these duplicate definitions.

Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20220126174421.1712795-1-broonie@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c

index a876db1..325bca0 100644 (file)
 #include "kselftest.h"
 #include "mte_common_util.h"
 
-#define PR_SET_TAGGED_ADDR_CTRL 55
-#define PR_GET_TAGGED_ADDR_CTRL 56
-# define PR_TAGGED_ADDR_ENABLE  (1UL << 0)
-# define PR_MTE_TCF_SHIFT      1
-# define PR_MTE_TCF_NONE       (0UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TCF_SYNC       (1UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TCF_ASYNC      (2UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TCF_MASK       (3UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TAG_SHIFT      3
-# define PR_MTE_TAG_MASK       (0xffffUL << PR_MTE_TAG_SHIFT)
-
 #include "mte_def.h"
 
 #define NUM_ITERATIONS         1024