Module Name: src
Committed By: macallan
Date: Thu Mar 29 16:19:46 UTC 2018
Modified Files:
src/sys/arch/macppc/macppc: cpu.c
src/sys/arch/powerpc/oea: cpu_subr.c
Log Message:
fix build for 32bit non-bridge SMP kernels
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/macppc/macppc/cpu.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/powerpc/oea/cpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/macppc/cpu.c
diff -u src/sys/arch/macppc/macppc/cpu.c:1.62 src/sys/arch/macppc/macppc/cpu.c:1.63
--- src/sys/arch/macppc/macppc/cpu.c:1.62 Thu Mar 22 21:28:58 2018
+++ src/sys/arch/macppc/macppc/cpu.c Thu Mar 29 16:19:46 2018
@@ -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 @@ md_setup_trampoline(volatile struct cpu_
{
#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];
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.91 src/sys/arch/powerpc/oea/cpu_subr.c:1.92
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.91 Thu Mar 22 15:18:06 2018
+++ src/sys/arch/powerpc/oea/cpu_subr.c Thu Mar 29 16:19:46 2018
@@ -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 @@ cpu_hatch(void)
__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) {
