diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-04 08:21:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-04 08:21:11 -0800 |
| commit | ecc64d2dc9ff9738d2a896beb68e02c2feaf9a02 (patch) | |
| tree | edf3417fef8cd063027280ffabfd3ab6366d1597 | |
| parent | 4053c47680da0a03a8df66735904d5b92db6a144 (diff) | |
| parent | 6932256d3a3764f3a5e06e2cb8603be45b6a9fef (diff) | |
Merge tag 'sysctl-7.00-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl
Pull sysctl fix from Joel Granados:
- Fix error when reporting jiffies converted values back to user space
Return the converted value instead of "Invalid argument" error
* tag 'sysctl-7.00-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
time/jiffies: Fix sysctl file error on configurations where USER_HZ < HZ
| -rw-r--r-- | kernel/time/jiffies.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index a5c7d15fce72..9daf8c5d9687 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c @@ -256,8 +256,6 @@ EXPORT_SYMBOL(proc_dointvec_jiffies); int proc_dointvec_userhz_jiffies(const struct ctl_table *table, int dir, void *buffer, size_t *lenp, loff_t *ppos) { - if (SYSCTL_USER_TO_KERN(dir) && USER_HZ < HZ) - return -EINVAL; return proc_dointvec_conv(table, dir, buffer, lenp, ppos, do_proc_int_conv_userhz_jiffies); } |