Merge tag 'sysctl-7.00-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl

ecc64d2d · Linus Torvalds <[email protected]> · 2026-03-04 08:21:11 -08:00

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

Commit: ecc64d2dc9ff9738d2a896beb68e02c2feaf9a02
Parents: 4053c476 · 6932256d

Merge commit. Changes below are compared with the first parent: 4053c476.

Changes

1 files changed · +0 −2

File	Status	Add	Del	Content
kernel/time/jiffies.c	modified	+0	−2	View file

kernel/time/jiffies.c

View file

diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index a5c7d15..9daf8c5 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);
 }