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

sched: cleanup, sched_granularity -> sched_min_granularity

due to adaptive granularity scheduling the role of sched_granularity
has changed to "minimum granularity", so rename the variable (and the
tunable) accordingly.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>

Ingo Molnar 172ac3db 21805085

+8 -8
unified split
+1 -1
include/linux/sched.h
··· 1400 1400 extern void sched_idle_next(void); 1401 1401 1402 1402 extern unsigned int sysctl_sched_latency; 1403 - extern unsigned int sysctl_sched_granularity; 1403 + extern unsigned int sysctl_sched_min_granularity; 1404 1404 extern unsigned int sysctl_sched_wakeup_granularity; 1405 1405 extern unsigned int sysctl_sched_batch_wakeup_granularity; 1406 1406 extern unsigned int sysctl_sched_stat_granularity;
+3 -3
kernel/sched.c
··· 4913 4913 unsigned int factor = 1 + ilog2(num_online_cpus()); 4914 4914 const unsigned long limit = 100000000; 4915 4915 4916 - sysctl_sched_granularity *= factor; 4917 - if (sysctl_sched_granularity > limit) 4918 - sysctl_sched_granularity = limit; 4916 + sysctl_sched_min_granularity *= factor; 4917 + if (sysctl_sched_min_granularity > limit) 4918 + sysctl_sched_min_granularity = limit; 4919 4919 4920 4920 sysctl_sched_latency *= factor; 4921 4921 if (sysctl_sched_latency > limit)
+2 -2
kernel/sched_fair.c
··· 40 40 * Minimal preemption granularity for CPU-bound tasks: 41 41 * (default: 2 msec, units: nanoseconds) 42 42 */ 43 - unsigned int sysctl_sched_granularity __read_mostly = 2000000ULL; 43 + unsigned int sysctl_sched_min_granularity __read_mostly = 2000000ULL; 44 44 45 45 /* 46 46 * SCHED_BATCH wake-up granularity. ··· 258 258 259 259 if (nr > 1) { 260 260 gran = gran/nr - gran/nr/nr; 261 - gran = max(gran, sysctl_sched_granularity); 261 + gran = max(gran, sysctl_sched_min_granularity); 262 262 } 263 263 264 264 return gran;
+2 -2
kernel/sysctl.c
··· 222 222 #ifdef CONFIG_SCHED_DEBUG 223 223 { 224 224 .ctl_name = CTL_UNNUMBERED, 225 - .procname = "sched_granularity_ns", 226 - .data = &sysctl_sched_granularity, 225 + .procname = "sched_min_granularity_ns", 226 + .data = &sysctl_sched_min_granularity, 227 227 .maxlen = sizeof(unsigned int), 228 228 .mode = 0644, 229 229 .proc_handler = &proc_dointvec_minmax,