| Message ID | 20200520003239.435016-1-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 1c078ad7d954759d9021b126ad05d063a90ebae6 |
| Headers | show |
| Series | psci: add 'static inline' to invoke_psci_fn() stub | expand |
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; }
Avoid potential multiple definitions when CONFIG_ARM_PSCI_FW is disabled. Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com> --- include/linux/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)