[PATCH v2] Cleanup: membarrier selftest

From: Mathieu Desnoyers
Date: Tue Sep 08 2015 - 15:22:25 EST


As per Michael Ellerman's comments, we don't need to specify the rule
in the Makefile, the implicit one will do the same. Also, the
"__EXPORTED_HEADERS__" include is not needed, because we build the
test against the installed kernel headers, not the kernel headers.
Include <unistd.h> rather than the rather specific
<asm-generic/unistd.h> (the former header is located in a standard
location and includes the latter).

My own cleanups: re-use "$(TEST_PROGS)" in the clean target rather than
spelling the executable twice. Include <syscall.h> rather than
<sys/syscall.h> (the former header is located in a standard location
and includes the latter).

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
CC: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
CC: linux-api@xxxxxxxxxxxxxxx
CC: Pranith Kumar <bobby.prani@xxxxxxxxx>
CC: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
--
Changes since v1:
- Add Changelog.
---
tools/testing/selftests/membarrier/Makefile | 7 +++----
tools/testing/selftests/membarrier/membarrier_test.c | 5 +----
2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/testing/selftests/membarrier/Makefile b/tools/testing/selftests/membarrier/Makefile
index 877a503..a1a9708 100644
--- a/tools/testing/selftests/membarrier/Makefile
+++ b/tools/testing/selftests/membarrier/Makefile
@@ -1,11 +1,10 @@
CFLAGS += -g -I../../../../usr/include/

-all:
- $(CC) $(CFLAGS) membarrier_test.c -o membarrier_test
-
TEST_PROGS := membarrier_test

+all: $(TEST_PROGS)
+
include ../lib.mk

clean:
- $(RM) membarrier_test
+ $(RM) $(TEST_PROGS)
diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c
index dde3125..535f0fe 100644
--- a/tools/testing/selftests/membarrier/membarrier_test.c
+++ b/tools/testing/selftests/membarrier/membarrier_test.c
@@ -1,9 +1,6 @@
#define _GNU_SOURCE
-#define __EXPORTED_HEADERS__
-
#include <linux/membarrier.h>
-#include <asm-generic/unistd.h>
-#include <sys/syscall.h>
+#include <syscall.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/