[PATCH 1/6] ARM: uniphier: include <asm/system.h> instead of <asm/cache.h> from psci.c

Masahiro Yamada yamada.masahiro at socionext.com
Wed May 20 05:31:23 CEST 2020

I do not understand the change made to this file by
commit 90526e9fbac4 ("common: Drop net.h from common header").

  git show 90526e9fbac4 -- arch/arm/mach-uniphier/arm32/psci.c

It added <asm/cache.h> while this file does not call the standard cache
functions at all.

All the uniphier-specific cache functions, uniphier_cache_*() are
declared in cache-uniphier.h, which is already included from this file.

Including <asm/system.h> is sensible to fix the -Wmissing-prototypes
warnings because this file defines psci_cpu_on and psci_system_reset().

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>

 arch/arm/mach-uniphier/arm32/psci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c
index e231e7b60b..b54dc3979d 100644
--- a/arch/arm/mach-uniphier/arm32/psci.c
+++ b/arch/arm/mach-uniphier/arm32/psci.c
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <cpu_func.h>
-#include <asm/cache.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/io.h>
@@ -17,6 +16,7 @@
 #include <asm/processor.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
+#include <asm/system.h>
 #include "../debug.h"
 #include "../soc-info.h"

More information about the U-Boot mailing list