Skip to content

Commit fd3def7

Browse files
chleroymaddy-kerneldev
authored andcommitted
powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC
Commit e65e1fc ("[PATCH] syscall class hookup for all normal targets") added generic support for AUDIT but that didn't include support for bi-arch like powerpc. Commit 4b58841 ("audit: Add generic compat syscall support") added generic support for bi-arch. Convert powerpc to that bi-arch generic audit support. With this change generated text is similar. Thomas has confirmed that the previously failing filter_exclude/test is now successful both without and with this patch, see [1] [1] https://lore.kernel.org/all/20260306115350-ef265661-6d6b-4043-9bd0-8e6b437d0d67@linutronix.de/ Link: linuxppc/issues#412 Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/261b1be5b8dc526b83d73e8281e682a73536ea28.1773155031.git.chleroy@kernel.org
1 parent 69b0510 commit fd3def7

5 files changed

Lines changed: 8 additions & 143 deletions

File tree

arch/powerpc/Kconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ config PPC
189189
select ARCH_WANT_OPTIMIZE_DAX_VMEMMAP if PPC_RADIX_MMU
190190
select ARCH_WANTS_MODULES_DATA_IN_VMALLOC if PPC_BOOK3S_32 || PPC_8xx
191191
select ARCH_WEAK_RELEASE_ACQUIRE
192+
select AUDIT_ARCH_COMPAT_GENERIC
192193
select BINFMT_ELF
193194
select BUILDTIME_TABLE_SORT
194195
select CLONE_BACKWARDS
@@ -371,10 +372,6 @@ config GENERIC_TBSYNC
371372
bool
372373
default y if PPC32 && SMP
373374

374-
config AUDIT_ARCH
375-
bool
376-
default y
377-
378375
config GENERIC_BUG
379376
bool
380377
default y
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* SPDX-License-Identifier: GPL-2.0-or-later */
2+
#ifndef _ASM_POWERPC_UNISTD32_H_
3+
#define _ASM_POWERPC_UNISTD32_H_
4+
5+
#include <asm/unistd_32.h>
6+
7+
#endif /* _ASM_POWERPC_UNISTD32_H_ */

arch/powerpc/kernel/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \
149149
pci-common.o pci_of_scan.o
150150
obj-$(CONFIG_PCI_MSI) += msi.o
151151

152-
obj-$(CONFIG_AUDIT) += audit.o
153-
obj64-$(CONFIG_AUDIT) += compat_audit.o
154-
155152
obj-y += trace/
156153

157154
ifneq ($(CONFIG_PPC_INDIRECT_PIO),y)

arch/powerpc/kernel/audit.c

Lines changed: 0 additions & 87 deletions
This file was deleted.

arch/powerpc/kernel/compat_audit.c

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)