diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2020-04-28 21:20:20 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-04-28 21:23:38 +0200 |
| commit | 0b54142e4b09fbf719eb9fc6fe8bcacbd0547ac3 (patch) | |
| tree | e65147d1aec55854e854a9a00ec9ac17af193208 /arch/x86 | |
| parent | 8c1b2bf16d5944cd5c3a8a72e24ed9e22360c1af (diff) | |
| parent | 32927393dc1ccd60fb2bdc05b9e8e88753761469 (diff) | |
Merge branch 'work.sysctl' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull in Christoph Hellwig's series that changes the sysctl's ->proc_handler
methods to take kernel pointers instead. It gets rid of the set_fs address
space overrides used by BPF. As per discussion, pull in the feature branch
into bpf-next as it relates to BPF sysctl progs.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200427071508.GV23230@ZenIV.linux.org.uk/T/
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/itmt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/itmt.c b/arch/x86/kernel/itmt.c index 1cb3ca9bba49..1afbdd1dd777 100644 --- a/arch/x86/kernel/itmt.c +++ b/arch/x86/kernel/itmt.c @@ -39,8 +39,7 @@ static bool __read_mostly sched_itmt_capable; unsigned int __read_mostly sysctl_sched_itmt_enabled; static int sched_itmt_update_handler(struct ctl_table *table, int write, - void __user *buffer, size_t *lenp, - loff_t *ppos) + void *buffer, size_t *lenp, loff_t *ppos) { unsigned int old_sysctl; int ret; |