From 93a76370d2a9d83974387ac5c75e0cdf08fd1c44 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@twitter.com>
Date: Wed, 13 Feb 2013 13:48:58 -0800
Subject: [PATCH] --- yaml --- r: 350119 b: refs/heads/master c:
 85df3b3769222894e9692b383c7af124b7721086 h: refs/heads/master i:   350117:
 9ba60d62ea666da0c61e1401d36d78b11a30f65c   350115:
 c768889ce2bed7a08a5929a30a0ecf74474100eb   350111:
 5237ada4fe6dea492c3dafa7522ab836b270643c v: v3

---
 [refs]                               | 2 +-
 trunk/tools/perf/Makefile            | 4 ++--
 trunk/tools/perf/util/parse-events.y | 1 -
 trunk/tools/perf/util/pmu.y          | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 801c9a735096..f2450b829b6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02320931ce000836aa231ac1311769e303122099
+refs/heads/master: 85df3b3769222894e9692b383c7af124b7721086
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index b90528d42b03..a2108ca1cc17 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -296,13 +296,13 @@ $(OUTPUT)util/parse-events-flex.c: util/parse-events.l $(OUTPUT)util/parse-event
 	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c
 
 $(OUTPUT)util/parse-events-bison.c: util/parse-events.y
-	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c
+	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_
 
 $(OUTPUT)util/pmu-flex.c: util/pmu.l $(OUTPUT)util/pmu-bison.c
 	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c
 
 $(OUTPUT)util/pmu-bison.c: util/pmu.y
-	$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c
+	$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_
 
 $(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c
 $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c
diff --git a/trunk/tools/perf/util/parse-events.y b/trunk/tools/perf/util/parse-events.y
index 4de2fdca98c8..afc44c18dfe1 100644
--- a/trunk/tools/perf/util/parse-events.y
+++ b/trunk/tools/perf/util/parse-events.y
@@ -1,5 +1,4 @@
 %pure-parser
-%name-prefix "parse_events_"
 %parse-param {void *_data}
 %parse-param {void *scanner}
 %lex-param {void* scanner}
diff --git a/trunk/tools/perf/util/pmu.y b/trunk/tools/perf/util/pmu.y
index ec898047ebb9..bfd7e8509869 100644
--- a/trunk/tools/perf/util/pmu.y
+++ b/trunk/tools/perf/util/pmu.y
@@ -1,5 +1,4 @@
 
-%name-prefix "perf_pmu_"
 %parse-param {struct list_head *format}
 %parse-param {char *name}