linux-kernel - [PATCH -next] thermal: intel_pch_thermal: fix build for ACPI not enabled

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 16 Nov 2020 18:38:07 -0800
From:   Randy Dunlap <rdunlap@...radead.org>
To:     linux-kernel@...r.kernel.org
Cc:     Randy Dunlap <rdunlap@...radead.org>,
        Sumeet Pawnikar <sumeet.r.pawnikar@...el.com>,
        Daniel Lezcano <daniel.lezcano@...aro.org>,
        Zhang Rui <rui.zhang@...el.com>,
        Amit Kucheria <amitk@...nel.org>, linux-pm@...r.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.

../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@...radead.org>
Cc: Sumeet Pawnikar <sumeet.r.pawnikar@...el.com>
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Zhang Rui <rui.zhang@...el.com>
Cc: Amit Kucheria <amitk@...nel.org>
Cc: linux-pm@...r.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())