From: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Date: Mon, 2 Mar 2026 07:58:40 +0000 (+0100)
Subject: powerpc/audit: Directly include unistd_32.h from compat_audit.c
X-Git-Tag: v7.1-rc1~201^2~46
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9b444349a2e96745fc172e161539594ee1f0239e;p=thirdparty%2Flinux.git

powerpc/audit: Directly include unistd_32.h from compat_audit.c

This source file undefines '__powerpc64__' to get the 32-bit system call
numbers from asm/unistd.h. However this symbol is also evaluated by
other headers, among them is asm/bitsperlong.h. The undefinition leads
to an inconsistency between __BITS_PER_LONG and the C type 'long'.
An upcoming consistency check will be tripped by this.

Directly include asm/unistd_32.h to get access to the 32-bit system call
numbers instead.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20260302-vdso-compat-checkflags-v2-4-78e55baa58ba@linutronix.de
---

diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c
index 57b38c592b9f3..b4d81a57b2d97 100644
--- a/arch/powerpc/kernel/compat_audit.c
+++ b/arch/powerpc/kernel/compat_audit.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
-#undef __powerpc64__
 #include <linux/audit_arch.h>
-#include <asm/unistd.h>
+#include <asm/unistd_32.h>
 
 #include "audit_32.h"