diff options
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 59 | 
1 files changed, 51 insertions, 8 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 4188a4d3b597..ff5f135f16b1 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -228,10 +228,7 @@ extern int acpi_processor_preregister_performance(struct  extern int acpi_processor_register_performance(struct acpi_processor_performance  					       *performance, unsigned int cpu); -extern void acpi_processor_unregister_performance(struct -						  acpi_processor_performance -						  *performance, -						  unsigned int cpu); +extern void acpi_processor_unregister_performance(unsigned int cpu);  /* note: this locks both the calling module and the processor module           if a _PPC object exists, rmmod is disallowed then */ @@ -318,6 +315,7 @@ int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);  void acpi_processor_set_pdc(acpi_handle handle);  /* in processor_throttling.c */ +#ifdef CONFIG_ACPI_CPU_FREQ_PSS  int acpi_processor_tstate_has_changed(struct acpi_processor *pr);  int acpi_processor_get_throttling_info(struct acpi_processor *pr);  extern int acpi_processor_set_throttling(struct acpi_processor *pr, @@ -330,14 +328,59 @@ extern void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,  			unsigned long action);  extern const struct file_operations acpi_processor_throttling_fops;  extern void acpi_processor_throttling_init(void); +#else +static inline int acpi_processor_tstate_has_changed(struct acpi_processor *pr) +{ +	return 0; +} + +static inline int acpi_processor_get_throttling_info(struct acpi_processor *pr) +{ +	return -ENODEV; +} + +static inline int acpi_processor_set_throttling(struct acpi_processor *pr, +					 int state, bool force) +{ +	return -ENODEV; +} + +static inline void acpi_processor_reevaluate_tstate(struct acpi_processor *pr, +			unsigned long action) {} + +static inline void acpi_processor_throttling_init(void) {} +#endif	/* CONFIG_ACPI_CPU_FREQ_PSS */ +  /* in processor_idle.c */ +extern struct cpuidle_driver acpi_idle_driver; +#ifdef CONFIG_ACPI_PROCESSOR_IDLE  int acpi_processor_power_init(struct acpi_processor *pr);  int acpi_processor_power_exit(struct acpi_processor *pr);  int acpi_processor_cst_has_changed(struct acpi_processor *pr);  int acpi_processor_hotplug(struct acpi_processor *pr); -extern struct cpuidle_driver acpi_idle_driver; +#else +static inline int acpi_processor_power_init(struct acpi_processor *pr) +{ +	return -ENODEV; +} + +static inline int acpi_processor_power_exit(struct acpi_processor *pr) +{ +	return -ENODEV; +} + +static inline int acpi_processor_cst_has_changed(struct acpi_processor *pr) +{ +	return -ENODEV; +} -#ifdef CONFIG_PM_SLEEP +static inline int acpi_processor_hotplug(struct acpi_processor *pr) +{ +	return -ENODEV; +} +#endif /* CONFIG_ACPI_PROCESSOR_IDLE */ + +#if defined(CONFIG_PM_SLEEP) & defined(CONFIG_ACPI_PROCESSOR_IDLE)  void acpi_processor_syscore_init(void);  void acpi_processor_syscore_exit(void);  #else @@ -348,7 +391,7 @@ static inline void acpi_processor_syscore_exit(void) {}  /* in processor_thermal.c */  int acpi_processor_get_limit_info(struct acpi_processor *pr);  extern const struct thermal_cooling_device_ops processor_cooling_ops; -#ifdef CONFIG_CPU_FREQ +#if defined(CONFIG_ACPI_CPU_FREQ_PSS) & defined(CONFIG_CPU_FREQ)  void acpi_thermal_cpufreq_init(void);  void acpi_thermal_cpufreq_exit(void);  #else @@ -360,6 +403,6 @@ static inline void acpi_thermal_cpufreq_exit(void)  {  	return;  } -#endif +#endif	/* CONFIG_ACPI_CPU_FREQ_PSS */  #endif  |