kernel/tools/perf/util/pmu.y
.. .. @@ -20,7 +20,7 @@ 20 20 21 21 %} 22 22 23 -%token PP_CONFIG PP_CONFIG1 PP_CONFIG223 +%token PP_CONFIG24 24 %token PP_VALUE PP_ERROR 25 25 %type <num> PP_VALUE 26 26 %type <bits> bit_term .. .. @@ -47,18 +47,11 @@ 47 47 $3)); 48 48 } 49 49 | 50 -PP_CONFIG1 ':' bits50 +PP_CONFIG PP_VALUE ':' bits51 51 { 52 52 ABORT_ON(perf_pmu__new_format(format, name, 53 - PERF_PMU_FORMAT_VALUE_CONFIG1,54 - $3));55 -}56 -|57 -PP_CONFIG2 ':' bits58 -{59 - ABORT_ON(perf_pmu__new_format(format, name,60 - PERF_PMU_FORMAT_VALUE_CONFIG2,61 - $3));53 + $2,54 + $4));62 55 } 63 56 64 57 bits: