Commit 6b2edf27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.19-rc1' of... 

Merge tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest update from Shuah Khan:

 - add cgroup core selftests

 - fix compile warnings in android ion test

 - fix to bugs in exclude and skip paths in vDSO test

 - remove obsolete config options

 - add missing .gitignore file

* tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/ftrace: Fix kprobe string testcase to not probe notrace function
  selftests: mount: remove no longer needed config option
  selftests: cgroup: add gitignore file
  Add cgroup core selftests
  selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run
  selftests: vDSO - fix to exclude x86 test on non-x86 platforms
  selftests/android: initialize heap_type to avoid compiling warning
parents 7140ad38 01675e95

tools/testing/selftests/android/ion/ionapp_export.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ int main(int argc, char *argv[]) 


	heap_size = 0;

	flags = 0;

	heap_type = ION_HEAP_TYPE_SYSTEM;



	while ((opt = getopt(argc, argv, "hi:s:")) != -1) {

		switch (opt) {

tools/testing/selftests/cgroup/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
test_memcontrol

tools/testing/selftests/cgroup/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ CFLAGS += -Wall 
all:



TEST_GEN_PROGS = test_memcontrol

TEST_GEN_PROGS += test_core



include ../lib.mk



$(OUTPUT)/test_memcontrol: cgroup_util.c

$(OUTPUT)/test_core: cgroup_util.c

tools/testing/selftests/cgroup/cgroup_util.c

+8 −0
Original line number Diff line number Diff line
@@ -229,6 +229,14 @@ retry: 
	return ret;

}



int cg_enter_current(const char *cgroup)

{

	char pidbuf[64];



	snprintf(pidbuf, sizeof(pidbuf), "%d", getpid());

	return cg_write(cgroup, "cgroup.procs", pidbuf);

}



int cg_run(const char *cgroup,

	   int (*fn)(const char *cgroup, void *arg),

	   void *arg)

tools/testing/selftests/cgroup/cgroup_util.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern int cg_write(const char *cgroup, const char *control, char *buf); 
extern int cg_run(const char *cgroup,

		  int (*fn)(const char *cgroup, void *arg),

		  void *arg);

extern int cg_enter_current(const char *cgroup);

extern int cg_run_nowait(const char *cgroup,

			 int (*fn)(const char *cgroup, void *arg),

			 void *arg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE