Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index f4c2a87d02c152b2961551836a92645a2d36ab11..fd8849ae4a8ed483ecf9b7db4e7fbde29de53c7a 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -1508,6 +1508,12 @@ static inline int find_acpi_cpu_topology_hetero_id(unsigned int cpu)
 }
 #endif
 
+#ifdef CONFIG_ARM64
+void acpi_arm_init(void);
+#else
+static inline void acpi_arm_init(void) { }
+#endif
+
 #ifdef CONFIG_ACPI_PCC
 void acpi_init_pcc(void);
 #else