From: tip-bot for Jiri Olsa <jolsa@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org,
hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl,
jolsa@redhat.com, fweisbec@gmail.com, tglx@linutronix.de,
cjashfor@linux.vnet.ibm.com, mingo@elte.hu
Subject: [tip:perf/core] perf tests: Fix attr watermark field name typo
Date: Tue, 13 Nov 2012 23:27:11 -0800 [thread overview]
Message-ID: <tip-45e4089bc6398da2cf0609b614bc519970cb8442@git.kernel.org> (raw)
In-Reply-To: <1352130579-13451-4-git-send-email-jolsa@redhat.com>
Commit-ID: 45e4089bc6398da2cf0609b614bc519970cb8442
Gitweb: http://git.kernel.org/tip/45e4089bc6398da2cf0609b614bc519970cb8442
Author: Jiri Olsa <jolsa@redhat.com>
AuthorDate: Mon, 5 Nov 2012 16:49:38 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 5 Nov 2012 14:03:59 -0300
perf tests: Fix attr watermark field name typo
Currently the 'watermark' field is coded as 'watermask'.
As the type is global through the framework and tests, the typo spawned
no error.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1352130579-13451-4-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/attr.c | 2 +-
tools/perf/tests/attr.py | 2 +-
tools/perf/tests/attr/base-record | 2 +-
tools/perf/tests/attr/base-stat | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c
index 1389d69..6fa84b7 100644
--- a/tools/perf/tests/attr.c
+++ b/tools/perf/tests/attr.c
@@ -110,7 +110,7 @@ static int store_event(struct perf_event_attr *attr, pid_t pid, int cpu,
WRITE_ASS(inherit_stat, "d");
WRITE_ASS(enable_on_exec, "d");
WRITE_ASS(task, "d");
- WRITE_ASS(watermask, "d");
+ WRITE_ASS(watermark, "d");
WRITE_ASS(precise_ip, "d");
WRITE_ASS(mmap_data, "d");
WRITE_ASS(sample_id_all, "d");
diff --git a/tools/perf/tests/attr.py b/tools/perf/tests/attr.py
index e98c726..28c0481 100644
--- a/tools/perf/tests/attr.py
+++ b/tools/perf/tests/attr.py
@@ -45,7 +45,7 @@ class Event(dict):
'inherit_stat',
'enable_on_exec',
'task',
- 'watermask',
+ 'watermark',
'precise_ip',
'mmap_data',
'sample_id_all',
diff --git a/tools/perf/tests/attr/base-record b/tools/perf/tests/attr/base-record
index 07beef5..8262794 100644
--- a/tools/perf/tests/attr/base-record
+++ b/tools/perf/tests/attr/base-record
@@ -22,7 +22,7 @@ freq=1
inherit_stat=0
enable_on_exec=1
task=0
-watermask=0
+watermark=0
precise_ip=0
mmap_data=0
sample_id_all=1
diff --git a/tools/perf/tests/attr/base-stat b/tools/perf/tests/attr/base-stat
index 6e1bb8e..46f8851 100644
--- a/tools/perf/tests/attr/base-stat
+++ b/tools/perf/tests/attr/base-stat
@@ -22,7 +22,7 @@ freq=0
inherit_stat=0
enable_on_exec=1
task=0
-watermask=0
+watermark=0
precise_ip=0
mmap_data=0
sample_id_all=0
next prev parent reply other threads:[~2012-11-14 7:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 15:49 [PATCH 0/4] perf tests: Fixies for perf_event_attr tests Jiri Olsa
2012-11-05 15:49 ` [PATCH 1/4] perf tests: Add attr stat basic test Jiri Olsa
2012-11-14 7:25 ` [tip:perf/core] perf tests: Add missing " tip-bot for Jiri Olsa
2012-11-05 15:49 ` [PATCH 2/4] perf tests: Factor attr tests WRITE_ASS macro Jiri Olsa
2012-11-14 7:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2012-11-05 15:49 ` [PATCH 3/4] perf tests: Fix attr watermark field name typo Jiri Olsa
2012-11-14 7:27 ` tip-bot for Jiri Olsa [this message]
2012-11-05 15:49 ` [PATCH 4/4] perf tests: Removing 'optional' field Jiri Olsa
2012-11-14 7:28 ` [tip:perf/core] " tip-bot for Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-45e4089bc6398da2cf0609b614bc519970cb8442@git.kernel.org \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome