Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / tools / perf / tests / parse-events.c

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 20c2e641c42265b1606d751c64ffec6bdf2e5d3c..aa9276bfe3e9b7b6ed1def3889142c645c1e8e30 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -1779,15 +1779,14 @@ static int test_pmu_events(void)
        }
 
        while (!ret && (ent = readdir(dir))) {
-#define MAX_NAME 100
                struct evlist_test e;
-               char name[MAX_NAME];
+               char name[2 * NAME_MAX + 1 + 12 + 3];
 
                /* Names containing . are special and cannot be used directly */
                if (strchr(ent->d_name, '.'))
                        continue;
 
-               snprintf(name, MAX_NAME, "cpu/event=%s/u", ent->d_name);
+               snprintf(name, sizeof(name), "cpu/event=%s/u", ent->d_name);
 
                e.name  = name;
                e.check = test__checkevent_pmu_events;
@@ -1795,11 +1794,10 @@ static int test_pmu_events(void)
                ret = test_event(&e);
                if (ret)
                        break;
-               snprintf(name, MAX_NAME, "%s:u,cpu/event=%s/u", ent->d_name, ent->d_name);
+               snprintf(name, sizeof(name), "%s:u,cpu/event=%s/u", ent->d_name, ent->d_name);
                e.name  = name;
                e.check = test__checkevent_pmu_events_mix;
                ret = test_event(&e);
-#undef MAX_NAME
        }
 
        closedir(dir);