Merge tag 'v4.4.30' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / parse-events.y
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y

index ad379968d4c10c0fb7bb2ddc3bacce3dc1166f43..d35c10275ba4e4722a021083885909bd635b9e6e 100644 (file)
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -48,6 +48,7 @@ static inc_group_count(struct list_head *list,
  %token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP
  %token PE_ERROR
  %token PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT
+%token PE_DRV_CFG_TERM
  %type <num> PE_VALUE
  %type <num> PE_VALUE_SYM_HW
  %type <num> PE_VALUE_SYM_SW
@@ -62,6 +63,7 @@ static inc_group_count(struct list_head *list,
  %type <str> PE_MODIFIER_BP
  %type <str> PE_EVENT_NAME
  %type <str> PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT
+%type <str> PE_DRV_CFG_TERM
  %type <num> value_sym
  %type <head> event_config
  %type <term> event_term
@@ -573,6 +575,15 @@ PE_TERM
         ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, 1, &@1, NULL));
         $$ = term;
  }
+|
+PE_DRV_CFG_TERM
+{
+       struct parse_events_term *term;
+
+       ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG,
+                                       $1, $1, &@1, NULL));
+       $$ = term;
+}
  
  sep_dc: ':' |