1 files changed, 1 insertions, 29 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index d76aa30cb1fb..c5642e6748b2 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -6,7 +6,7 @@
 #include "parse-options.h"
 #include "parse-events.h"
 #include "exec_cmd.h"
-#include "linux/string.h"
+#include "string.h"
 #include "symbol.h"
 #include "cache.h"
 #include "header.h"
@@ -863,32 +863,6 @@ int parse_events_name(struct list_head *list, char *name)
         return 0;
 }
 
-static int parse_events__scanner(const char *str, void *data, int start_token);
-
-static int parse_events_fixup(int ret, const char *str, void *data,
-                              int start_token)
-{
-        char *o = strdup(str);
-        char *s = NULL;
-        char *t = o;
-        char *p;
-        int len = 0;
-
-        if (!o)
-                return ret;
-        while ((p = strsep(&t, ",")) != NULL) {
-                if (s)
-                        str_append(&s, &len, ",");
-                str_append(&s, &len, "cpu/");
-                str_append(&s, &len, p);
-                str_append(&s, &len, "/");
-        }
-        free(o);
-        if (!s)
-                return -ENOMEM;
-        return parse_events__scanner(s, data, start_token);
-}
-
 static int parse_events__scanner(const char *str, void *data, int start_token)
 {
         YY_BUFFER_STATE buffer;
@@ -909,8 +883,6 @@ static int parse_events__scanner(const char *str, void *data, int start_token)
         parse_events__flush_buffer(buffer, scanner);
         parse_events__delete_buffer(buffer, scanner);
         parse_events_lex_destroy(scanner);
-        if (ret && !strchr(str, '/'))
-                ret = parse_events_fixup(ret, str, data, start_token);
         return ret;
 }