More pruning of sched.h dependencies. Signed-off-by: Kent Overstreet <kent.overstreet@xxxxxxxxx> --- include/linux/sched.h | 2 +- include/linux/seccomp.h | 20 +------------------- include/linux/seccomp_types.h | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 include/linux/seccomp_types.h diff --git a/include/linux/sched.h b/include/linux/sched.h index f52977af1511..9bfa61ab2750 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -19,7 +19,7 @@ #include <linux/mutex_types.h> #include <linux/plist_types.h> #include <linux/hrtimer_types.h> -#include <linux/seccomp.h> +#include <linux/seccomp_types.h> #include <linux/nodemask_types.h> #include <linux/rcupdate.h> #include <linux/refcount_types.h> diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 1ec0d8dc4b69..26a53cea5761 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -19,27 +19,9 @@ #include <linux/thread_info.h> #include <linux/atomic.h> +#include <linux/seccomp_types.h> #include <asm/seccomp.h> -struct seccomp_filter; -/** - * struct seccomp - the state of a seccomp'ed process - * - * @mode: indicates one of the valid values above for controlled - * system calls available to a process. - * @filter_count: number of seccomp filters - * @filter: must always point to a valid seccomp-filter or NULL as it is - * accessed without locking during system call entry. - * - * @filter must only be accessed from the context of current as there - * is no read locking. - */ -struct seccomp { - int mode; - atomic_t filter_count; - struct seccomp_filter *filter; -}; - #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER extern int __secure_computing(const struct seccomp_data *sd); static inline int secure_computing(void) diff --git a/include/linux/seccomp_types.h b/include/linux/seccomp_types.h new file mode 100644 index 000000000000..c6184582a0a0 --- /dev/null +++ b/include/linux/seccomp_types.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_SECCOMP_TYPES_H +#define _LINUX_SECCOMP_TYPES_H + +#include <linux/types.h> + +struct seccomp_filter; +/** + * struct seccomp - the state of a seccomp'ed process + * + * @mode: indicates one of the valid values above for controlled + * system calls available to a process. + * @filter_count: number of seccomp filters + * @filter: must always point to a valid seccomp-filter or NULL as it is + * accessed without locking during system call entry. + * + * @filter must only be accessed from the context of current as there + * is no read locking. + */ +struct seccomp { + int mode; + atomic_t filter_count; + struct seccomp_filter *filter; +}; + +#endif /* _LINUX_SECCOMP_TYPES_H */ -- 2.43.0