| Message ID | 160734883428.3364.5035247709632805604.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers | show |
| Series | [thermal:,thermal/next] thermal: intel_pch_thermal: fix build for ACPI not enabled | expand |
diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c index 32e1b28..d7c05c0 100644 --- a/drivers/thermal/intel/intel_pch_thermal.c +++ b/drivers/thermal/intel/intel_pch_thermal.c @@ -214,8 +214,12 @@ static int pch_wpt_suspend(struct pch_thermal_device *ptd) } /* Do not check temperature if it is not a S0ix capable platform */ +#ifdef CONFIG_ACPI if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)) return 0; +#else + return 0; +#endif /* Do not check temperature if it is not s2idle */ if (pm_suspend_via_firmware())
The following commit has been merged into the thermal/next branch of thermal: Commit-ID: be133722df5168d2f304cc59b80d3d21d6ea9433 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//be133722df5168d2f304cc59b80d3d21d6ea9433 Author: Randy Dunlap <rdunlap@infradead.org> AuthorDate: Mon, 16 Nov 2020 18:38:07 -08:00 Committer: Daniel Lezcano <daniel.lezcano@linaro.org> CommitterDate: Tue, 17 Nov 2020 10:05:43 +01:00 thermal: intel_pch_thermal: fix build for ACPI not enabled The reference to acpi_gbl_FADT causes a build error when ACPI is not enabled. Fix by making that conditional on CONFIG_ACPI. ../drivers/thermal/intel/intel_pch_thermal.c: In function 'pch_wpt_suspend': ../drivers/thermal/intel/intel_pch_thermal.c:217:8: error: 'acpi_gbl_FADT' undeclared (first use in this function); did you mean 'acpi_get_type'? if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)) ^~~~~~~~~~~~~ Fixes: ef63b043ac86 ("thermal: intel: pch: fix S0ix failure due to PCH temperature above threshold") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Amit Kucheria <amitk@kernel.org> Cc: linux-pm@vger.kernel.org Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20201117023807.8266-1-rdunlap@infradead.org --- drivers/thermal/intel/intel_pch_thermal.c | 4 ++++ 1 file changed, 4 insertions(+)