Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e67ee101 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle' 

* pm-sleep:
  PM / hibernate: avoid unsafe pages in e820 reserved regions

* pm-cpufreq:
  cpufreq: arm_big_little: fix module license spec
  cpufreq: speedstep-smi: fix decimal printf specifiers
  cpufreq: OPP: Avoid sleeping while atomic
  cpufreq: cpu0: Do not print error message when deferring
  cpufreq: integrator: Use set_cpus_allowed_ptr

* pm-cpuidle:
  cpuidle: menu: Lookup CPU runqueues less
  cpuidle: menu: Call nr_iowait_cpu less times
  cpuidle: menu: Use ktime_to_us instead of reinventing the wheel
  cpuidle: menu: Use shifts when calculating averages where possible
parents 21c806d9 84c91b7a 39c8bbaf 372ba8cb

drivers/cpufreq/arm_big_little.c

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/cpufreq.h>

#include <linux/cpumask.h>

#include <linux/export.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of_platform.h>

#include <linux/pm_opp.h>
@@ -593,3 +594,7 @@ void bL_cpufreq_unregister(struct cpufreq_arm_bL_ops *ops) 
	arm_bL_ops = NULL;

}

EXPORT_SYMBOL_GPL(bL_cpufreq_unregister);



MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>");

MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver");

MODULE_LICENSE("GPL v2");

drivers/cpufreq/arm_big_little_dt.c

+1 −1
Original line number Diff line number Diff line
@@ -114,4 +114,4 @@ module_platform_driver(generic_bL_platdrv); 


MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>");

MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver via DT");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

drivers/cpufreq/cpufreq-cpu0.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) 
		 * not yet registered, we should try defering probe.

		 */

		if (PTR_ERR(cpu_reg) == -EPROBE_DEFER) {

			dev_err(cpu_dev, "cpu0 regulator not ready, retry\n");

			dev_dbg(cpu_dev, "cpu0 regulator not ready, retry\n");

			ret = -EPROBE_DEFER;

			goto out_put_node;

		}

drivers/cpufreq/cpufreq_opp.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev, 
		goto out;

	}



	freq_table = kzalloc(sizeof(*freq_table) * (max_opps + 1), GFP_KERNEL);

	freq_table = kcalloc(sizeof(*freq_table), (max_opps + 1), GFP_ATOMIC);

	if (!freq_table) {

		ret = -ENOMEM;

		goto out;

drivers/cpufreq/integrator-cpufreq.c

+5 −5
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int integrator_set_target(struct cpufreq_policy *policy, 
	 * Bind to the specified CPU.  When this call returns,

	 * we should be running on the right CPU.

	 */

	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));

	BUG_ON(cpu != smp_processor_id());



	/* get current setting */
@@ -118,7 +118,7 @@ static int integrator_set_target(struct cpufreq_policy *policy, 
	freqs.new = icst_hz(&cclk_params, vco) / 1000;



	if (freqs.old == freqs.new) {

		set_cpus_allowed(current, cpus_allowed);

		set_cpus_allowed_ptr(current, &cpus_allowed);

		return 0;

	}
@@ -141,7 +141,7 @@ static int integrator_set_target(struct cpufreq_policy *policy, 
	/*

	 * Restore the CPUs allowed mask.

	 */

	set_cpus_allowed(current, cpus_allowed);

	set_cpus_allowed_ptr(current, &cpus_allowed);



	cpufreq_freq_transition_end(policy, &freqs, 0);
@@ -157,7 +157,7 @@ static unsigned int integrator_get(unsigned int cpu) 


	cpus_allowed = current->cpus_allowed;



	set_cpus_allowed(current, cpumask_of_cpu(cpu));

	set_cpus_allowed_ptr(current, cpumask_of(cpu));

	BUG_ON(cpu != smp_processor_id());



	/* detect memory etc. */
@@ -173,7 +173,7 @@ static unsigned int integrator_get(unsigned int cpu) 


	current_freq = icst_hz(&cclk_params, vco) / 1000; /* current freq */



	set_cpus_allowed(current, cpus_allowed);

	set_cpus_allowed_ptr(current, &cpus_allowed);



	return current_freq;

}