linux-next: build failure after merge of the security tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]

Hi all,

After merging the security tree, today's linux-next build (x86_64
allmodconfig) failed like this:

arch/x86/events/amd/ibs.c: In function 'perf_ibs_handle_irq':
arch/x86/events/amd/ibs.c:1207:13: error: too many arguments to function 'perf_allow_kernel'
 1207 |             perf_allow_kernel(&event->attr)) {
      |             ^~~~~~~~~~~~~~~~~
In file included from arch/x86/events/amd/ibs.c:9:
include/linux/perf_event.h:1675:5: note: declared here
 1675 | int perf_allow_kernel(void);
      |     ^~~~~~~~~~~~~~~~~

Caused by commit

  9ec84f79c5a7 ("perf: Remove unnecessary parameter of security check")

interacting with commit

  50a53b60e141 ("perf/amd/ibs: Prevent leaking sensitive data to userspace")

From Linus' tree.

I have applied the following merge resolution patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Mar 2025 15:25:18 +1100
Subject: [PATCH] fix up for "perf: Remove unnecessary parameter of security check"

interacting with commit

  50a53b60e141 ("perf/amd/ibs: Prevent leaking sensitive data to userspace")

From Linus' tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/events/amd/ibs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index e36c9c63c97c..30157ab98cea 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -1204,7 +1204,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
 	 * unprivileged users.
 	 */
 	if ((event->attr.sample_type & PERF_SAMPLE_RAW) &&
-	    perf_allow_kernel(&event->attr)) {
+	    perf_allow_kernel()) {
 		perf_ibs_phyaddr_clear(perf_ibs, &ibs_data);
 	}
 
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]