On Wed, May 04, 2022 at 12:16:55AM +0100, Mark Brown wrote: > Currently the arm64 kselftests attempt to locate the ABI headers using > custom logic which doesn't work correctly in the case of out of tree builds > if KBUILD_OUTPUT is not specified. Since lib.mk defines KHDR_INCLUDES with > the appropriate flags we can simply remove the custom logic and use that > instead. > > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> > --- > > This fix is required to get us able to run the arm64 kselftests > in KernelCI, it does out of tree kselftest builds triggering the > issue especially in conjunction with the addition of the new > definitions for SME. > > tools/testing/selftests/arm64/Makefile | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/tools/testing/selftests/arm64/Makefile b/tools/testing/selftests/arm64/Makefile > index 1e8d9a8f59df..9460cbe81bcc 100644 > --- a/tools/testing/selftests/arm64/Makefile > +++ b/tools/testing/selftests/arm64/Makefile > @@ -17,16 +17,7 @@ top_srcdir = $(realpath ../../../../) > # Additional include paths needed by kselftest.h and local headers > CFLAGS += -I$(top_srcdir)/tools/testing/selftests/ > > -# Guessing where the Kernel headers could have been installed > -# depending on ENV config > -ifeq ($(KBUILD_OUTPUT),) > -khdr_dir = $(top_srcdir)/usr/include > -else > -# the KSFT preferred location when KBUILD_OUTPUT is set > -khdr_dir = $(KBUILD_OUTPUT)/kselftest/usr/include > -endif > - > -CFLAGS += -I$(khdr_dir) > +CFLAGS += $(KHDR_INCLUDES) Great, thanks. I had exactly the same diff stashed last week when testing the kselftest branch, just forgot about posting it. I'll apply yours. -- Catalin
