diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-27 10:03:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-27 10:03:12 -0700 |
| commit | 7e4910b9acea9fb9575f6506f76dd465259ad8d9 (patch) | |
| tree | 7e46c016914400c9d70a7db50e3504d05d5e1c2d /init | |
| parent | ea6b2098dd02789f68770fd3d5a373732207be2f (diff) | |
| parent | a3fc712c5b37aec802438fe0de095d7f6f3827a3 (diff) | |
Merge tag 'seccomp-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp updates from Kees Cook:
- Fix "cacheable" typo in comments (Cui GaoSheng)
- Fix CONFIG for /proc/$pid/status Seccomp_filters (Kenta.Tada@sony.com)
* tag 'seccomp-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
seccomp: Fix "cacheable" typo in comments
seccomp: Fix CONFIG tests for Seccomp_filters
Diffstat (limited to 'init')
| -rw-r--r-- | init/init_task.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/init_task.c b/init/init_task.c index 3711cdaafed2..8b08c2e19cbb 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -210,7 +210,7 @@ struct task_struct init_task #ifdef CONFIG_SECURITY .security = NULL, #endif -#ifdef CONFIG_SECCOMP +#ifdef CONFIG_SECCOMP_FILTER .seccomp = { .filter_count = ATOMIC_INIT(0) }, #endif }; |