Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c5e8fc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.18-rc1-2' of... 

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

Pull more Kselftest updates from Shuah Khan:

 - fix a signedness bug in cgroups test

 - add ppc support for kprobe args tests

* tag 'linux-kselftest-4.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kselftest/cgroup: fix a signedness bug
  selftests/ftrace: Add ppc support for kprobe args tests
parents 2f6e24d3 53c3daf8

tools/testing/selftests/cgroup/cgroup_util.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static ssize_t read_text(const char *path, char *buf, size_t max_len) 
	return len;

}



static ssize_t write_text(const char *path, char *buf, size_t len)

static ssize_t write_text(const char *path, char *buf, ssize_t len)

{

	int fd;
@@ -140,7 +140,7 @@ long cg_read_key_long(const char *cgroup, const char *control, const char *key) 
int cg_write(const char *cgroup, const char *control, char *buf)

{

	char path[PATH_MAX];

	size_t len = strlen(buf);

	ssize_t len = strlen(buf);



	snprintf(path, sizeof(path), "%s/%s", cgroup, control);

tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,14 @@ arm*) 
  ARG2=%r1

  OFFS=4

;;

ppc64*)

  ARG2=%r4

  OFFS=8

;;

ppc*)

  ARG2=%r4

  OFFS=4

;;

*)

  echo "Please implement other architecture here"

  exit_untested

tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ arm*) 
  GOODREG=%r0

  BADREG=%ax

;;

ppc*)

  GOODREG=%r3

  BADREG=%msr

;;

*)

  echo "Please implement other architecture here"

  exit_untested

esac



test_goodarg() # Good-args