[src/trunk]: src/sys/arch fix build for 32bit non-bridge SMP kernels

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/383330b9b949
branches:  trunk
changeset: 831411:383330b9b949
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Mar 29 16:19:46 2018 +0000

description:
fix build for 32bit non-bridge SMP kernels

diffstat:

 sys/arch/macppc/macppc/cpu.c    |  6 +++---
 sys/arch/powerpc/oea/cpu_subr.c |  6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r d768dd6c6eae -r 383330b9b949 sys/arch/macppc/macppc/cpu.c
--- a/sys/arch/macppc/macppc/cpu.c      Thu Mar 29 15:45:15 2018 +0000
+++ b/sys/arch/macppc/macppc/cpu.c      Thu Mar 29 16:19:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.62 2018/03/22 21:28:58 macallan Exp $        */
+/*     $NetBSD: cpu.c,v 1.63 2018/03/29 16:19:46 macallan Exp $        */
 
 /*-
  * Copyright (c) 2001 Tsubai Masanari.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.62 2018/03/22 21:28:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.63 2018/03/29 16:19:46 macallan Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
@@ -209,7 +209,7 @@
 {
 #ifdef OPENPIC
        if (openpic_base) {
-               uint32_t kl_base = oea_mapiodev(0x80000000, 0x1000);
+               uint32_t kl_base = (uint32_t)oea_mapiodev(0x80000000, 0x1000);
                uint32_t gpio = kl_base + 0x5c; /* XXX */
                u_int node, off;
                char cpupath[32];
diff -r d768dd6c6eae -r 383330b9b949 sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c   Thu Mar 29 15:45:15 2018 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c   Thu Mar 29 16:19:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.91 2018/03/22 15:18:06 macallan Exp $   */
+/*     $NetBSD: cpu_subr.c,v 1.92 2018/03/29 16:19:46 macallan Exp $   */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.91 2018/03/22 15:18:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.92 2018/03/29 16:19:46 macallan Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_ppccache.h"
@@ -1430,9 +1430,11 @@
                __asm ("mtdbatl 3,%0" :: "r"(h->hatch_dbatl[3]));
        }
 
+#ifdef PPC_OEA64_BRIDGE
        if ((oeacpufeat & OEACPU_64_BRIDGE) != 0) {
                mtspr64(SPR_HID0, h->hatch_hid0);
        } else
+#endif
                mtspr(SPR_HID0, h->hatch_hid0);
 
        if ((oeacpufeat & OEACPU_NOBAT) == 0) {