Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa31ab77 authored by James Morse's avatar James Morse Committed by Catalin Marinas
Browse files

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: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f92b5462

arch/arm64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ bool __init acpi_psci_present(void) 
}



/* 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;

}

include/linux/psci.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */