diff options
author | James Morse <james.morse@arm.com> | 2018-01-08 10:38:15 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-01-14 13:49:49 -0500 |
commit | fa31ab77ced9fbab87fbac4fca3682009b7f9be2 (patch) | |
tree | 142cb8f42a6d13946909650ffbe812784e3e6415 /include/linux/psci.h | |
parent | f92b5462a2f22d13a75dc663f7b2fac16a3e61cb (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.h | 3 |
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; } | |||
47 | #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) | 47 | #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) |
48 | int __init psci_acpi_init(void); | 48 | int __init psci_acpi_init(void); |
49 | bool __init acpi_psci_present(void); | 49 | bool __init acpi_psci_present(void); |
50 | bool __init acpi_psci_use_hvc(void); | 50 | bool acpi_psci_use_hvc(void); |
51 | #else | 51 | #else |
52 | static inline int psci_acpi_init(void) { return 0; } | 52 | static inline int psci_acpi_init(void) { return 0; } |
53 | static inline bool acpi_psci_present(void) { return false; } | 53 | static inline bool acpi_psci_present(void) { return false; } |
54 | static inline bool acpi_psci_use_hvc(void) {return false; } | ||
54 | #endif | 55 | #endif |
55 | 56 | ||
56 | #endif /* __LINUX_PSCI_H */ | 57 | #endif /* __LINUX_PSCI_H */ |