Merge branch 'pdc' into release
This commit is contained in:
@@ -224,8 +224,6 @@ struct acpi_processor {
|
||||
struct acpi_processor_throttling throttling;
|
||||
struct acpi_processor_limit limit;
|
||||
struct thermal_cooling_device *cdev;
|
||||
/* the _PDC objects for this processor, if any */
|
||||
struct acpi_object_list *pdc;
|
||||
};
|
||||
|
||||
struct acpi_processor_errata {
|
||||
@@ -257,9 +255,6 @@ int acpi_processor_notify_smm(struct module *calling_module);
|
||||
DECLARE_PER_CPU(struct acpi_processor *, processors);
|
||||
extern struct acpi_processor_errata errata;
|
||||
|
||||
void arch_acpi_processor_init_pdc(struct acpi_processor *pr);
|
||||
void arch_acpi_processor_cleanup_pdc(struct acpi_processor *pr);
|
||||
|
||||
#ifdef ARCH_HAS_POWER_INIT
|
||||
void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
|
||||
unsigned int cpu);
|
||||
@@ -326,7 +321,7 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
|
||||
#endif /* CONFIG_CPU_FREQ */
|
||||
|
||||
/* in processor_pdc.c */
|
||||
void acpi_processor_set_pdc(struct acpi_processor *pr);
|
||||
void acpi_processor_set_pdc(acpi_handle handle);
|
||||
|
||||
/* in processor_throttling.c */
|
||||
int acpi_processor_tstate_has_changed(struct acpi_processor *pr);
|
||||
|
||||
Reference in New Issue
Block a user