powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC

No time to finalise commit description and testing before the weekend, sending out as RFC to eventually get some feedback. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
0day-ci · Aug 20, 2021 · a93eecbd4dc0e79fd9cce46cdc0fca81b6ec862f · a93eecb
1 parent 8b893ef
commit a93eecbd4dc0e79fd9cce46cdc0fca81b6ec862f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 135 deletions.
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
@@ -163,6 +163,7 @@ config PPC
 	select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
 	select ARCH_WANT_LD_ORPHAN_WARN
 	select ARCH_WEAK_RELEASE_ACQUIRE
+	select AUDIT_ARCH_COMPAT_GENERIC
 	select BINFMT_ELF
 	select BUILDTIME_TABLE_SORT
 	select CLONE_BACKWARDS
@@ -317,10 +318,6 @@ config GENERIC_TBSYNC
 	bool
 	default y if PPC32 && SMP
 
-config AUDIT_ARCH
-	bool
-	default y
-
 config GENERIC_BUG
 	bool
 	default y

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
@@ -125,9 +125,6 @@ obj-$(CONFIG_PCI)		+= pci_$(BITS).o $(pci64-y) \
 				   pci-common.o pci_of_scan.o
 obj-$(CONFIG_PCI_MSI)		+= msi.o
 
-obj-$(CONFIG_AUDIT)		+= audit.o
-obj64-$(CONFIG_AUDIT)		+= compat_audit.o
-
 obj-$(CONFIG_PPC_IO_WORKAROUNDS)	+= io-workarounds.o
 
 obj-y				+= trace/

diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c
diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c