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

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

Merge branches 'pm-domains' and 'pm-cpufreq' 

* pm-domains:
  PM / Domains: cleanup: rename gpd -> genpd in debugfs interface

* pm-cpufreq:
  cpufreq: ppc: Add missing #include <asm/smp.h>
parents 1e3e770c 66a5ca4b 5877b4f4

drivers/base/power/domain.c

+12 −12
Original line number Diff line number Diff line
@@ -2242,7 +2242,7 @@ static void rtpm_status_str(struct seq_file *s, struct device *dev) 
}



static int pm_genpd_summary_one(struct seq_file *s,

		struct generic_pm_domain *gpd)

				struct generic_pm_domain *genpd)

{

	static const char * const status_lookup[] = {

		[GPD_STATE_ACTIVE] = "on",
@@ -2256,26 +2256,26 @@ static int pm_genpd_summary_one(struct seq_file *s, 
	struct gpd_link *link;

	int ret;



	ret = mutex_lock_interruptible(&gpd->lock);

	ret = mutex_lock_interruptible(&genpd->lock);

	if (ret)

		return -ERESTARTSYS;



	if (WARN_ON(gpd->status >= ARRAY_SIZE(status_lookup)))

	if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup)))

		goto exit;

	seq_printf(s, "%-30s  %-15s  ", gpd->name, status_lookup[gpd->status]);

	seq_printf(s, "%-30s  %-15s  ", genpd->name, status_lookup[genpd->status]);



	/*

	 * Modifications on the list require holding locks on both

	 * master and slave, so we are safe.

	 * Also gpd->name is immutable.

	 * Also genpd->name is immutable.

	 */

	list_for_each_entry(link, &gpd->master_links, master_node) {

	list_for_each_entry(link, &genpd->master_links, master_node) {

		seq_printf(s, "%s", link->slave->name);

		if (!list_is_last(&link->master_node, &gpd->master_links))

		if (!list_is_last(&link->master_node, &genpd->master_links))

			seq_puts(s, ", ");

	}



	list_for_each_entry(pm_data, &gpd->dev_list, list_node) {

	list_for_each_entry(pm_data, &genpd->dev_list, list_node) {

		kobj_path = kobject_get_path(&pm_data->dev->kobj, GFP_KERNEL);

		if (kobj_path == NULL)

			continue;
@@ -2287,14 +2287,14 @@ static int pm_genpd_summary_one(struct seq_file *s, 


	seq_puts(s, "\n");

exit:

	mutex_unlock(&gpd->lock);

	mutex_unlock(&genpd->lock);



	return 0;

}



static int pm_genpd_summary_show(struct seq_file *s, void *data)

{

	struct generic_pm_domain *gpd;

	struct generic_pm_domain *genpd;

	int ret = 0;



	seq_puts(s, "    domain                      status         slaves\n");
@@ -2305,8 +2305,8 @@ static int pm_genpd_summary_show(struct seq_file *s, void *data) 
	if (ret)

		return -ERESTARTSYS;



	list_for_each_entry(gpd, &gpd_list, gpd_list_node) {

		ret = pm_genpd_summary_one(s, gpd);

	list_for_each_entry(genpd, &gpd_list, gpd_list_node) {

		ret = pm_genpd_summary_one(s, genpd);

		if (ret)

			break;

	}

drivers/cpufreq/ppc-corenet-cpufreq.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/smp.h>

#include <sysdev/fsl_soc.h>



#include <asm/smp.h>	/* for get_hard_smp_processor_id() in UP configs */



/**

 * struct cpu_data - per CPU data struct

 * @parent: the parent node of cpu clock