Commit bb77ac3a authored Sep 12, 2012 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Sep 14, 2012

perf test: Fixup for the die() removal

The commit 32c7f738 ("perf test: Remove die() calls") replaced die()
call to pr_debug + return -1, but it should be pr_err otherwise it'll
not show up unless -v option is given.  Fix it.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1347415866-303-1-git-send-email-namhyung@kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 7b0295b3

tools/perf/builtin-test.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1026,14 +1026,14 @@ static int __test__rdpmc(void)

		fd = sys_perf_event_open(&attr, 0, -1, -1, 0);
		if (fd < 0) {
		pr_debug("Error: sys_perf_event_open() syscall returned "
		pr_err("Error: sys_perf_event_open() syscall returned "
		"with %d (%s)\n", fd, strerror(errno));
		return -1;
		}

		addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED, fd, 0);
		if (addr == (void *)(-1)) {
		pr_debug("Error: mmap() syscall returned with (%s)\n",
		pr_err("Error: mmap() syscall returned with (%s)\n",
		strerror(errno));
		goto out_close;
		}