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

Commit 3b754621 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())
  PM / devfreq: fix private_data
  Documentation: Fix typo in freezer-subsystem.txt
  PM / QoS: Set cpu_dma_pm_qos->name
parents c8f17084 156acb16

Documentation/cgroups/freezer-subsystem.txt

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ demonstrate this problem using nested bash shells: 


	From a second, unrelated bash shell:

	$ kill -SIGSTOP 16690

	$ kill -SIGCONT 16990

	$ kill -SIGCONT 16690



	<at this point 16990 exits and causes 16644 to exit too>

	<at this point 16690 exits and causes 16644 to exit too>



This happens because bash can observe both signals and choose how it

responds to them.

drivers/base/power/opp.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ struct srcu_notifier_head *opp_get_notifier(struct device *dev) 
	struct device_opp *dev_opp = find_device_opp(dev);



	if (IS_ERR(dev_opp))

		return ERR_PTR(PTR_ERR(dev_opp)); /* matching type */

		return ERR_CAST(dev_opp); /* matching type */



	return &dev_opp->head;

}

include/linux/devfreq.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct devfreq_dev_status { 
	unsigned long total_time;

	unsigned long busy_time;

	unsigned long current_frequency;

	void *private_date;

	void *private_data;

};



/**

kernel/power/qos.c

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ static struct pm_qos_constraints cpu_dma_constraints = { 
};

static struct pm_qos_object cpu_dma_pm_qos = {

	.constraints = &cpu_dma_constraints,

	.name = "cpu_dma_latency",

};



static BLOCKING_NOTIFIER_HEAD(network_lat_notifier);