diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 14:24:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 14:24:18 -0800 |
| commit | 3b7546211d53f600e15ca7867adbf3c085b8ecc9 (patch) | |
| tree | 9bd7f0eb414bad882d3e7f59e742ac1a21e804c5 | |
| parent | c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1 (diff) | |
| parent | 156acb166ea9a43d7fcdf9b8051694ce4e91dbfc (diff) | |
| download | linux-rootkitbarrier-3b7546211d53f600e15ca7867adbf3c085b8ecc9.tar.gz | |
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
| -rw-r--r-- | Documentation/cgroups/freezer-subsystem.txt | 4 | ||||
| -rw-r--r-- | drivers/base/power/opp.c | 2 | ||||
| -rw-r--r-- | include/linux/devfreq.h | 2 | ||||
| -rw-r--r-- | kernel/power/qos.c | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/cgroups/freezer-subsystem.txt b/Documentation/cgroups/freezer-subsystem.txt index c21d77742a0799..7e62de1e59ff03 100644 --- a/Documentation/cgroups/freezer-subsystem.txt +++ b/Documentation/cgroups/freezer-subsystem.txt @@ -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. diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 434a6c01167521..95706fa24c7355 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -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; } diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index afb94583960c9f..98ce8124b1cc5e 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -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; }; /** diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 56db7514718689..995e3bd3417b93 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -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); |