summaryrefslogtreecommitdiff
path: root/include/linux/psci.h
diff options
context:
space:
mode:
authorJames Morse <james.morse@arm.com>2018-01-08 15:38:15 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2018-01-14 18:49:49 +0000
commitfa31ab77ced9fbab87fbac4fca3682009b7f9be2 (patch)
tree142cb8f42a6d13946909650ffbe812784e3e6415 /include/linux/psci.h
parentf92b5462a2f22d13a75dc663f7b2fac16a3e61cb (diff)
arm64: acpi: Remove __init from acpi_psci_use_hvc() for use by SDEI
SDEI inherits the 'use hvc' bit that is also used by PSCI. PSCI does all its initialisation early, SDEI does its late. Remove the __init annotation from acpi_psci_use_hvc(). Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: James Morse <james.morse@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'include/linux/psci.h')
-rw-r--r--include/linux/psci.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h
index 6306ab10af18..f724fd8c78e8 100644
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -47,10 +47,11 @@ static inline int psci_dt_init(void) { return 0; }
#if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI)
int __init psci_acpi_init(void);
bool __init acpi_psci_present(void);
-bool __init acpi_psci_use_hvc(void);
+bool acpi_psci_use_hvc(void);
#else
static inline int psci_acpi_init(void) { return 0; }
static inline bool acpi_psci_present(void) { return false; }
+static inline bool acpi_psci_use_hvc(void) {return false; }
#endif
#endif /* __LINUX_PSCI_H */