cpufreq: rename ignore_nice as ignore_nice_load

This sysfs file was called ignore_nice_load earlier and commit 4d5dcc4 (cpufreq: governor: Implement per policy instances of governors) changed its name to ignore_nice by mistake. Lets get it renamed back to its original name. Reported-by: Martin von Gagern <Martin.vGagern@gmx.net> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Cc: 3.10+ <stable@vger.kernel.org> # 3.10+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

cpufreq: rename ignore_nice as ignore_nice_load
This sysfs file was called ignore_nice_load earlier and commit 4d5dcc4 (cpufreq: governor: Implement per policy instances of governors) changed its name to ignore_nice by mistake. Lets get it renamed back to its original name. Reported-by: Martin von Gagern <Martin.vGagern@gmx.net> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Cc: 3.10+ <stable@vger.kernel.org> # 3.10+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Viresh Kumar · Rafael J. Wysocki
1 parent f54fe64d14
Showing 4 changed files with 26 additions and 26 deletions Side-by-side Diff
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_governor.c
drivers/cpufreq/cpufreq_governor.h
drivers/cpufreq/cpufreq_ondemand.c
@@ -221,8 +221,8 @@
 	return count;
 }
  
-static ssize_t store_ignore_nice(struct dbs_data *dbs_data, const char *buf,
-		size_t count)
+static ssize_t store_ignore_nice_load(struct dbs_data *dbs_data,
+		const char *buf, size_t count)
 {
 	struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
 	unsigned int input, j;
  
@@ -235,10 +235,10 @@
 	if (input > 1)
 		input = 1;
  
-	if (input == cs_tuners->ignore_nice) /* nothing to do */
+	if (input == cs_tuners->ignore_nice_load) /* nothing to do */
 		return count;
  
-	cs_tuners->ignore_nice = input;
+	cs_tuners->ignore_nice_load = input;
  
 	/* we need to re-evaluate prev_cpu_idle */
 	for_each_online_cpu(j) {
@@ -246,7 +246,7 @@
 		dbs_info = &per_cpu(cs_cpu_dbs_info, j);
 		dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j,
 					&dbs_info->cdbs.prev_cpu_wall, 0);
-		if (cs_tuners->ignore_nice)
+		if (cs_tuners->ignore_nice_load)
 			dbs_info->cdbs.prev_cpu_nice =
 				kcpustat_cpu(j).cpustat[CPUTIME_NICE];
 	}
@@ -279,7 +279,7 @@
 show_store_one(cs, sampling_down_factor);
 show_store_one(cs, up_threshold);
 show_store_one(cs, down_threshold);
-show_store_one(cs, ignore_nice);
+show_store_one(cs, ignore_nice_load);
 show_store_one(cs, freq_step);
 declare_show_sampling_rate_min(cs);
  
@@ -287,7 +287,7 @@
 gov_sys_pol_attr_rw(sampling_down_factor);
 gov_sys_pol_attr_rw(up_threshold);
 gov_sys_pol_attr_rw(down_threshold);
-gov_sys_pol_attr_rw(ignore_nice);
+gov_sys_pol_attr_rw(ignore_nice_load);
 gov_sys_pol_attr_rw(freq_step);
 gov_sys_pol_attr_ro(sampling_rate_min);
  
@@ -297,7 +297,7 @@
 	&sampling_down_factor_gov_sys.attr,
 	&up_threshold_gov_sys.attr,
 	&down_threshold_gov_sys.attr,
-	&ignore_nice_gov_sys.attr,
+	&ignore_nice_load_gov_sys.attr,
 	&freq_step_gov_sys.attr,
 	NULL
 };
@@ -313,7 +313,7 @@
 	&sampling_down_factor_gov_pol.attr,
 	&up_threshold_gov_pol.attr,
 	&down_threshold_gov_pol.attr,
-	&ignore_nice_gov_pol.attr,
+	&ignore_nice_load_gov_pol.attr,
 	&freq_step_gov_pol.attr,
 	NULL
 };
@@ -338,7 +338,7 @@
 	tuners->up_threshold = DEF_FREQUENCY_UP_THRESHOLD;
 	tuners->down_threshold = DEF_FREQUENCY_DOWN_THRESHOLD;
 	tuners->sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR;
-	tuners->ignore_nice = 0;
+	tuners->ignore_nice_load = 0;
 	tuners->freq_step = DEF_FREQUENCY_STEP;
  
 	dbs_data->tuners = tuners;
@@ -47,9 +47,9 @@
 	unsigned int j;
  
 	if (dbs_data->cdata->governor == GOV_ONDEMAND)
-		ignore_nice = od_tuners->ignore_nice;
+		ignore_nice = od_tuners->ignore_nice_load;
 	else
-		ignore_nice = cs_tuners->ignore_nice;
+		ignore_nice = cs_tuners->ignore_nice_load;
  
 	policy = cdbs->cur_policy;
  
  
@@ -298,12 +298,12 @@
 		cs_tuners = dbs_data->tuners;
 		cs_dbs_info = dbs_data->cdata->get_cpu_dbs_info_s(cpu);
 		sampling_rate = cs_tuners->sampling_rate;
-		ignore_nice = cs_tuners->ignore_nice;
+		ignore_nice = cs_tuners->ignore_nice_load;
 	} else {
 		od_tuners = dbs_data->tuners;
 		od_dbs_info = dbs_data->cdata->get_cpu_dbs_info_s(cpu);
 		sampling_rate = od_tuners->sampling_rate;
-		ignore_nice = od_tuners->ignore_nice;
+		ignore_nice = od_tuners->ignore_nice_load;
 		od_ops = dbs_data->cdata->gov_ops;
 		io_busy = od_tuners->io_is_busy;
 	}
@@ -165,7 +165,7 @@
  
 /* Per policy Governers sysfs tunables */
 struct od_dbs_tuners {
-	unsigned int ignore_nice;
+	unsigned int ignore_nice_load;
 	unsigned int sampling_rate;
 	unsigned int sampling_down_factor;
 	unsigned int up_threshold;
@@ -175,7 +175,7 @@
 };
  
 struct cs_dbs_tuners {
-	unsigned int ignore_nice;
+	unsigned int ignore_nice_load;
 	unsigned int sampling_rate;
 	unsigned int sampling_down_factor;
 	unsigned int up_threshold;
@@ -403,8 +403,8 @@
 	return count;
 }
  
-static ssize_t store_ignore_nice(struct dbs_data *dbs_data, const char *buf,
-		size_t count)
+static ssize_t store_ignore_nice_load(struct dbs_data *dbs_data,
+		const char *buf, size_t count)
 {
 	struct od_dbs_tuners *od_tuners = dbs_data->tuners;
 	unsigned int input;
  
@@ -419,10 +419,10 @@
 	if (input > 1)
 		input = 1;
  
-	if (input == od_tuners->ignore_nice) { /* nothing to do */
+	if (input == od_tuners->ignore_nice_load) { /* nothing to do */
 		return count;
 	}
-	od_tuners->ignore_nice = input;
+	od_tuners->ignore_nice_load = input;
  
 	/* we need to re-evaluate prev_cpu_idle */
 	for_each_online_cpu(j) {
@@ -430,7 +430,7 @@
 		dbs_info = &per_cpu(od_cpu_dbs_info, j);
 		dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j,
 			&dbs_info->cdbs.prev_cpu_wall, od_tuners->io_is_busy);
-		if (od_tuners->ignore_nice)
+		if (od_tuners->ignore_nice_load)
 			dbs_info->cdbs.prev_cpu_nice =
 				kcpustat_cpu(j).cpustat[CPUTIME_NICE];
  
@@ -461,7 +461,7 @@
 show_store_one(od, io_is_busy);
 show_store_one(od, up_threshold);
 show_store_one(od, sampling_down_factor);
-show_store_one(od, ignore_nice);
+show_store_one(od, ignore_nice_load);
 show_store_one(od, powersave_bias);
 declare_show_sampling_rate_min(od);
  
@@ -469,7 +469,7 @@
 gov_sys_pol_attr_rw(io_is_busy);
 gov_sys_pol_attr_rw(up_threshold);
 gov_sys_pol_attr_rw(sampling_down_factor);
-gov_sys_pol_attr_rw(ignore_nice);
+gov_sys_pol_attr_rw(ignore_nice_load);
 gov_sys_pol_attr_rw(powersave_bias);
 gov_sys_pol_attr_ro(sampling_rate_min);
  
@@ -478,7 +478,7 @@
 	&sampling_rate_gov_sys.attr,
 	&up_threshold_gov_sys.attr,
 	&sampling_down_factor_gov_sys.attr,
-	&ignore_nice_gov_sys.attr,
+	&ignore_nice_load_gov_sys.attr,
 	&powersave_bias_gov_sys.attr,
 	&io_is_busy_gov_sys.attr,
 	NULL
@@ -494,7 +494,7 @@
 	&sampling_rate_gov_pol.attr,
 	&up_threshold_gov_pol.attr,
 	&sampling_down_factor_gov_pol.attr,
-	&ignore_nice_gov_pol.attr,
+	&ignore_nice_load_gov_pol.attr,
 	&powersave_bias_gov_pol.attr,
 	&io_is_busy_gov_pol.attr,
 	NULL
@@ -544,7 +544,7 @@
 	}
  
 	tuners->sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR;
-	tuners->ignore_nice = 0;
+	tuners->ignore_nice_load = 0;
 	tuners->powersave_bias = default_powersave_bias;
 	tuners->io_is_busy = should_io_be_busy();
...	...	@@ -221,8 +221,8 @@
221	221	return count;
222	222	}
223	223
224		-static ssize_t store_ignore_nice(struct dbs_data dbs_data, const char buf,
225		- size_t count)
	224	+static ssize_t store_ignore_nice_load(struct dbs_data *dbs_data,
	225	+ const char *buf, size_t count)
226	226	{
227	227	struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
228	228	unsigned int input, j;
229	229
...	...	@@ -235,10 +235,10 @@
235	235	if (input > 1)
236	236	input = 1;
237	237
238		- if (input == cs_tuners->ignore_nice) /* nothing to do */
	238	+ if (input == cs_tuners->ignore_nice_load) /* nothing to do */
239	239	return count;
240	240
241		- cs_tuners->ignore_nice = input;
	241	+ cs_tuners->ignore_nice_load = input;
242	242
243	243	/* we need to re-evaluate prev_cpu_idle */
244	244	for_each_online_cpu(j) {
...	...	@@ -246,7 +246,7 @@
246	246	dbs_info = &per_cpu(cs_cpu_dbs_info, j);
247	247	dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j,
248	248	&dbs_info->cdbs.prev_cpu_wall, 0);
249		- if (cs_tuners->ignore_nice)
	249	+ if (cs_tuners->ignore_nice_load)
250	250	dbs_info->cdbs.prev_cpu_nice =
251	251	kcpustat_cpu(j).cpustat[CPUTIME_NICE];
252	252	}
...	...	@@ -279,7 +279,7 @@
279	279	show_store_one(cs, sampling_down_factor);
280	280	show_store_one(cs, up_threshold);
281	281	show_store_one(cs, down_threshold);
282		-show_store_one(cs, ignore_nice);
	282	+show_store_one(cs, ignore_nice_load);
283	283	show_store_one(cs, freq_step);
284	284	declare_show_sampling_rate_min(cs);
285	285
...	...	@@ -287,7 +287,7 @@
287	287	gov_sys_pol_attr_rw(sampling_down_factor);
288	288	gov_sys_pol_attr_rw(up_threshold);
289	289	gov_sys_pol_attr_rw(down_threshold);
290		-gov_sys_pol_attr_rw(ignore_nice);
	290	+gov_sys_pol_attr_rw(ignore_nice_load);
291	291	gov_sys_pol_attr_rw(freq_step);
292	292	gov_sys_pol_attr_ro(sampling_rate_min);
293	293
...	...	@@ -297,7 +297,7 @@
297	297	&sampling_down_factor_gov_sys.attr,
298	298	&up_threshold_gov_sys.attr,
299	299	&down_threshold_gov_sys.attr,
300		- &ignore_nice_gov_sys.attr,
	300	+ &ignore_nice_load_gov_sys.attr,
301	301	&freq_step_gov_sys.attr,
302	302	NULL
303	303	};
...	...	@@ -313,7 +313,7 @@
313	313	&sampling_down_factor_gov_pol.attr,
314	314	&up_threshold_gov_pol.attr,
315	315	&down_threshold_gov_pol.attr,
316		- &ignore_nice_gov_pol.attr,
	316	+ &ignore_nice_load_gov_pol.attr,
317	317	&freq_step_gov_pol.attr,
318	318	NULL
319	319	};
...	...	@@ -338,7 +338,7 @@
338	338	tuners->up_threshold = DEF_FREQUENCY_UP_THRESHOLD;
339	339	tuners->down_threshold = DEF_FREQUENCY_DOWN_THRESHOLD;
340	340	tuners->sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR;
341		- tuners->ignore_nice = 0;
	341	+ tuners->ignore_nice_load = 0;
342	342	tuners->freq_step = DEF_FREQUENCY_STEP;
343	343
344	344	dbs_data->tuners = tuners;
...	...	@@ -47,9 +47,9 @@
47	47	unsigned int j;
48	48
49	49	if (dbs_data->cdata->governor == GOV_ONDEMAND)
50		- ignore_nice = od_tuners->ignore_nice;
	50	+ ignore_nice = od_tuners->ignore_nice_load;
51	51	else
52		- ignore_nice = cs_tuners->ignore_nice;
	52	+ ignore_nice = cs_tuners->ignore_nice_load;
53	53
54	54	policy = cdbs->cur_policy;
55	55
56	56
...	...	@@ -298,12 +298,12 @@
298	298	cs_tuners = dbs_data->tuners;
299	299	cs_dbs_info = dbs_data->cdata->get_cpu_dbs_info_s(cpu);
300	300	sampling_rate = cs_tuners->sampling_rate;
301		- ignore_nice = cs_tuners->ignore_nice;
	301	+ ignore_nice = cs_tuners->ignore_nice_load;
302	302	} else {
303	303	od_tuners = dbs_data->tuners;
304	304	od_dbs_info = dbs_data->cdata->get_cpu_dbs_info_s(cpu);
305	305	sampling_rate = od_tuners->sampling_rate;
306		- ignore_nice = od_tuners->ignore_nice;
	306	+ ignore_nice = od_tuners->ignore_nice_load;
307	307	od_ops = dbs_data->cdata->gov_ops;
308	308	io_busy = od_tuners->io_is_busy;
309	309	}
...	...	@@ -165,7 +165,7 @@
165	165
166	166	/* Per policy Governers sysfs tunables */
167	167	struct od_dbs_tuners {
168		- unsigned int ignore_nice;
	168	+ unsigned int ignore_nice_load;
169	169	unsigned int sampling_rate;
170	170	unsigned int sampling_down_factor;
171	171	unsigned int up_threshold;
...	...	@@ -175,7 +175,7 @@
175	175	};
176	176
177	177	struct cs_dbs_tuners {
178		- unsigned int ignore_nice;
	178	+ unsigned int ignore_nice_load;
179	179	unsigned int sampling_rate;
180	180	unsigned int sampling_down_factor;
181	181	unsigned int up_threshold;
...	...	@@ -403,8 +403,8 @@
403	403	return count;
404	404	}
405	405
406		-static ssize_t store_ignore_nice(struct dbs_data dbs_data, const char buf,
407		- size_t count)
	406	+static ssize_t store_ignore_nice_load(struct dbs_data *dbs_data,
	407	+ const char *buf, size_t count)
408	408	{
409	409	struct od_dbs_tuners *od_tuners = dbs_data->tuners;
410	410	unsigned int input;
411	411
...	...	@@ -419,10 +419,10 @@
419	419	if (input > 1)
420	420	input = 1;
421	421
422		- if (input == od_tuners->ignore_nice) { /* nothing to do */
	422	+ if (input == od_tuners->ignore_nice_load) { /* nothing to do */
423	423	return count;
424	424	}
425		- od_tuners->ignore_nice = input;
	425	+ od_tuners->ignore_nice_load = input;
426	426
427	427	/* we need to re-evaluate prev_cpu_idle */
428	428	for_each_online_cpu(j) {
...	...	@@ -430,7 +430,7 @@
430	430	dbs_info = &per_cpu(od_cpu_dbs_info, j);
431	431	dbs_info->cdbs.prev_cpu_idle = get_cpu_idle_time(j,
432	432	&dbs_info->cdbs.prev_cpu_wall, od_tuners->io_is_busy);
433		- if (od_tuners->ignore_nice)
	433	+ if (od_tuners->ignore_nice_load)
434	434	dbs_info->cdbs.prev_cpu_nice =
435	435	kcpustat_cpu(j).cpustat[CPUTIME_NICE];
436	436
...	...	@@ -461,7 +461,7 @@
461	461	show_store_one(od, io_is_busy);
462	462	show_store_one(od, up_threshold);
463	463	show_store_one(od, sampling_down_factor);
464		-show_store_one(od, ignore_nice);
	464	+show_store_one(od, ignore_nice_load);
465	465	show_store_one(od, powersave_bias);
466	466	declare_show_sampling_rate_min(od);
467	467
...	...	@@ -469,7 +469,7 @@
469	469	gov_sys_pol_attr_rw(io_is_busy);
470	470	gov_sys_pol_attr_rw(up_threshold);
471	471	gov_sys_pol_attr_rw(sampling_down_factor);
472		-gov_sys_pol_attr_rw(ignore_nice);
	472	+gov_sys_pol_attr_rw(ignore_nice_load);
473	473	gov_sys_pol_attr_rw(powersave_bias);
474	474	gov_sys_pol_attr_ro(sampling_rate_min);
475	475
...	...	@@ -478,7 +478,7 @@
478	478	&sampling_rate_gov_sys.attr,
479	479	&up_threshold_gov_sys.attr,
480	480	&sampling_down_factor_gov_sys.attr,
481		- &ignore_nice_gov_sys.attr,
	481	+ &ignore_nice_load_gov_sys.attr,
482	482	&powersave_bias_gov_sys.attr,
483	483	&io_is_busy_gov_sys.attr,
484	484	NULL
...	...	@@ -494,7 +494,7 @@
494	494	&sampling_rate_gov_pol.attr,
495	495	&up_threshold_gov_pol.attr,
496	496	&sampling_down_factor_gov_pol.attr,
497		- &ignore_nice_gov_pol.attr,
	497	+ &ignore_nice_load_gov_pol.attr,
498	498	&powersave_bias_gov_pol.attr,
499	499	&io_is_busy_gov_pol.attr,
500	500	NULL
...	...	@@ -544,7 +544,7 @@
544	544	}
545	545
546	546	tuners->sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR;
547		- tuners->ignore_nice = 0;
	547	+ tuners->ignore_nice_load = 0;
548	548	tuners->powersave_bias = default_powersave_bias;
549	549	tuners->io_is_busy = should_io_be_busy();
550	550