Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3b7546211d53f600e15ca7867adbf3c085b8ecc9

Authored by Linus Torvalds
2 parents c8f17084fe 156acb166e
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 4 changed files Side-by-side Diff

Documentation/cgroups/freezer-subsystem.txt
Diff comments   View file @ 3b75462
... ... @@ -33,9 +33,9 @@
33 33  
34 34 From a second, unrelated bash shell:
35 35 $ kill -SIGSTOP 16690
36   - $ kill -SIGCONT 16990
  36 + $ kill -SIGCONT 16690
37 37  
38   - <at this point 16990 exits and causes 16644 to exit too>
  38 + <at this point 16690 exits and causes 16644 to exit too>
39 39  
40 40 This happens because bash can observe both signals and choose how it
41 41 responds to them.
drivers/base/power/opp.c
Diff comments   View file @ 3b75462
... ... @@ -669,7 +669,7 @@
669 669 struct device_opp *dev_opp = find_device_opp(dev);
670 670  
671 671 if (IS_ERR(dev_opp))
672   - return ERR_PTR(PTR_ERR(dev_opp)); /* matching type */
  672 + return ERR_CAST(dev_opp); /* matching type */
673 673  
674 674 return &dev_opp->head;
675 675 }
include/linux/devfreq.h
Diff comments   View file @ 3b75462
... ... @@ -41,7 +41,7 @@
41 41 unsigned long total_time;
42 42 unsigned long busy_time;
43 43 unsigned long current_frequency;
44   - void *private_date;
  44 + void *private_data;
45 45 };
46 46  
47 47 /**
... ... @@ -70,6 +70,7 @@
70 70 };
71 71 static struct pm_qos_object cpu_dma_pm_qos = {
72 72 .constraints = &cpu_dma_constraints,
  73 + .name = "cpu_dma_latency",
73 74 };
74 75  
75 76 static BLOCKING_NOTIFIER_HEAD(network_lat_notifier);