Merge branch 'perf/urgent'

Merge urgent fixes for dependencies.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>

diff --cc arch/x86/events/core.c
Simple merge

diff --cc arch/x86/events/intel/ds.c
Simple merge

diff --cc arch/x86/events/perf_event.h
index d201e6ac2edeeb6b20dac39a8a404f3cfef8ea04,46d120597babe5b278fb63989a4f2752c4062c32..9c5cab80866c047733f279b67709ec1a9ce68f4b
--- 1/arch/x86/events/perf_event.h
--- 2/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@@ -117,14 -124,9 +124,14 @@@ static inline bool is_branch_counters_g
  
  static inline bool is_pebs_counter_event_group(struct perf_event *event)
  {
-       return event->group_leader->hw.flags & PERF_X86_EVENT_PEBS_CNTR;
+       return check_leader_group(event->group_leader, PERF_X86_EVENT_PEBS_CNTR);
  }
  
 +static inline bool is_acr_event_group(struct perf_event *event)
 +{
 +      return event->group_leader->hw.flags & PERF_X86_EVENT_ACR;
 +}
 +
  struct amd_nb {
        int nb_id;  /* NorthBridge id */
        int refcnt; /* reference count */

diff --cc kernel/events/core.c
Simple merge