From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 20 May 2020 00:32:39 +0000 (+0900)
Subject: psci: add 'static inline' to invoke_psci_fn() stub
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c078ad7d954759d9021b126ad05d063a90ebae6;p=oweals%2Fu-boot.git

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>
---

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;
 }