diff options
| author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2016-09-01 16:37:08 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-08 17:02:14 -0400 |
| commit | 65e958910a0342c2d802dea05eaf0de16c1b872a (patch) | |
| tree | 6c1f7592d530415f6186e9f5a5e6b397bc2e9609 /drivers/acpi/processor_driver.c | |
| parent | 139aee73f0c23b95a7e919b8f7e51ccf2d221181 (diff) | |
ACPI / CPPC: Allow build with ACPI_CPU_FREQ_PSS config
Some newer x86 platforms have support for both _CPC and _PSS object. So
kernel config can have both ACPI_CPU_FREQ_PSS and ACPI_CPPC_LIB. So remove
restriction for ACPI_CPPC_LIB to build only when ACPI_CPU_FREQ_PSS is not
defined.
Also for legacy systems with only _PSS, we shouldn't bail out if
acpi_cppc_processor_probe() fails, if ACPI_CPU_FREQ_PSS is also defined.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/processor_driver.c')
| -rw-r--r-- | drivers/acpi/processor_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 0553aeebb228..f5c92be72987 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c | |||
| @@ -245,7 +245,7 @@ static int __acpi_processor_start(struct acpi_device *device) | |||
| 245 | return 0; | 245 | return 0; |
| 246 | 246 | ||
| 247 | result = acpi_cppc_processor_probe(pr); | 247 | result = acpi_cppc_processor_probe(pr); |
| 248 | if (result) | 248 | if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS)) |
| 249 | return -ENODEV; | 249 | return -ENODEV; |
| 250 | 250 | ||
| 251 | if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver) | 251 | if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver) |