提交 fa31ab77 编写于 作者: J James Morse 提交者: Catalin Marinas

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: NLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: NJames Morse <james.morse@arm.com>
Acked-by: NCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
上级 f92b5462
...@@ -117,7 +117,7 @@ bool __init acpi_psci_present(void) ...@@ -117,7 +117,7 @@ bool __init acpi_psci_present(void)
} }
/* Whether HVC must be used instead of SMC as the PSCI conduit */ /* Whether HVC must be used instead of SMC as the PSCI conduit */
bool __init acpi_psci_use_hvc(void) bool acpi_psci_use_hvc(void)
{ {
return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC; return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;
} }
......
...@@ -47,10 +47,11 @@ static inline int psci_dt_init(void) { return 0; } ...@@ -47,10 +47,11 @@ static inline int psci_dt_init(void) { return 0; }
#if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI)
int __init psci_acpi_init(void); int __init psci_acpi_init(void);
bool __init acpi_psci_present(void); bool __init acpi_psci_present(void);
bool __init acpi_psci_use_hvc(void); bool acpi_psci_use_hvc(void);
#else #else
static inline int psci_acpi_init(void) { return 0; } static inline int psci_acpi_init(void) { return 0; }
static inline bool acpi_psci_present(void) { return false; } static inline bool acpi_psci_present(void) { return false; }
static inline bool acpi_psci_use_hvc(void) {return false; }
#endif #endif
#endif /* __LINUX_PSCI_H */ #endif /* __LINUX_PSCI_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册