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

Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into release

Browse Source
This commit is contained in:
Len Brown
2012-01-18 01:15:54 -05:00
parent cb7971756b c130bd6f82 5c2a9f06a9 65b7f839ce 9f10f6a520 553575f1ae
commit 79ba0db69c
12 changed files with 345 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/acpi/acpi_numa.h
+1
View File
@@ -15,6 +15,7 @@ extern int pxm_to_node(int);
extern int node_to_pxm(int);
extern void __acpi_map_pxm_to_node(int, int);
extern int acpi_map_pxm_to_node(int);
extern unsigned char acpi_srat_revision;
#endif /* CONFIG_ACPI_NUMA */
#endif /* __ACP_NUMA_H */
include/linux/cpuidle.h
+7
View File
@@ -188,7 +188,14 @@ struct cpuidle_governor {
extern int cpuidle_register_governor(struct cpuidle_governor *gov);
extern void cpuidle_unregister_governor(struct cpuidle_governor *gov);
#ifdef CONFIG_INTEL_IDLE
extern int intel_idle_cpu_init(int cpu);
#else
static inline int intel_idle_cpu_init(int cpu) { return -1; }
#endif
#else
static inline int intel_idle_cpu_init(int cpu) { return -1; }
static inline int cpuidle_register_governor(struct cpuidle_governor *gov)
{return 0;}