CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: skrll Date: Wed Dec 27 07:46:21 UTC 2023 Modified Files: src/sys/arch/arm/rockchip: rk3399_pcie.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/rockchip/rk3399_pcie.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/arm/rockchip/rk3399_pcie.c diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.20 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.21 --- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.20 Sun Mar 26 19:10:33 2023 +++ src/sys/arch/arm/rockchip/rk3399_pcie.c Wed Dec 27 07:46:20 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399_pcie.c,v 1.20 2023/03/26 19:10:33 andvar Exp $ */ +/* $NetBSD: rk3399_pcie.c,v 1.21 2023/12/27 07:46:20 skrll Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -17,7 +17,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.20 2023/03/26 19:10:33 andvar Exp $"); +__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.21 2023/12/27 07:46:20 skrll Exp $"); #include #include @@ -249,7 +249,7 @@ rkpcie_attach(device_t parent, device_t fdtbus_regulator_enable(regulator); fdtbus_regulator_release(regulator); } - + fdtbus_clock_assign(phandle); clock_enable_all(phandle); @@ -301,7 +301,7 @@ again: delay(1000); /* TPERST. use 1ms */ delayed_ms += 1; - + reset_deassert(phandle, "pm"); reset_deassert(phandle, "aclk"); reset_deassert(phandle, "pclk");
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: skrll Date: Wed Dec 27 07:46:21 UTC 2023 Modified Files: src/sys/arch/arm/rockchip: rk3399_pcie.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/rockchip/rk3399_pcie.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Dec 27 03:03:42 UTC 2023
Modified Files:
src/sys/arch/amiga/amiga: amiga_init.c genassym.cf locore.s
src/sys/arch/atari/atari: atari_init.c genassym.cf locore.s
src/sys/arch/cesfic/cesfic: genassym.cf locore.s
src/sys/arch/hp300/hp300: genassym.cf locore.s
src/sys/arch/luna68k/luna68k: genassym.cf locore.s
src/sys/arch/m68k/include: pmap_motorola.h pte_motorola.h
src/sys/arch/mac68k/mac68k: genassym.cf locore.s
src/sys/arch/mvme68k/mvme68k: genassym.cf locore.s
src/sys/arch/news68k/news68k: genassym.cf locore.s
src/sys/arch/next68k/next68k: genassym.cf locore.s
src/sys/arch/x68k/x68k: genassym.cf locore.s
Log Message:
Stop using magic numbers for the MMU root pointer attributes and the
Translation Control register, and also get rid of "#if PGSHIFT == ..."
where those magic numbers are used.
Instead, define new macros: MMU51_SRP_BITS, MMU51_CRP_BITS, MMU51_TCR_BITS,
and MMU40_TCR_BITS, in terms of the definitions in mmu_{40,51}.h. These
automagically adapt to 8K and 4K pages based on the machine-specific value
of PGSHIFT.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amiga/amiga/amiga_init.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/amiga/genassym.cf
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/atari/atari/genassym.cf
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/cesfic/genassym.cf
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hp300/hp300/genassym.cf
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/include/pte_motorola.h
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mac68k/mac68k/genassym.cf
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mvme68k/mvme68k/genassym.cf
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/news68k/news68k/genassym.cf
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/next68k/next68k/genassym.cf
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x68k/x68k/genassym.cf
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/x68k/x68k/locore.s
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/amiga/amiga/amiga_init.c
diff -u src/sys/arch/amiga/amiga/amiga_init.c:1.131 src/sys/arch/amiga/amiga/amiga_init.c:1.132
--- src/sys/arch/amiga/amiga/amiga_init.c:1.131 Tue Aug 17 22:00:27 2021
+++ src/sys/arch/amiga/amiga/amiga_init.c Wed Dec 27 03:03:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga_init.c,v 1.131 2021/08/17 22:00:27 andvar Exp $ */
+/* $NetBSD: amiga_init.c,v 1.132 2023/12/27 03:03:40 thorpej Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -39,7 +39,7 @@
#include "ser.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.131 2021/08/17 22:00:27 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.132 2023/12/27 03:03:40 thorpej Exp $");
#include
#include
@@ -783,10 +783,9 @@ start_c(int id, u_int fphystart, u_int f
#endif
{
/*
- * setup and load SRP
- * nolimit, share global, 4 byte PTE's
+ * setup and load SRP (see pmap.h)
*/
- (RELOC(protorp[0], u_int)) = 0x8202;
+ (RELOC(protorp[0], u_int)) = MMU51_SRP_BITS;
__asm volatile ("pmove %0@,%%srp":: "a" ((protorp, u_int)));
}
}
Index: src/sys/arch/amiga/amiga/genassym.cf
diff -u src/sys/arch/amiga/amiga/genassym.cf:1.33 src/sys/arch/amiga/amiga/genassym.cf:1.34
--- src/sys/arch/amiga/amiga/genassym.cf:1.33 Thu Feb 20 08:27:38 2020
+++ src/sys/arch/amiga/amiga/genassym.cf Wed Dec 27 03:03:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.33 2020/02/20 08:27:38 skrll Exp $
+# $NetBSD: genassym.cf,v 1.34 2023/12/27 03:03:40 thorpej Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -84,6 +84,12 @@ ifdef DRACO
define DRACO DRACO
endif
+# MMU configuration constants (from pmap.h)
+export MMU51_SRP_BITS
+export MMU51_CRP_BITS
+export MMU51_TCR_BITS
+export MMU40_TCR_BITS
+
# lwp & proc fields and values
define L_PCB offsetof(struct lwp, l_addr)
define L_PROC offsetof(struct lwp, l_proc)
Index: src/sys/arch/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.164 src/sys/arch/amiga/amiga/locore.s:1.165
--- src/sys/arch/amiga/amiga/locore.s:1.164 Tue Dec 26 02:38:26 2023
+++
CVS commit: src/sys/arch
Module Name:src
Committed By: thorpej
Date: Wed Dec 27 03:03:42 UTC 2023
Modified Files:
src/sys/arch/amiga/amiga: amiga_init.c genassym.cf locore.s
src/sys/arch/atari/atari: atari_init.c genassym.cf locore.s
src/sys/arch/cesfic/cesfic: genassym.cf locore.s
src/sys/arch/hp300/hp300: genassym.cf locore.s
src/sys/arch/luna68k/luna68k: genassym.cf locore.s
src/sys/arch/m68k/include: pmap_motorola.h pte_motorola.h
src/sys/arch/mac68k/mac68k: genassym.cf locore.s
src/sys/arch/mvme68k/mvme68k: genassym.cf locore.s
src/sys/arch/news68k/news68k: genassym.cf locore.s
src/sys/arch/next68k/next68k: genassym.cf locore.s
src/sys/arch/x68k/x68k: genassym.cf locore.s
Log Message:
Stop using magic numbers for the MMU root pointer attributes and the
Translation Control register, and also get rid of "#if PGSHIFT == ..."
where those magic numbers are used.
Instead, define new macros: MMU51_SRP_BITS, MMU51_CRP_BITS, MMU51_TCR_BITS,
and MMU40_TCR_BITS, in terms of the definitions in mmu_{40,51}.h. These
automagically adapt to 8K and 4K pages based on the machine-specific value
of PGSHIFT.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amiga/amiga/amiga_init.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/amiga/genassym.cf
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/atari/atari/genassym.cf
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/cesfic/genassym.cf
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hp300/hp300/genassym.cf
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/include/pte_motorola.h
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mac68k/mac68k/genassym.cf
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mvme68k/mvme68k/genassym.cf
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/news68k/news68k/genassym.cf
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/next68k/next68k/genassym.cf
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x68k/x68k/genassym.cf
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/x68k/x68k/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: thorpej Date: Wed Dec 27 02:40:32 UTC 2023 Modified Files: src/distrib/sets/lists/comp: ad.m68k src/sys/arch/m68k/include: Makefile Added Files: src/sys/arch/m68k/include: mmu_40.h mmu_51.h Log Message: Add new headers that describe the 68851 (and 68030) MMU and 68040 (and 68060) MMU structures using names that more closely align with Motorola's documentation. The definitions here automagically adapt to 4K or 8K pages, based on the value of PGSHIFT, which must be a compile-time constant. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.32 -r1.33 src/sys/arch/m68k/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/include/mmu_40.h \ src/sys/arch/m68k/include/mmu_51.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.m68k diff -u src/distrib/sets/lists/comp/ad.m68k:1.68 src/distrib/sets/lists/comp/ad.m68k:1.69 --- src/distrib/sets/lists/comp/ad.m68k:1.68 Tue Aug 29 04:35:26 2023 +++ src/distrib/sets/lists/comp/ad.m68k Wed Dec 27 02:40:31 2023 @@ -1,4 +1,4 @@ -# $NetBSD: ad.m68k,v 1.68 2023/08/29 04:35:26 mrg Exp $ +# $NetBSD: ad.m68k,v 1.69 2023/12/27 02:40:31 thorpej Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/include/gcc-4.5/math-68881.h comp-obsolete obsolete ./usr/include/gcc-4.5/tgmath.h comp-obsolete obsolete @@ -54,6 +54,8 @@ ./usr/include/m68k/m68k.h comp-c-include ./usr/include/m68k/math.h comp-c-include ./usr/include/m68k/mcontext.h comp-c-include +./usr/include/m68k/mmu_40.h comp-c-include +./usr/include/m68k/mmu_51.h comp-c-include ./usr/include/m68k/mutex.h comp-c-include ./usr/include/m68k/param.h comp-c-include ./usr/include/m68k/pcb.h comp-c-include Index: src/sys/arch/m68k/include/Makefile diff -u src/sys/arch/m68k/include/Makefile:1.32 src/sys/arch/m68k/include/Makefile:1.33 --- src/sys/arch/m68k/include/Makefile:1.32 Sat Feb 1 19:41:48 2020 +++ src/sys/arch/m68k/include/Makefile Wed Dec 27 02:40:31 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2020/02/01 19:41:48 tsutsui Exp $ +# $NetBSD: Makefile,v 1.33 2023/12/27 02:40:31 thorpej Exp $ INCSDIR= /usr/include/m68k @@ -12,7 +12,7 @@ INCS= ansi.h aout_machdep.h asm.h asm_si int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \ kcore.h \ limits.h lock.h \ - m68k.h math.h mcontext.h mutex.h \ + m68k.h math.h mcontext.h mmu_40.h mmu_51.h mutex.h \ param.h pmap_motorola.h pcb.h proc.h profile.h \ psl.h pte_motorola.h ptrace.h \ reg.h rwlock.h setjmp.h signal.h sync_icache.h \ Added files: Index: src/sys/arch/m68k/include/mmu_40.h diff -u /dev/null src/sys/arch/m68k/include/mmu_40.h:1.1 --- /dev/null Wed Dec 27 02:40:32 2023 +++ src/sys/arch/m68k/include/mmu_40.h Wed Dec 27 02:40:31 2023 @@ -0,0 +1,214 @@ +/* $NetBSD: mmu_40.h,v 1.1 2023/12/27 02:40:31 thorpej Exp $ */ + +/*- + * Copyright (c) 2023 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _M68K_MMU_40_H_ +#define _M68K_MMU_40_H_ + +/* + * Translation table structures for the 68040 MMU. + * + * The 68040 MMU uses a 3-level tree structure. The root (L1) and + * and pointer (L2) tables contain the base addresses of the tables + * at the lext level, and the page (L3) tables contain the addresses + * of the page descriptors, which may either contain the address of + * a physical page (4K or 8K) directly, or point to an indirect +
CVS commit: src
Module Name:src Committed By: thorpej Date: Wed Dec 27 02:40:32 UTC 2023 Modified Files: src/distrib/sets/lists/comp: ad.m68k src/sys/arch/m68k/include: Makefile Added Files: src/sys/arch/m68k/include: mmu_40.h mmu_51.h Log Message: Add new headers that describe the 68851 (and 68030) MMU and 68040 (and 68060) MMU structures using names that more closely align with Motorola's documentation. The definitions here automagically adapt to 4K or 8K pages, based on the value of PGSHIFT, which must be a compile-time constant. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.32 -r1.33 src/sys/arch/m68k/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/include/mmu_40.h \ src/sys/arch/m68k/include/mmu_51.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Dec 27 00:45:37 UTC 2023
Modified Files:
src/usr.bin/make: main.c
Log Message:
make: ensure shellPath is set before using it.
To generate a diff of this commit:
cvs rdiff -u -r1.605 -r1.606 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.605 src/usr.bin/make/main.c:1.606
--- src/usr.bin/make/main.c:1.605 Sun Dec 17 09:02:26 2023
+++ src/usr.bin/make/main.c Wed Dec 27 00:45:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.605 2023/12/17 09:02:26 rillig Exp $ */
+/* $NetBSD: main.c,v 1.606 2023/12/27 00:45:37 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.605 2023/12/17 09:02:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.606 2023/12/27 00:45:37 sjg Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1706,7 +1706,7 @@ Cmd_Exec(const char *cmd, char **error)
char *p;
int saved_errno;
- if (shellName == NULL)
+ if (shellPath == NULL)
Shell_Init();
args[0] = shellName;
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Wed Dec 27 00:45:37 UTC 2023 Modified Files: src/usr.bin/make: main.c Log Message: make: ensure shellPath is set before using it. To generate a diff of this commit: cvs rdiff -u -r1.605 -r1.606 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Tue Dec 26 20:09:42 UTC 2023 Modified Files: src/usr.bin/make: compat.c Log Message: Move fflush to a point to catch all cases. To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 src/usr.bin/make/compat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Tue Dec 26 20:09:42 UTC 2023
Modified Files:
src/usr.bin/make: compat.c
Log Message:
Move fflush to a point to catch all cases.
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/usr.bin/make/compat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.250 src/usr.bin/make/compat.c:1.251
--- src/usr.bin/make/compat.c:1.250 Tue Dec 26 17:12:33 2023
+++ src/usr.bin/make/compat.c Tue Dec 26 20:09:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.250 2023/12/26 17:12:33 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.251 2023/12/26 20:09:42 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.250 2023/12/26 17:12:33 sjg Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.251 2023/12/26 20:09:42 sjg Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -400,7 +400,6 @@ Compat_RunCommand(const char *cmdp, GNod
* but let others continue.
*/
printf(" (continuing)\n");
-fflush(stdout);
} else {
printf("\n");
}
@@ -412,9 +411,9 @@ Compat_RunCommand(const char *cmdp, GNod
* If we return 0, this will happen...
*/
printf(" (ignored)\n");
- fflush(stdout);
status = 0;
}
+ fflush(stdout);
}
free(cmdStart);
CVS commit: src/sys/arch/m68k
Module Name:src
Committed By: thorpej
Date: Tue Dec 26 17:48:38 UTC 2023
Modified Files:
src/sys/arch/m68k/include: pmap_motorola.h
src/sys/arch/m68k/m68k: pmap_motorola.c
Log Message:
Move active_pmap() and active_user_pmap() macros into pmap_motorola.c
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/m68k/m68k/pmap_motorola.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/m68k/include/pmap_motorola.h
diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.40 src/sys/arch/m68k/include/pmap_motorola.h:1.41
--- src/sys/arch/m68k/include/pmap_motorola.h:1.40 Tue Dec 26 17:42:43 2023
+++ src/sys/arch/m68k/include/pmap_motorola.h Tue Dec 26 17:48:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.h,v 1.40 2023/12/26 17:42:43 thorpej Exp $ */
+/* $NetBSD: pmap_motorola.h,v 1.41 2023/12/26 17:48:38 thorpej Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -182,12 +182,6 @@ struct pv_entry {
struct pmap *pv_ptpmap; /* if pv_ptste, pmap for PT page */
};
-#define active_pmap(pm) \
- ((pm) == pmap_kernel() || (pm) == curproc->p_vmspace->vm_map.pmap)
-#define active_user_pmap(pm) \
- (curproc && \
- (pm) != pmap_kernel() && (pm) == curproc->p_vmspace->vm_map.pmap)
-
extern struct pv_header *pv_table; /* array of entries, one per page */
#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count)
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.81 src/sys/arch/m68k/m68k/pmap_motorola.c:1.82
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.81 Tue Dec 26 17:42:43 2023
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Tue Dec 26 17:48:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.81 2023/12/26 17:42:43 thorpej Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.82 2023/12/26 17:48:38 thorpej Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.81 2023/12/26 17:42:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.82 2023/12/26 17:48:38 thorpej Exp $");
#include
#include
@@ -325,6 +325,13 @@ void pmap_check_wiring(const char *, vad
#define PRM_CFLUSH 0x02
#define PRM_KEEPPTPAGE 0x04
+#define active_pmap(pm) \
+ ((pm) == pmap_kernel() || (pm) == curproc->p_vmspace->vm_map.pmap)
+
+#define active_user_pmap(pm) \
+ (curproc && \
+ (pm) != pmap_kernel() && (pm) == curproc->p_vmspace->vm_map.pmap)
+
/*
* pmap_bootstrap_finalize: [ INTERFACE ]
*
CVS commit: src/sys/arch/m68k
Module Name:src Committed By: thorpej Date: Tue Dec 26 17:48:38 UTC 2023 Modified Files: src/sys/arch/m68k/include: pmap_motorola.h src/sys/arch/m68k/m68k: pmap_motorola.c Log Message: Move active_pmap() and active_user_pmap() macros into pmap_motorola.c To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/m68k/include/pmap_motorola.h cvs rdiff -u -r1.81 -r1.82 src/sys/arch/m68k/m68k/pmap_motorola.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k
Module Name:src Committed By: thorpej Date: Tue Dec 26 17:42:43 UTC 2023 Modified Files: src/sys/arch/m68k/include: pmap_motorola.h src/sys/arch/m68k/m68k: pmap_motorola.c Log Message: - G/C the PMAP_ACTIVATE() macro, just call loadustp() directly. - In pmap_activate(), rather than checking for an idle LWP and skipping the loadustp() in that case, just check if the pmap being activate is the kernel pmap. Also, KASSERT() that the specified lwp is the current lwp. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/m68k/include/pmap_motorola.h cvs rdiff -u -r1.80 -r1.81 src/sys/arch/m68k/m68k/pmap_motorola.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k
Module Name:src
Committed By: thorpej
Date: Tue Dec 26 17:42:43 UTC 2023
Modified Files:
src/sys/arch/m68k/include: pmap_motorola.h
src/sys/arch/m68k/m68k: pmap_motorola.c
Log Message:
- G/C the PMAP_ACTIVATE() macro, just call loadustp() directly.
- In pmap_activate(), rather than checking for an idle LWP and skipping
the loadustp() in that case, just check if the pmap being activate is
the kernel pmap. Also, KASSERT() that the specified lwp is the current
lwp.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/m68k/m68k/pmap_motorola.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/m68k/include/pmap_motorola.h
diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.39 src/sys/arch/m68k/include/pmap_motorola.h:1.40
--- src/sys/arch/m68k/include/pmap_motorola.h:1.39 Mon Dec 25 21:32:57 2023
+++ src/sys/arch/m68k/include/pmap_motorola.h Tue Dec 26 17:42:43 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.h,v 1.39 2023/12/25 21:32:57 thorpej Exp $ */
+/* $NetBSD: pmap_motorola.h,v 1.40 2023/12/26 17:42:43 thorpej Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -108,7 +108,7 @@ struct pmap {
*
* 68020/030 l2 size is chosen per NPTEPG, a number of page table entries
* per page, to use one whole page for PTEs per one segment table entry,
- * and maybe also because 68020 HP MMU machines use simlar structures.
+ * and maybe also because 68020 HP MMU machines use similar structures.
*
* 68040/060 layout is defined by hardware design and not configurable,
* as defined in .
@@ -171,15 +171,6 @@ struct pmap {
#define bmtol2(n) (ffs(n) - 1)
/*
- * Macros for speed
- */
-#define PMAP_ACTIVATE(pmap, loadhw) \
-{ \
- if ((loadhw)) \
- loadustp((paddr_t)(pmap)->pm_stpa); \
-}
-
-/*
* For each struct vm_page, there is a list of all currently valid virtual
* mappings of that page. An entry is a pv_entry, the list is pv_table.
*/
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.80 src/sys/arch/m68k/m68k/pmap_motorola.c:1.81
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.80 Wed Dec 20 00:40:43 2023
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Tue Dec 26 17:42:43 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.80 2023/12/20 00:40:43 thorpej Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.81 2023/12/26 17:42:43 thorpej Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.80 2023/12/20 00:40:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.81 2023/12/26 17:42:43 thorpej Exp $");
#include
#include
@@ -753,8 +753,15 @@ pmap_activate(struct lwp *l)
PMAP_DPRINTF(PDB_FOLLOW|PDB_SEGTAB,
("pmap_activate(%p)\n", l));
- PMAP_ACTIVATE(pmap, (curlwp->l_flag & LW_IDLE) != 0 ||
- l->l_proc == curproc);
+ KASSERT(l == curlwp);
+
+ /*
+ * Because the kernel has a separate root pointer, we don't
+ * need to activate the kernel pmap.
+ */
+ if (pmap != pmap_kernel()) {
+ loadustp((paddr_t)pmap->pm_stpa);
+ }
}
/*
@@ -2248,15 +2255,13 @@ pmap_remove_mapping(pmap_t pmap, vaddr_t
#endif
ptpmap->pm_stfree = protostfree;
#endif
-
/*
- * XXX may have changed segment table
- * pointer for current process so
- * update now to reload hardware.
+ * Segment table has changed; reload the
+ * MMU if it's the active user pmap.
*/
-
-if (active_user_pmap(ptpmap))
- PMAP_ACTIVATE(ptpmap, 1);
+if (active_user_pmap(ptpmap)) {
+ loadustp((paddr_t)ptpmap->pm_stpa);
+}
}
}
pvh->pvh_attrs &= ~PVH_PTPAGE;
@@ -2474,11 +2479,12 @@ pmap_enter_ptpage(pmap_t pmap, vaddr_t v
}
#endif
/*
- * XXX may have changed segment table pointer for current
- * process so update now to reload hardware.
+ * Segment table has changed; reload the
+ * MMU if it's the active user pmap.
*/
- if (active_user_pmap(pmap))
- PMAP_ACTIVATE(pmap, 1);
+ if (active_user_pmap(pmap)) {
+ loadustp((paddr_t)pmap->pm_stpa);
+ }
PMAP_DPRINTF(PDB_ENTER|PDB_PTPAGE|PDB_SEGTAB,
("enter: pmap %p stab %p(%p)\n",
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Tue Dec 26 17:12:33 UTC 2023 Modified Files: src/usr.bin/make: compat.c src/usr.bin/make/unit-tests: depsrc-ignore.exp deptgt-delete_on_error.exp sh-leading-hyphen.exp Log Message: make: fix order of output in compat mode Ensure that make's output is correctly ordered with the output of the target's commands, even when the output does not go to a terminal. Reviewed by: rillig To generate a diff of this commit: cvs rdiff -u -r1.249 -r1.250 src/usr.bin/make/compat.c cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/depsrc-ignore.exp \ src/usr.bin/make/unit-tests/sh-leading-hyphen.exp cvs rdiff -u -r1.3 -r1.4 \ src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Tue Dec 26 17:12:33 UTC 2023
Modified Files:
src/usr.bin/make: compat.c
src/usr.bin/make/unit-tests: depsrc-ignore.exp
deptgt-delete_on_error.exp sh-leading-hyphen.exp
Log Message:
make: fix order of output in compat mode
Ensure that make's output is correctly ordered with the output of the
target's commands, even when the output does not go to a terminal.
Reviewed by: rillig
To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/usr.bin/make/compat.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/depsrc-ignore.exp \
src/usr.bin/make/unit-tests/sh-leading-hyphen.exp
cvs rdiff -u -r1.3 -r1.4 \
src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.249 src/usr.bin/make/compat.c:1.250
--- src/usr.bin/make/compat.c:1.249 Sun Dec 24 16:48:30 2023
+++ src/usr.bin/make/compat.c Tue Dec 26 17:12:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.249 2023/12/24 16:48:30 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.250 2023/12/26 17:12:33 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.249 2023/12/24 16:48:30 sjg Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.250 2023/12/26 17:12:33 sjg Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -400,6 +400,7 @@ Compat_RunCommand(const char *cmdp, GNod
* but let others continue.
*/
printf(" (continuing)\n");
+fflush(stdout);
} else {
printf("\n");
}
@@ -411,6 +412,7 @@ Compat_RunCommand(const char *cmdp, GNod
* If we return 0, this will happen...
*/
printf(" (ignored)\n");
+ fflush(stdout);
status = 0;
}
}
Index: src/usr.bin/make/unit-tests/depsrc-ignore.exp
diff -u src/usr.bin/make/unit-tests/depsrc-ignore.exp:1.2 src/usr.bin/make/unit-tests/depsrc-ignore.exp:1.3
--- src/usr.bin/make/unit-tests/depsrc-ignore.exp:1.2 Sat Aug 29 15:06:33 2020
+++ src/usr.bin/make/unit-tests/depsrc-ignore.exp Tue Dec 26 17:12:33 2023
@@ -1,8 +1,8 @@
ignore-errors begin
false ignore-errors
+*** Error code 1 (ignored)
ignore-errors end
all begin
-*** Error code 1 (ignored)
false all
*** Error code 1 (continuing)
Index: src/usr.bin/make/unit-tests/sh-leading-hyphen.exp
diff -u src/usr.bin/make/unit-tests/sh-leading-hyphen.exp:1.2 src/usr.bin/make/unit-tests/sh-leading-hyphen.exp:1.3
--- src/usr.bin/make/unit-tests/sh-leading-hyphen.exp:1.2 Thu Jan 19 19:55:27 2023
+++ src/usr.bin/make/unit-tests/sh-leading-hyphen.exp Tue Dec 26 17:12:33 2023
@@ -6,6 +6,6 @@ unknown-command: not found
*** Error code 127 (ignored)
unknown-long-option 'needed for needshell in compat.c'
unknown-long-option: not found
-whitespace in leading part
*** Error code 127 (ignored)
+whitespace in leading part
exit status 0
Index: src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp
diff -u src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp:1.3 src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp:1.4
--- src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp:1.3 Sat Mar 18 22:20:12 2023
+++ src/usr.bin/make/unit-tests/deptgt-delete_on_error.exp Tue Dec 26 17:12:33 2023
@@ -16,6 +16,7 @@ make: *** deptgt-delete_on_error-regular
Stop.
make: stopped in unit-tests
+*** Error code 1 (ignored)
Parallel mode
> deptgt-delete_on_error-regular; false
@@ -45,5 +46,4 @@ make: stopped in unit-tests
make: stopped in unit-tests
*** Error code 1 (ignored)
-*** Error code 1 (ignored)
exit status 0
CVS commit: src
Module Name:src Committed By: pgoyette Date: Tue Dec 26 16:20:02 UTC 2023 Modified Files: src/distrib/sets/lists/debug: module.md.i386 src/distrib/sets/lists/modules: md.i386 src/sys/modules: Makefile Log Message: Unhook radeondrm module from the build; it doesn't work, and it's just tempting someone to try it. Leave the files around in case someone wants to pursue making this work. Should address kern/57793 XXX Related modules from the same legacy era should probably be XXX removed, too, but so far only radeondrm has been reported XXX as an issue. Kep an eye out for sisdrm, savagedrm, tdfxdrm, XXX and r128drm. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.280 -r1.281 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/module.md.i386 diff -u src/distrib/sets/lists/debug/module.md.i386:1.7 src/distrib/sets/lists/debug/module.md.i386:1.8 --- src/distrib/sets/lists/debug/module.md.i386:1.7 Thu Jul 28 22:00:23 2022 +++ src/distrib/sets/lists/debug/module.md.i386 Tue Dec 26 16:20:01 2023 @@ -1,4 +1,4 @@ -# $NetBSD: module.md.i386,v 1.7 2022/07/28 22:00:23 riastradh Exp $ +# $NetBSD: module.md.i386,v 1.8 2023/12/26 16:20:01 pgoyette Exp $ ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel kmod,debug @@ -149,8 +149,8 @@ ./usr/libdata/debug/@MODULEDIR@/pwdog/pwdog.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/r128drmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/r128drm/r128drm.kmod.debug modules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/radeondrmmodules-base-kernel kmod,debug -./usr/libdata/debug/@MODULEDIR@/radeondrm/radeondrm.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/radeondrmbase-obsolete obsolete +./usr/libdata/debug/@MODULEDIR@/radeondrm/radeondrm.kmod.debug base-obsolete obsolete ./usr/libdata/debug/@MODULEDIR@/savagedrmmodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/savagedrm/savagedrm.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/sisdrmmodules-base-kernel kmod,debug Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.96 src/distrib/sets/lists/modules/md.i386:1.97 --- src/distrib/sets/lists/modules/md.i386:1.96 Wed Sep 7 11:37:25 2022 +++ src/distrib/sets/lists/modules/md.i386 Tue Dec 26 16:20:01 2023 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.96 2022/09/07 11:37:25 martin Exp $ +# $NetBSD: md.i386,v 1.97 2023/12/26 16:20:01 pgoyette Exp $ # ./@MODULEDIR@/acpiacadmodules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -166,8 +166,8 @@ ./@MODULEDIR@/pwdog/pwdog.kmod modules-base-kernel kmod ./@MODULEDIR@/r128drmmodules-base-kernel kmod ./@MODULEDIR@/r128drm/r128drm.kmod modules-base-kernel kmod -./@MODULEDIR@/radeondrmmodules-base-kernel kmod -./@MODULEDIR@/radeondrm/radeondrm.kmod modules-base-kernel kmod +./@MODULEDIR@/radeondrmbase-obsolete obsolete +./@MODULEDIR@/radeondrm/radeondrm.kmod base-obsolete obsolete ./@MODULEDIR@/savagedrmmodules-base-kernel kmod ./@MODULEDIR@/savagedrm/savagedrm.kmod modules-base-kernel kmod ./@MODULEDIR@/sisdrmmodules-base-kernel kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.280 src/sys/modules/Makefile:1.281 --- src/sys/modules/Makefile:1.280 Sun Aug 27 13:20:09 2023 +++ src/sys/modules/Makefile Tue Dec 26 16:20:01 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.280 2023/08/27 13:20:09 kardel Exp $ +# $NetBSD: Makefile,v 1.281 2023/12/26 16:20:01 pgoyette Exp $ .include @@ -343,7 +343,7 @@ SUBDIR+= mgadrm SUBDIR+= nsclpcsio SUBDIR+= padlock SUBDIR+= r128drm -SUBDIR+= radeondrm +#SUBDIR+= radeondrm SUBDIR+= savagedrm SUBDIR+= sisdrm SUBDIR+= tdfxdrm
CVS commit: src
Module Name:src Committed By: pgoyette Date: Tue Dec 26 16:20:02 UTC 2023 Modified Files: src/distrib/sets/lists/debug: module.md.i386 src/distrib/sets/lists/modules: md.i386 src/sys/modules: Makefile Log Message: Unhook radeondrm module from the build; it doesn't work, and it's just tempting someone to try it. Leave the files around in case someone wants to pursue making this work. Should address kern/57793 XXX Related modules from the same legacy era should probably be XXX removed, too, but so far only radeondrm has been reported XXX as an issue. Kep an eye out for sisdrm, savagedrm, tdfxdrm, XXX and r128drm. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/module.md.i386 cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.280 -r1.281 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: andvar
Date: Tue Dec 26 09:56:45 UTC 2023
Modified Files:
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
Log Message:
Replace %ld/%lx format specifiers with PRIx{SIZE,ADDR} for better portability.
>From Nick Hudson.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/armadillo/armadillo9_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/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.54 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.55
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.54 Sat Dec 23 23:00:09 2023
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Tue Dec 26 09:56:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.54 2023/12/23 23:00:09 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.55 2023/12/26 09:56:45 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -407,8 +407,9 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %"PRIxPSIZE" pages at "
+ "0x%08"PRIxPADDR" -> 0x%08"PRIxPADDR"\n",
+ physmem, physical_start, physical_end - 1);
#endif
/*
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.39 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.40
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.39 Sun Dec 24 11:42:35 2023
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Tue Dec 26 09:56:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.39 2023/12/24 11:42:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.40 2023/12/26 09:56:44 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -544,8 +544,9 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
- physical_start, physical_end - 1);
+ printf("physmemory: %"PRIxPSIZE" pages at "
+ "0x%08"PRIxPADDR" -> 0x%08"PRIxPADDR"\n",
+ physmem, physical_start, physical_end - 1);
#endif
/*
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: andvar
Date: Tue Dec 26 09:56:45 UTC 2023
Modified Files:
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
Log Message:
Replace %ld/%lx format specifiers with PRIx{SIZE,ADDR} for better portability.
>From Nick Hudson.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
