Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/fdt Fix build w/o PSCI



details:   https://anonhg.NetBSD.org/src/rev/b9de031f011e
branches:  trunk
changeset: 450425:b9de031f011e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Apr 13 17:34:38 2019 +0000

description:
Fix build w/o PSCI

diffstat:

 sys/arch/arm/fdt/cpu_fdt.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 19b4dd8b72b7 -r b9de031f011e sys/arch/arm/fdt/cpu_fdt.c
--- a/sys/arch/arm/fdt/cpu_fdt.c        Sat Apr 13 17:21:49 2019 +0000
+++ b/sys/arch/arm/fdt/cpu_fdt.c        Sat Apr 13 17:34:38 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.23 2019/04/13 17:21:49 jmcneill Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.24 2019/04/13 17:34:38 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
 #include "psci_fdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.23 2019/04/13 17:21:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.24 2019/04/13 17:34:38 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -153,7 +153,7 @@
        config_found(self, faa, NULL);
 }
 
-#ifdef MULTIPROCESSOR
+#if defined(MULTIPROCESSOR) && (NPSCI_FDT > 0 || defined(__aarch64__))
 static register_t
 cpu_fdt_mpstart_pa(void)
 {
@@ -165,7 +165,9 @@
 
        return pa;
 }
+#endif
 
+#ifdef MULTIPROCESSOR
 static bool
 arm_fdt_cpu_okay(const int child)
 {



Home | Main Index | Thread Index | Old Index