Skip to contentSkip to conversation

psci: add 'static inline' to invoke_psci_fn() stub

PATCH New Masahiro Yamada 2 participants 2 messages May 20, 2020 – Jun 25, 2020 Power state coordination interface (psci)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 psci: add 'static inline' to invoke_psci_fn() stub

Avoid potential multiple definitions when CONFIG_ARM_PSCI_FW is disabled.

---

 include/linux/psci.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/psci.h +2 -2
index 9433df836b..841dbc8da7 100644
@@ -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;
 }
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 psci: add 'static inline' to invoke_psci_fn() stub

Quoted 4 lines · Masahiro Yamada

Avoid potential multiple definitions when CONFIG_ARM_PSCI_FW is disabled.

Applied (back on June 23rd) to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200625/9b79ac61/attachment.sig>