Commit ecc64d2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4053c476 6932256d

kernel/time/jiffies.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

}