From: Randy Dunlap Date: Tue, 17 Nov 2020 02:38:07 +0000 (-0800) Subject: thermal: intel_pch_thermal: fix build for ACPI not enabled X-Git-Tag: v5.11-rc1~152^2~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be133722df5168d2f304cc59b80d3d21d6ea9433;p=thirdparty%2Flinux.git 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 Cc: Sumeet Pawnikar Cc: Daniel Lezcano Cc: Zhang Rui Cc: Amit Kucheria Cc: linux-pm@vger.kernel.org Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20201117023807.8266-1-rdunlap@infradead.org --- diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c index 32e1b285d58ac..d7c05c00881ee 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())