Merge tag 'audit-pr-20230626' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit

cae72026 · Linus Torvalds <[email protected]> · 2023-06-27 17:15:35 -07:00

Pull audit update from Paul Moore:
 "A single audit patch that resolves two compiler warnings regarding
  missing function prototypes"

* tag 'audit-pr-20230626' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
  audit: avoid missing-prototype warnings

Commit: cae72026b5ecf059687ccb431cb0e5965e863fea
Parents: 26642864 · e455ca40

Merge commit. Changes below are compared with the first parent: 26642864.

Changes

3 files changed · +3 −3

File	Status	Add	Del	Content
include/linux/audit.h	modified	+0	−2	View file
include/linux/audit_arch.h	modified	+2	−0	View file
kernel/audit.h	modified	+1	−1	View file

include/linux/audit.h

View file

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 31086a7..6a3a9e1 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -130,8 +130,6 @@ extern unsigned compat_dir_class[];
 extern unsigned compat_chattr_class[];
 extern unsigned compat_signal_class[];
 
-extern int audit_classify_compat_syscall(int abi, unsigned syscall);
-
 /* audit_names->type values */
 #define	AUDIT_TYPE_UNKNOWN	0	/* we don't know yet */
 #define	AUDIT_TYPE_NORMAL	1	/* a "normal" audit record */

include/linux/audit_arch.h

View file

diff --git a/include/linux/audit_arch.h b/include/linux/audit_arch.h
index 8fdb1af..0e34d67 100644
--- a/include/linux/audit_arch.h
+++ b/include/linux/audit_arch.h
@@ -21,4 +21,6 @@ enum auditsc_class_t {
 	AUDITSC_NVALS /* count */
 };
 
+extern int audit_classify_compat_syscall(int abi, unsigned syscall);
+
 #endif

kernel/audit.h

View file

diff --git a/kernel/audit.h b/kernel/audit.h
index c57b008..94738bc 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -259,8 +259,8 @@ extern struct tty_struct *audit_get_tty(void);
 extern void audit_put_tty(struct tty_struct *tty);
 
 /* audit watch/mark/tree functions */
-#ifdef CONFIG_AUDITSYSCALL
 extern unsigned int audit_serial(void);
+#ifdef CONFIG_AUDITSYSCALL
 extern int auditsc_get_stamp(struct audit_context *ctx,
 			      struct timespec64 *t, unsigned int *serial);
 