Sun Dec 5 07:53:57 2021 UTC ()
s/specificed/specified/ in comment.


(msaitoh)
diff -r1.424 -r1.425 src/share/mk/bsd.README
diff -r1.121 -r1.122 src/sys/arch/alpha/alpha/vm_machdep.c
diff -r1.82 -r1.83 src/sys/arch/powerpc/oea/oea_machdep.c

cvs diff -r1.424 -r1.425 src/share/mk/bsd.README (expand / switch to unified diff)

--- src/share/mk/bsd.README 2021/12/05 04:54:20 1.424
+++ src/share/mk/bsd.README 2021/12/05 07:53:57 1.425
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.README,v 1.424 2021/12/05 04:54:20 msaitoh Exp $ 1# $NetBSD: bsd.README,v 1.425 2021/12/05 07:53:57 msaitoh Exp $
2# @(#)bsd.README 8.2 (Berkeley) 4/2/94 2# @(#)bsd.README 8.2 (Berkeley) 4/2/94
3 3
4This is the README file for the make "include" files for the NetBSD 4This is the README file for the make "include" files for the NetBSD
5source tree. The files are installed in /usr/share/mk, and are, 5source tree. The files are installed in /usr/share/mk, and are,
6by convention, named with the suffix ".mk". 6by convention, named with the suffix ".mk".
7 7
8Note, this file is not intended to replace reading through the .mk 8Note, this file is not intended to replace reading through the .mk
9files for anything tricky. 9files for anything tricky.
10 10
11=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= 11=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
12 12
13RANDOM THINGS WORTH KNOWING: 13RANDOM THINGS WORTH KNOWING:
14 14
@@ -771,27 +771,27 @@ NLSDIR Base path for Native Language Su @@ -771,27 +771,27 @@ NLSDIR Base path for Native Language Su
771NLSGRP Native Language Support files group. [wheel] 771NLSGRP Native Language Support files group. [wheel]
772 772
773NLSOWN Native Language Support files owner. [root] 773NLSOWN Native Language Support files owner. [root]
774 774
775NLSMODE Native Language Support files mode. [${NONBINMODE}] 775NLSMODE Native Language Support files mode. [${NONBINMODE}]
776 776
777X11SRCDIR The path to the xsrc tree. [${NETBSDSRCDIR}/../xsrc, 777X11SRCDIR The path to the xsrc tree. [${NETBSDSRCDIR}/../xsrc,
778 if that exists; otherwise /usr/xsrc] 778 if that exists; otherwise /usr/xsrc]
779 779
780X11SRCDIR.local The path to the local X11 src tree. [${X11SRCDIR}/local] 780X11SRCDIR.local The path to the local X11 src tree. [${X11SRCDIR}/local]
781 781
782X11SRCDIR.lib<package> 782X11SRCDIR.lib<package>
783X11SRCDIR.<package> 783X11SRCDIR.<package>
784 The path to the xorg src tree for the specificed package>. 784 The path to the xorg src tree for the specified package>.
785 [${X11SRCDIR}/external/mit/xorg/<package>/dist] 785 [${X11SRCDIR}/external/mit/xorg/<package>/dist]
786 786
787X11ROOTDIR Root directory of the X11 installation. [/usr/X11R7] 787X11ROOTDIR Root directory of the X11 installation. [/usr/X11R7]
788 788
789X11BINDIR X11 bin directory. [${X11ROOTDIR}/bin] 789X11BINDIR X11 bin directory. [${X11ROOTDIR}/bin]
790 790
791X11FONTDIR X11 font directory. [${X11ROOTDIR}/lib/X11/fonts] 791X11FONTDIR X11 font directory. [${X11ROOTDIR}/lib/X11/fonts]
792 792
793X11INCDIR X11 include directory. [${X11ROOTDIR}/include] 793X11INCDIR X11 include directory. [${X11ROOTDIR}/include]
794 794
795X11LIBDIR X11 lib/x11 (config) directory. [${X11ROOTDIR}/lib/X11] 795X11LIBDIR X11 lib/x11 (config) directory. [${X11ROOTDIR}/lib/X11]
796 796
797X11MANDIR X11 manual directory. [${X11ROOTDIR}/man] 797X11MANDIR X11 manual directory. [${X11ROOTDIR}/man]

cvs diff -r1.121 -r1.122 src/sys/arch/alpha/alpha/vm_machdep.c (expand / switch to unified diff)

--- src/sys/arch/alpha/alpha/vm_machdep.c 2021/07/16 19:13:21 1.121
+++ src/sys/arch/alpha/alpha/vm_machdep.c 2021/12/05 07:53:57 1.122
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: vm_machdep.c,v 1.121 2021/07/16 19:13:21 thorpej Exp $ */ 1/* $NetBSD: vm_machdep.c,v 1.122 2021/12/05 07:53:57 msaitoh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. 4 * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Author: Chris G. Demetriou 7 * Author: Chris G. Demetriou
8 * 8 *
9 * Permission to use, copy, modify and distribute this software and 9 * Permission to use, copy, modify and distribute this software and
10 * its documentation is hereby granted, provided that both the copyright 10 * its documentation is hereby granted, provided that both the copyright
11 * notice and this permission notice appear in all copies of the 11 * notice and this permission notice appear in all copies of the
12 * software, derivative works or modified versions, and any portions 12 * software, derivative works or modified versions, and any portions
13 * thereof, and that both notices appear in supporting documentation. 13 * thereof, and that both notices appear in supporting documentation.
14 * 14 *
@@ -19,27 +19,27 @@ @@ -19,27 +19,27 @@
19 * Carnegie Mellon requests users of this software to return to 19 * Carnegie Mellon requests users of this software to return to
20 * 20 *
21 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU 21 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
22 * School of Computer Science 22 * School of Computer Science
23 * Carnegie Mellon University 23 * Carnegie Mellon University
24 * Pittsburgh PA 15213-3890 24 * Pittsburgh PA 15213-3890
25 * 25 *
26 * any improvements or extensions that they make and grant Carnegie the 26 * any improvements or extensions that they make and grant Carnegie the
27 * rights to redistribute these changes. 27 * rights to redistribute these changes.
28 */ 28 */
29 29
30#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ 30#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
31 31
32__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.121 2021/07/16 19:13:21 thorpej Exp $"); 32__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.122 2021/12/05 07:53:57 msaitoh Exp $");
33 33
34#include <sys/param.h> 34#include <sys/param.h>
35#include <sys/systm.h> 35#include <sys/systm.h>
36#include <sys/proc.h> 36#include <sys/proc.h>
37#include <sys/buf.h> 37#include <sys/buf.h>
38#include <sys/vnode.h> 38#include <sys/vnode.h>
39#include <sys/core.h> 39#include <sys/core.h>
40#include <sys/exec.h> 40#include <sys/exec.h>
41 41
42#include <uvm/uvm.h> 42#include <uvm/uvm.h>
43 43
44#include <machine/cpu.h> 44#include <machine/cpu.h>
45#include <machine/alpha.h> 45#include <machine/alpha.h>
@@ -102,27 +102,27 @@ cpu_lwp_fork(struct lwp *l1, struct lwp  @@ -102,27 +102,27 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
102 102
103 l2->l_md.md_tf = l1->l_md.md_tf; 103 l2->l_md.md_tf = l1->l_md.md_tf;
104 l2->l_md.md_flags = l1->l_md.md_flags & MDLWP_FP_C; 104 l2->l_md.md_flags = l1->l_md.md_flags & MDLWP_FP_C;
105 l2->l_md.md_astpending = 0; 105 l2->l_md.md_astpending = 0;
106 106
107 /* 107 /*
108 * Cache the physical address of the pcb, so we can 108 * Cache the physical address of the pcb, so we can
109 * swap to it easily. 109 * swap to it easily.
110 */ 110 */
111 l2->l_md.md_pcbpaddr = (void *)vtophys((vaddr_t)pcb2); 111 l2->l_md.md_pcbpaddr = (void *)vtophys((vaddr_t)pcb2);
112 112
113 /* 113 /*
114 * Copy pcb and user stack pointer from proc p1 to p2. 114 * Copy pcb and user stack pointer from proc p1 to p2.
115 * If specificed, give the child a different stack. 115 * If specified, give the child a different stack.
116 * Floating point state from the FP chip has already been saved. 116 * Floating point state from the FP chip has already been saved.
117 */ 117 */
118 *pcb2 = *pcb1; 118 *pcb2 = *pcb1;
119 if (stack != NULL) { 119 if (stack != NULL) {
120 pcb2->pcb_hw.apcb_usp = 120 pcb2->pcb_hw.apcb_usp =
121 ((u_long)stack + stacksize) & ~((u_long)STACK_ALIGNBYTES); 121 ((u_long)stack + stacksize) & ~((u_long)STACK_ALIGNBYTES);
122 } else { 122 } else {
123 pcb2->pcb_hw.apcb_usp = alpha_pal_rdusp(); 123 pcb2->pcb_hw.apcb_usp = alpha_pal_rdusp();
124 } 124 }
125 125
126 /* 126 /*
127 * Put l2 on the kernel's page tables until its first trip 127 * Put l2 on the kernel's page tables until its first trip
128 * through pmap_activate(). 128 * through pmap_activate().

cvs diff -r1.82 -r1.83 src/sys/arch/powerpc/oea/oea_machdep.c (expand / switch to unified diff)

--- src/sys/arch/powerpc/oea/oea_machdep.c 2021/02/27 01:16:52 1.82
+++ src/sys/arch/powerpc/oea/oea_machdep.c 2021/12/05 07:53:57 1.83
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: oea_machdep.c,v 1.82 2021/02/27 01:16:52 thorpej Exp $ */ 1/* $NetBSD: oea_machdep.c,v 1.83 2021/12/05 07:53:57 msaitoh Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 2002 Matt Thomas 4 * Copyright (C) 2002 Matt Thomas
5 * Copyright (C) 1995, 1996 Wolfgang Solfrank. 5 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
6 * Copyright (C) 1995, 1996 TooLs GmbH. 6 * Copyright (C) 1995, 1996 TooLs GmbH.
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -23,27 +23,27 @@ @@ -23,27 +23,27 @@
23 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR 23 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 26 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 27 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
28 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 28 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
29 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 29 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
30 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 30 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
31 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 31 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
32 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.82 2021/02/27 01:16:52 thorpej Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.83 2021/12/05 07:53:57 msaitoh Exp $");
37 37
38#ifdef _KERNEL_OPT 38#ifdef _KERNEL_OPT
39#include "opt_altivec.h" 39#include "opt_altivec.h"
40#include "opt_ddb.h" 40#include "opt_ddb.h"
41#include "opt_kgdb.h" 41#include "opt_kgdb.h"
42#include "opt_multiprocessor.h" 42#include "opt_multiprocessor.h"
43#include "opt_ppcarch.h" 43#include "opt_ppcarch.h"
44#endif 44#endif
45 45
46#include <sys/param.h> 46#include <sys/param.h>
47#include <sys/buf.h> 47#include <sys/buf.h>
48#include <sys/boot_flag.h> 48#include <sys/boot_flag.h>
49#include <sys/exec.h> 49#include <sys/exec.h>
@@ -777,27 +777,27 @@ oea_batinit(paddr_t pa, ...) @@ -777,27 +777,27 @@ oea_batinit(paddr_t pa, ...)
777 :: "r"(battable[0x01800000 >> 23].batl), 777 :: "r"(battable[0x01800000 >> 23].batl),
778 "r"(battable[0x01800000 >> 23].batu)); 778 "r"(battable[0x01800000 >> 23].batu));
779 } 779 }
780#endif /* PPC_OEA601 */ 780#endif /* PPC_OEA601 */
781  781
782 /* 782 /*
783 * Now setup other fixed bat registers 783 * Now setup other fixed bat registers
784 * 784 *
785 * Note that we still run in real mode, and the BAT 785 * Note that we still run in real mode, and the BAT
786 * registers were cleared above. 786 * registers were cleared above.
787 */ 787 */
788 788
789 /* 789 /*
790 * Add any I/O BATs specificed; 790 * Add any I/O BATs specified;
791 */ 791 */
792 va_start(ap, pa); 792 va_start(ap, pa);
793 while (pa != 0) { 793 while (pa != 0) {
794 register_t len = va_arg(ap, register_t); 794 register_t len = va_arg(ap, register_t);
795 oea_iobat_add(pa, len); 795 oea_iobat_add(pa, len);
796 pa = va_arg(ap, paddr_t); 796 pa = va_arg(ap, paddr_t);
797 } 797 }
798 va_end(ap); 798 va_end(ap);
799 799
800 /* 800 /*
801 * Set up battable to map all RAM regions. 801 * Set up battable to map all RAM regions.
802 */ 802 */
803#ifdef PPC_OEA601 803#ifdef PPC_OEA601