From: Peter Zijlstra <peterz@infradead.org>
Date: Fri, 25 Apr 2025 12:55:20 +0000 (+0200)
Subject: Merge branch 'perf/urgent'
X-Git-Tag: v6.16-rc1~196^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1caafd919e2a5c483f7a27449f8497fa4b15a44f;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'perf/urgent'

Merge urgent fixes for dependencies.

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

1caafd919e2a5c483f7a27449f8497fa4b15a44f
diff --cc arch/x86/events/perf_event.h
index d201e6ac2edee,46d120597babe..9c5cab80866c0
--- a/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 */