dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'pm-sleep', 'powercap', 'pm-domains' and 'pm-cpufreq'

Browse Source 
* pm-sleep:
  PM / sleep: Fix test_suspend= command line option

* powercap:
  powercap / RAPL: change domain detection message
  powercap / RAPL: add support for CPU model 0x3f

* pm-domains:
  PM / domains: Make generic_pm_domain.name const

* pm-cpufreq:
  cpufreq: intel_pstate: Remove unneeded variable
This commit is contained in:
Rafael J. Wysocki
2014-09-05 15:29:56 +02:00
parent 73f517b85f 62109b4317 fcdf1797e1 d07e9c178f 73f1ae8ab0
commit 9aa4e2f6ac
6 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/pm_domain.h
+1 -1
View File
@@ -60,7 +60,7 @@ struct generic_pm_domain {
struct mutex lock;
struct dev_power_governor *gov;
struct work_struct power_off_work;
char *name;
const char *name;
unsigned int in_progress; /* Number of devices being suspended now */
atomic_t sd_count; /* Number of subdomains with power "on" */
enum gpd_status status; /* Current state of the domain */