Module Name: src
Committed By: skrll
Date: Sat Nov 28 14:02:30 UTC 2020
Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
Log Message:
Fix thinko in kern_vtopdiff calculation
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.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/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.32 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.33
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.32 Thu Nov 26 12:56:34 2020
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Sat Nov 28 14:02:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.32 2020/11/26 12:56:34 skrll Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.33 2020/11/28 14:02:30 skrll Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.32 2020/11/26 12:56:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.33 2020/11/28 14:02:30 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -630,7 +630,7 @@ initarm(void *arg)
bootconfig.dram[0].address = physical_start;
bootconfig.dram[0].pages = physmem;
- kern_vtopdiff = KERNEL_BASE + GEMINI_DRAM_BASE;
+ kern_vtopdiff = KERNEL_BASE - GEMINI_DRAM_BASE;
/*
* Our kernel is at the beginning of memory, so set our free space to
Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.10 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.11
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.10 Thu Nov 26 12:56:34 2020
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Sat Nov 28 14:02:30 2020
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.10 2020/11/26 12:56:34 skrll Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.11 2020/11/28 14:02:30 skrll Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@ initarm(void *arg)
if (set_cpufuncs())
panic("set_cpufuncs failed");
- kern_vtopdiff = KERNEL_BASE + KERNEL_BASE_PHYS;
+ kern_vtopdiff = KERNEL_BASE - KERNEL_BASE_PHYS;
pmap_devmap_register(devmap);
consinit();
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.25 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.26
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.25 Tue Jul 16 14:41:48 2019
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Sat Nov 28 14:02:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.25 2019/07/16 14:41:48 skrll Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.26 2020/11/28 14:02:30 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.25 2019/07/16 14:41:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.26 2020/11/28 14:02:30 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -213,7 +213,7 @@ pv_addr_t kernel_pt_table[NUM_KERNEL_PTS
#define KERNEL_BASE_PHYS ((paddr_t)&KERNEL_BASE_phys)
#if 0
-u_long kern_vtopdiff = KERNEL_BASE + KERNEL_BASE_PHYS;
+u_long kern_vtopdiff = KERNEL_BASE - KERNEL_BASE_PHYS;
#else
u_long kern_vtopdiff = 0;
#endif
