diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2024-12-20 10:25:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-12-20 10:25:44 +0100 |
| commit | 60675d4ca1ef0857e44eba5849b74a3a998d0c0f (patch) | |
| tree | b2fa39712aeca80db32be43f3f5be8e5a58bc0a3 /kernel/sysctl.c | |
| parent | x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() (diff) | |
| parent | Merge tag 'net-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-60675d4ca1ef0857e44eba5849b74a3a998d0c0f.tar.xz wireguard-linux-60675d4ca1ef0857e44eba5849b74a3a998d0c0f.zip | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 79e6cb1d5c48..5c9202cb8f59 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1305,7 +1305,6 @@ int proc_dointvec_userhz_jiffies(const struct ctl_table *table, int write, * @write: %TRUE if this is a write to the sysctl file * @buffer: the user buffer * @lenp: the size of the user buffer - * @ppos: file position * @ppos: the current position in the file * * Reads/writes up to table->maxlen/sizeof(unsigned int) integer |