projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: cpufreq: Switch to QoS requests instead of cpufreq notifier
[linux-2.6-block.git]
/
include
/
acpi
/
processor.h
diff --git
a/include/acpi/processor.h
b/include/acpi/processor.h
index 1194a4c78d557fb411e9672291f6bab6e3623e9d..f936033cb9e6d57e0b965b5cb742ac868c10c463 100644
(file)
--- a/
include/acpi/processor.h
+++ b/
include/acpi/processor.h
@@
-4,6
+4,8
@@
#include <linux/kernel.h>
#include <linux/cpu.h>
#include <linux/kernel.h>
#include <linux/cpu.h>
+#include <linux/cpufreq.h>
+#include <linux/pm_qos.h>
#include <linux/thermal.h>
#include <asm/acpi.h>
#include <linux/thermal.h>
#include <asm/acpi.h>
@@
-230,6
+232,8
@@
struct acpi_processor {
struct acpi_processor_limit limit;
struct thermal_cooling_device *cdev;
struct device *dev; /* Processor device. */
struct acpi_processor_limit limit;
struct thermal_cooling_device *cdev;
struct device *dev; /* Processor device. */
+ struct dev_pm_qos_request perflib_req;
+ struct dev_pm_qos_request thermal_req;
};
struct acpi_processor_errata {
};
struct acpi_processor_errata {
@@
-296,16
+300,22
@@
static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx
/* in processor_perflib.c */
#ifdef CONFIG_CPU_FREQ
/* in processor_perflib.c */
#ifdef CONFIG_CPU_FREQ
-void acpi_processor_ppc_init(void);
-void acpi_processor_ppc_exit(void);
+extern bool acpi_processor_cpufreq_init;
+void acpi_processor_ignore_ppc_init(void);
+void acpi_processor_ppc_init(int cpu);
+void acpi_processor_ppc_exit(int cpu);
void acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
#else
void acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
#else
-static inline void acpi_processor_ppc_init(void)
+static inline void acpi_processor_
ignore_
ppc_init(void)
{
return;
}
{
return;
}
-static inline void acpi_processor_ppc_exit(void)
+static inline void acpi_processor_ppc_init(int cpu)
+{
+ return;
+}
+static inline void acpi_processor_ppc_exit(int cpu)
{
return;
}
{
return;
}
@@
-421,14
+431,14
@@
static inline int acpi_processor_hotplug(struct acpi_processor *pr)
int acpi_processor_get_limit_info(struct acpi_processor *pr);
extern const struct thermal_cooling_device_ops processor_cooling_ops;
#if defined(CONFIG_ACPI_CPU_FREQ_PSS) & defined(CONFIG_CPU_FREQ)
int acpi_processor_get_limit_info(struct acpi_processor *pr);
extern const struct thermal_cooling_device_ops processor_cooling_ops;
#if defined(CONFIG_ACPI_CPU_FREQ_PSS) & defined(CONFIG_CPU_FREQ)
-void acpi_thermal_cpufreq_init(
void
);
-void acpi_thermal_cpufreq_exit(
void
);
+void acpi_thermal_cpufreq_init(
int cpu
);
+void acpi_thermal_cpufreq_exit(
int cpu
);
#else
#else
-static inline void acpi_thermal_cpufreq_init(
void
)
+static inline void acpi_thermal_cpufreq_init(
int cpu
)
{
return;
}
{
return;
}
-static inline void acpi_thermal_cpufreq_exit(
void
)
+static inline void acpi_thermal_cpufreq_exit(
int cpu
)
{
return;
}
{
return;
}