tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sysctl-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux

Pull sysctl updates from Luis Chamberlain:
"There isn't much for 6.0 for sysctl stuff, most of the stuff went
through the networking subsystem (Kuniyuki Iwashima's trove of fixes
using READ_ONCE/WRITE_ONCE helpers) as most of the issues there have
been identified on networking side. So it is good we don't have much
updates as we would have ended up with tons of conflicts. I rebased my
delta just now to your tree so to avoid conflicts with that stuff.
This merge request is just minor fluff cleanups then. Perhaps for 6.1
kernel/sysctl.c will get more love than this release"

* tag 'sysctl-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
kernel/sysctl.c: Remove trailing white space
kernel/sysctl.c: Clean up indentation, replace spaces with tab.
sysctl: Merge adjacent CONFIG_TREE_RCU blocks

Linus Torvalds d5af75f7 e74acdf5

+9 -11
+9 -11
kernel/sysctl.c
··· 492 492 int *i, vleft, first = 1, err = 0; 493 493 size_t left; 494 494 char *p; 495 - 495 + 496 496 if (!tbl_data || !table->maxlen || !*lenp || (*ppos && !write)) { 497 497 *lenp = 0; 498 498 return 0; 499 499 } 500 - 500 + 501 501 i = (int *) tbl_data; 502 502 vleft = table->maxlen / sizeof(*i); 503 503 left = *lenp; ··· 729 729 * @ppos: file position 730 730 * 731 731 * Reads/writes up to table->maxlen/sizeof(unsigned int) integer 732 - * values from/to the user buffer, treated as an ASCII string. 732 + * values from/to the user buffer, treated as an ASCII string. 733 733 * 734 734 * Returns 0 on success. 735 735 */ ··· 1273 1273 * @ppos: file position 1274 1274 * 1275 1275 * Reads/writes up to table->maxlen/sizeof(unsigned int) integer 1276 - * values from/to the user buffer, treated as an ASCII string. 1276 + * values from/to the user buffer, treated as an ASCII string. 1277 1277 * The values read are assumed to be in seconds, and are converted into 1278 1278 * jiffies. 1279 1279 * ··· 1306 1306 * @ppos: pointer to the file position 1307 1307 * 1308 1308 * Reads/writes up to table->maxlen/sizeof(unsigned int) integer 1309 - * values from/to the user buffer, treated as an ASCII string. 1310 - * The values read are assumed to be in 1/USER_HZ seconds, and 1309 + * values from/to the user buffer, treated as an ASCII string. 1310 + * The values read are assumed to be in 1/USER_HZ seconds, and 1311 1311 * are converted into jiffies. 1312 1312 * 1313 1313 * Returns 0 on success. ··· 1315 1315 int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write, 1316 1316 void *buffer, size_t *lenp, loff_t *ppos) 1317 1317 { 1318 - return do_proc_dointvec(table,write,buffer,lenp,ppos, 1319 - do_proc_dointvec_userhz_jiffies_conv,NULL); 1318 + return do_proc_dointvec(table, write, buffer, lenp, ppos, 1319 + do_proc_dointvec_userhz_jiffies_conv, NULL); 1320 1320 } 1321 1321 1322 1322 /** ··· 2061 2061 .extra1 = SYSCTL_ZERO, 2062 2062 .extra2 = SYSCTL_ONE, 2063 2063 }, 2064 - #if defined(CONFIG_TREE_RCU) 2064 + #ifdef CONFIG_TREE_RCU 2065 2065 { 2066 2066 .procname = "panic_on_rcu_stall", 2067 2067 .data = &sysctl_panic_on_rcu_stall, ··· 2071 2071 .extra1 = SYSCTL_ZERO, 2072 2072 .extra2 = SYSCTL_ONE, 2073 2073 }, 2074 - #endif 2075 - #if defined(CONFIG_TREE_RCU) 2076 2074 { 2077 2075 .procname = "max_rcu_stall_to_panic", 2078 2076 .data = &sysctl_max_rcu_stall_to_panic,