Appy various small fixups to tools/testing/vma/ as per SeongJae's review. Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx> --- include/linux/atomic.h | 2 +- include/linux/mmzone.h | 3 +-- tools/testing/vma/.gitignore | 1 + tools/testing/vma/Makefile | 2 +- tools/testing/vma/errors.txt | 0 tools/testing/vma/generated/autoconf.h | 2 -- tools/testing/vma/linux/mmzone.h | 2 +- tools/testing/vma/vma.c | 2 +- 8 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 tools/testing/vma/errors.txt delete mode 100644 tools/testing/vma/generated/autoconf.h diff --git a/include/linux/atomic.h b/include/linux/atomic.h index badfba2fd10f..8dd57c3a99e9 100644 --- a/include/linux/atomic.h +++ b/include/linux/atomic.h @@ -81,4 +81,4 @@ #include <linux/atomic/atomic-long.h> #include <linux/atomic/atomic-instrumented.h> -#endif /* _LINUX_ATOMIC_H */ +#endif /* _LINUX_ATOMIC_H */ diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 30a22e57fa50..41458892bc8a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1,5 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_MMZONE_H #define _LINUX_MMZONE_H diff --git a/tools/testing/vma/.gitignore b/tools/testing/vma/.gitignore index d915f7d7fb1a..b003258eba79 100644 --- a/tools/testing/vma/.gitignore +++ b/tools/testing/vma/.gitignore @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only generated/bit-length.h generated/map-shift.h +generated/autoconf.h idr.c radix-tree.c vma diff --git a/tools/testing/vma/Makefile b/tools/testing/vma/Makefile index 70e728f2eee3..bfc905d222cf 100644 --- a/tools/testing/vma/Makefile +++ b/tools/testing/vma/Makefile @@ -13,4 +13,4 @@ vma: $(OFILES) vma_internal.h ../../../mm/vma.c ../../../mm/vma.h $(CC) $(CFLAGS) -o $@ $(OFILES) $(LDLIBS) clean: - $(RM) $(TARGETS) *.o radix-tree.c idr.c generated/map-shift.h generated/bit-length.h + $(RM) $(TARGETS) *.o radix-tree.c idr.c generated/map-shift.h generated/bit-length.h generated/autoconf.h diff --git a/tools/testing/vma/errors.txt b/tools/testing/vma/errors.txt deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tools/testing/vma/generated/autoconf.h b/tools/testing/vma/generated/autoconf.h deleted file mode 100644 index 92dc474c349b..000000000000 --- a/tools/testing/vma/generated/autoconf.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "bit-length.h" -#define CONFIG_XARRAY_MULTI 1 diff --git a/tools/testing/vma/linux/mmzone.h b/tools/testing/vma/linux/mmzone.h index e6a96c686610..33cd1517f7a3 100644 --- a/tools/testing/vma/linux/mmzone.h +++ b/tools/testing/vma/linux/mmzone.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _LINUX_MMZONE_H #define _LINUX_MMZONE_H diff --git a/tools/testing/vma/vma.c b/tools/testing/vma/vma.c index 1f32bc4d60c2..48e033c60d87 100644 --- a/tools/testing/vma/vma.c +++ b/tools/testing/vma/vma.c @@ -203,5 +203,5 @@ int main(void) printf("%d tests run, %d passed, %d failed.\n", num_tests, num_tests - num_fail, num_fail); - return EXIT_SUCCESS; + return num_fail == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.45.2