diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-04 21:00:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-04 21:00:11 -0700 |
commit | 3f0d6ecdf1ab35ac54cabb759f748fb0bffd26a5 (patch) | |
tree | 7295ad5d64b24bb39ad57d81ea9a6a00b4279b46 /include/linux/seccomp.h | |
parent | 442489c219235991de86d0277b5d859ede6d8792 (diff) | |
parent | 3135f5b73592988af0eb1b11ccbb72a8667be201 (diff) | |
download | lwn-3f0d6ecdf1ab35ac54cabb759f748fb0bffd26a5.tar.gz lwn-3f0d6ecdf1ab35ac54cabb759f748fb0bffd26a5.zip |
Merge tag 'core-entry-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull generic kernel entry/exit code from Thomas Gleixner:
"Generic implementation of common syscall, interrupt and exception
entry/exit functionality based on the recent X86 effort to ensure
correctness of entry/exit vs RCU and instrumentation.
As this functionality and the required entry/exit sequences are not
architecture specific, sharing them allows other architectures to
benefit instead of copying the same code over and over again.
This branch was kept standalone to allow others to work on it. The
conversion of x86 comes in a seperate pull request which obviously is
based on this branch"
* tag 'core-entry-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
entry: Correct __secure_computing() stub
entry: Correct 'noinstr' attributes
entry: Provide infrastructure for work before transitioning to guest mode
entry: Provide generic interrupt entry/exit code
entry: Provide generic syscall exit function
entry: Provide generic syscall entry functionality
seccomp: Provide stub for __secure_computing()
Diffstat (limited to 'include/linux/seccomp.h')
-rw-r--r-- | include/linux/seccomp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 881c90b6aa25..02aef2844c38 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -64,9 +64,11 @@ static inline int seccomp_mode(struct seccomp *s) struct seccomp { }; struct seccomp_filter { }; +struct seccomp_data; #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER static inline int secure_computing(void) { return 0; } +static inline int __secure_computing(const struct seccomp_data *sd) { return 0; } #else static inline void secure_computing_strict(int this_syscall) { return; } #endif |