hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2011-11-08 14:24:18 -08:00
parent c8f17084fe 156acb166e
commit 3b7546211d
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/cgroups/freezer-subsystem.txt
View File

@ -33,9 +33,9 @@ demonstrate this problem using nested bash shells:
From a second, unrelated bash shell: From a second, unrelated bash shell:
$ kill -SIGSTOP 16690 $ 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 This happens because bash can observe both signals and choose how it
responds to them. responds to them.

2
drivers/base/power/opp.c
View File

@ -669,7 +669,7 @@ struct srcu_notifier_head *opp_get_notifier(struct device *dev)
struct device_opp *dev_opp = find_device_opp(dev); struct device_opp *dev_opp = find_device_opp(dev);
if (IS_ERR(dev_opp)) 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; return &dev_opp->head;
} }

2
include/linux/devfreq.h
View File

@ -41,7 +41,7 @@ struct devfreq_dev_status {
unsigned long total_time; unsigned long total_time;
unsigned long busy_time; unsigned long busy_time;
unsigned long current_frequency; unsigned long current_frequency;
void *private_date; void *private_data;
}; };
/** /**

1
kernel/power/qos.c
View File

@ -70,6 +70,7 @@ static struct pm_qos_constraints cpu_dma_constraints = {
}; };
static struct pm_qos_object cpu_dma_pm_qos = { static struct pm_qos_object cpu_dma_pm_qos = {
.constraints = &cpu_dma_constraints, .constraints = &cpu_dma_constraints,
.name = "cpu_dma_latency",
}; };
static BLOCKING_NOTIFIER_HEAD(network_lat_notifier); static BLOCKING_NOTIFIER_HEAD(network_lat_notifier);