psci: add 'static inline' to invoke_psci_fn() stub
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Wed, 20 May 2020 00:32:39 +0000 (09:32 +0900)
committerTom Rini <trini@konsulko.com>
Tue, 23 Jun 2020 18:43:24 +0000 (14:43 -0400)
Avoid potential multiple definitions when CONFIG_ARM_PSCI_FW
is disabled.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
include/linux/psci.h

index 9433df836b6483fcdaa0a9791ad00cc1d6983f6a..841dbc8da7e266c6d0014334160ffdf00d30033a 100644 (file)
@@ -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;
 }