diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-05-20 09:32:39 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-23 14:43:24 -0400 |
| commit | 1c078ad7d954759d9021b126ad05d063a90ebae6 (patch) | |
| tree | d7199a387a4fad25e82cf5932950a7e452d0ff10 | |
| parent | 6d81eed9fd8071ed783289167ae979de6355b8c4 (diff) | |
psci: add 'static inline' to invoke_psci_fn() stub
Avoid potential multiple definitions when CONFIG_ARM_PSCI_FW
is disabled.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | include/linux/psci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h index 9433df836b..841dbc8da7 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -91,8 +91,8 @@ unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); #else -unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, - unsigned long a2, unsigned long a3) +static inline unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3) { return PSCI_RET_DISABLED; } |