diff options
author | Tom Rini <trini@konsulko.com> | 2020-08-05 16:05:33 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-08-05 16:05:33 -0400 |
commit | 635dfee2cb522f5072530ca63fd4ab02890b90a2 (patch) | |
tree | 8abedb1958a51367a9a08922eea3d33cfb6035f4 /drivers/firmware/psci.c | |
parent | f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1 (diff) | |
parent | 7b27e0fe13d8d44da6cd357a69668a726b852502 (diff) |
Merge branch '2020-08-05-misc-fixes'
- A large number of assorted fixes and minor improvements
Diffstat (limited to 'drivers/firmware/psci.c')
-rw-r--r-- | drivers/firmware/psci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 23cf807591c..7d2e49fd3e3 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -25,7 +25,11 @@ #define PSCI_METHOD_HVC 1 #define PSCI_METHOD_SMC 2 +#if CONFIG_IS_ENABLED(EFI_LOADER) int __efi_runtime_data psci_method; +#else +int psci_method __attribute__ ((section(".data"))); +#endif unsigned long __efi_runtime invoke_psci_fn (unsigned long function_id, unsigned long arg0, |