mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 02/15] perf tools: Remove duplicate typedef config_term_func_t definition
Date: Mon, 22 Feb 2016 15:02:47 -0300	[thread overview]
Message-ID: <1456164180-23154-3-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1456164180-23154-1-git-send-email-acme@kernel.org>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Older compilers don't like this, for instance, on RHEL6.7:

    CC       /tmp/build/perf/util/parse-events.o
  util/parse-events.c:844: error: redefinition of typedef ‘config_term_func_t’
  util/parse-events.c:353: note: previous declaration of ‘config_term_func_t’ was here

So remove the second definition, that should've been just moved in 43d0b97817a4
("perf tools: Enable config and setting names for legacy cache events"), not copied.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 43d0b97817a4 ("perf tools: Enable config and setting names for legacy cache events")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/parse-events.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 2b8770821365..b0b329539db5 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -841,10 +841,6 @@ void parse_events__shrink_config_terms(void)
 	config_term_shrinked = true;
 }
 
-typedef int config_term_func_t(struct perf_event_attr *attr,
-			       struct parse_events_term *term,
-			       struct parse_events_error *err);
-
 static int config_term_common(struct perf_event_attr *attr,
 			      struct parse_events_term *term,
 			      struct parse_events_error *err)
-- 
2.5.0

  parent reply	other threads:[~2016-02-22 18:03 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-22 18:02 [GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 01/15] perf tools: Fix build on older systems Arnaldo Carvalho de Melo
2016-02-22 18:02 ` Arnaldo Carvalho de Melo [this message]
2016-02-22 18:02 ` [PATCH 03/15] perf tools: Fix segfault on dynamic entries Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 04/15] perf tools: Update srcline/file if needed Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 05/15] perf tools: Fix alignment on some sort keys Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 06/15] perf tools: Fix column width setting on 'trace' sort key Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 07/15] perf tools: Fix assertion failure on dynamic entry Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 08/15] perf bpf: Add API to set values to map entries in a bpf object Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 09/15] perf tools: Enable BPF object configure syntax Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 10/15] perf record: Apply config to BPF objects before recording Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 11/15] perf tools: Enable passing event to BPF object Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 12/15] perf tools: Support setting different slots in a BPF map separately Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 13/15] perf tools: Enable indices setting syntax for BPF map Arnaldo Carvalho de Melo
2016-02-22 18:02 ` [PATCH 14/15] perf tools: Apply tracepoint event definition options to BPF script Arnaldo Carvalho de Melo
2016-02-22 18:03 ` [PATCH 15/15] perf tools: Introduce bpf-output event Arnaldo Carvalho de Melo
2016-02-24  7:21 ` [GIT PULL 00/15] perf/core improvements and fixes Ingo Molnar

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=1456164180-23154-3-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=wangnan0@huawei.com \
    /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