[PATCH] kselftest/arm64: Remove local definitions of MTE prctls

Shuah Khan skhan at linuxfoundation.org
Tue Feb 1 10:52:10 PST 2022


On 1/26/22 10:44 AM, Mark Brown wrote:
> 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 at kernel.org>
> ---
>   .../selftests/arm64/mte/check_gcr_el1_cswitch.c       | 11 -----------
>   1 file changed, 11 deletions(-)
> 
> diff --git a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> index a876db1f096a..325bca0de0f6 100644
> --- a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> +++ b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> @@ -19,17 +19,6 @@
>   #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
> 

Thank you for cleaning this up. Assuming it is going to go through
arm tree:

Acked-by: Shuah Khan <skhan at linuxfoundation.org>

thanks,
-- Shuah



More information about the linux-arm-kernel mailing list