| Message ID | 20201117023807.8266-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
| Series | [-next] thermal: intel_pch_thermal: fix build for ACPI not enabled | expand |
> -----Original Message----- > From: Randy Dunlap <rdunlap@infradead.org> > Sent: Tuesday, November 17, 2020 8:08 AM > To: linux-kernel@vger.kernel.org > Cc: Randy Dunlap <rdunlap@infradead.org>; Pawnikar, Sumeet R > <sumeet.r.pawnikar@intel.com>; Daniel Lezcano <daniel.lezcano@linaro.org>; > Zhang, Rui <rui.zhang@intel.com>; Amit Kucheria <amitk@kernel.org>; linux- > pm@vger.kernel.org > Subject: [PATCH -next] 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. > Thanks for finding this issue and fixing it. Acked-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com> > ../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 > --- > drivers/thermal/intel/intel_pch_thermal.c | 4 ++++ > 1 file changed, 4 insertions(+) > > --- linux-next-20201116.orig/drivers/thermal/intel/intel_pch_thermal.c > +++ linux-next-20201116/drivers/thermal/intel/intel_pch_thermal.c > @@ -214,8 +214,12 @@ static int pch_wpt_suspend(struct pch_th > } > > /* 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())
--- linux-next-20201116.orig/drivers/thermal/intel/intel_pch_thermal.c +++ linux-next-20201116/drivers/thermal/intel/intel_pch_thermal.c @@ -214,8 +214,12 @@ static int pch_wpt_suspend(struct pch_th } /* 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 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 --- drivers/thermal/intel/intel_pch_thermal.c | 4 ++++ 1 file changed, 4 insertions(+)