CVS commit: src/sys/ddb
Module Name:src Committed By: kre Date: Mon Sep 17 01:49:54 UTC 2018 Modified Files: src/sys/ddb: db_command.c Log Message: When this file is used when not building the kernel (eg: /usr/sbin/crash) make cnpollc() go away. To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/sys/ddb/db_command.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/ddb/db_command.c diff -u src/sys/ddb/db_command.c:1.159 src/sys/ddb/db_command.c:1.160 --- src/sys/ddb/db_command.c:1.159 Sun Sep 16 23:18:55 2018 +++ src/sys/ddb/db_command.c Mon Sep 17 01:49:54 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: db_command.c,v 1.159 2018/09/16 23:18:55 mrg Exp $ */ +/* $NetBSD: db_command.c,v 1.160 2018/09/17 01:49:54 kre Exp $ */ /* * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.159 2018/09/16 23:18:55 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.160 2018/09/17 01:49:54 kre Exp $"); #ifdef _KERNEL_OPT #include "opt_aio.h" @@ -542,6 +542,10 @@ db_unregister_tbl(uint8_t type,const str return ENOENT; } +#ifndef _KERNEL +#define cnpollc(c) __nothing +#endif + /* * This function is called via db_trap() or directly from * machine trap code.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: ryo
Date: Mon Sep 17 00:15:55 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
delete debug printf and KASSERT.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.23 src/sys/arch/aarch64/aarch64/pmap.c:1.24
--- src/sys/arch/aarch64/aarch64/pmap.c:1.23 Mon Sep 10 16:43:24 2018
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Sep 17 00:15:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.23 2018/09/10 16:43:24 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.24 2018/09/17 00:15:55 ryo Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.23 2018/09/10 16:43:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.24 2018/09/17 00:15:55 ryo Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -1824,23 +1824,9 @@ pmap_fault_fixup(struct pmap *pm, vaddr_
goto done;
}
- if ((pte & LX_BLKPAG_AF) && ((pte & LX_BLKPAG_AP) == LX_BLKPAG_AP_RW)) {
-#if 1 /* XXX: DEBUG */
- if (!user) {
- /*
- * pte is readable and writable, but occured fault?
- * unprivileged load/store, or else ?
- */
- printf("%s: fault: va=%016lx pte=%08" PRIx64
- ": pte is rw."
- " unprivileged load/store ? (onfault=%p)\n",
- __func__, va, pte, curlwp->l_md.md_onfault);
- }
-#endif
+ /* pte is readable and writable, but occured fault? probably copy(9) */
+ if ((pte & LX_BLKPAG_AF) && ((pte & LX_BLKPAG_AP) == LX_BLKPAG_AP_RW))
goto done;
- }
- KASSERT(((pte & LX_BLKPAG_AF) == 0) ||
- ((pte & LX_BLKPAG_AP) == LX_BLKPAG_AP_RO));
pmap_pv_lock(md);
if ((pte & LX_BLKPAG_AF) == 0) {
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mrg
Date: Sun Sep 16 23:20:18 UTC 2018
Modified Files:
src/sys/dev/scsipi: scsipi_verbose.c
Log Message:
don't print a blank line that ends up in logs and console output.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/scsipi/scsipi_verbose.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/dev/scsipi/scsipi_verbose.c
diff -u src/sys/dev/scsipi/scsipi_verbose.c:1.33 src/sys/dev/scsipi/scsipi_verbose.c:1.34
--- src/sys/dev/scsipi/scsipi_verbose.c:1.33 Sat Sep 17 18:53:13 2016
+++ src/sys/dev/scsipi/scsipi_verbose.c Sun Sep 16 23:20:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_verbose.c,v 1.33 2016/09/17 18:53:13 kardel Exp $ */
+/* $NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.33 2016/09/17 18:53:13 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $");
#include
#include
@@ -954,10 +954,8 @@ scsipi_print_sense_data_real(struct scsi
if (sbs)
printf("\n SKSV: %s", sbs);
printf("\n");
- if (verbosity == 0) {
- printf("\n");
+ if (verbosity == 0)
return;
- }
/*
* Now figure whether we should print any additional informtion.
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Sun Sep 16 23:18:55 UTC 2018
Modified Files:
src/sys/ddb: db_command.c db_output.c
src/sys/kern: subr_userconf.c
Log Message:
call cnpollc(1) and cnpollc(0) around cngetc().
(christos has a good idea to add a function that does all 3,
and we should switch all the callers in this sequence to use
it (and fix the MD ones missing it still). not all can, as
eg, line-grabbing functions can use cngetsn(), which only
calls cnpollc() twice.)
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/ddb/db_command.c
cvs rdiff -u -r1.33 -r1.34 src/sys/ddb/db_output.c
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/subr_userconf.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/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.158 src/sys/ddb/db_command.c:1.159
--- src/sys/ddb/db_command.c:1.158 Sat Sep 15 08:48:18 2018
+++ src/sys/ddb/db_command.c Sun Sep 16 23:18:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.158 2018/09/15 08:48:18 mrg Exp $ */
+/* $NetBSD: db_command.c,v 1.159 2018/09/16 23:18:55 mrg Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.158 2018/09/15 08:48:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.159 2018/09/16 23:18:55 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -90,10 +90,10 @@ __KERNEL_RCSID(0, "$NetBSD: db_command.c
#include
#include
#include
-
-/*include queue macros*/
#include
+#include
+
#include
#include
@@ -542,7 +542,10 @@ db_unregister_tbl(uint8_t type,const str
return ENOENT;
}
-/* This function is called from machine trap code. */
+/*
+ * This function is called via db_trap() or directly from
+ * machine trap code.
+ */
void
db_command_loop(void)
{
@@ -579,7 +582,9 @@ db_command_loop(void)
if (db_print_position() != 0)
db_printf("\n");
db_output_line = 0;
+ cnpollc(1);
(void) db_read_line();
+ cnpollc(0);
db_command(_last_command);
}
Index: src/sys/ddb/db_output.c
diff -u src/sys/ddb/db_output.c:1.33 src/sys/ddb/db_output.c:1.34
--- src/sys/ddb/db_output.c:1.33 Sat Sep 1 01:13:51 2012
+++ src/sys/ddb/db_output.c Sun Sep 16 23:18:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_output.c,v 1.33 2012/09/01 01:13:51 matt Exp $ */
+/* $NetBSD: db_output.c,v 1.34 2018/09/16 23:18:55 mrg Exp $ */
/*
* Mach Operating System
@@ -35,7 +35,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: db_output.c,v 1.33 2012/09/01 01:13:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_output.c,v 1.34 2018/09/16 23:18:55 mrg Exp $");
#include
#include
@@ -111,7 +111,7 @@ db_more(void)
for (p = "--db_more--"; *p; p++)
cnputc(*p);
- switch(cngetc()) {
+ switch (cngetc()) {
case ' ':
db_output_line = 0;
break;
Index: src/sys/kern/subr_userconf.c
diff -u src/sys/kern/subr_userconf.c:1.26 src/sys/kern/subr_userconf.c:1.27
--- src/sys/kern/subr_userconf.c:1.26 Mon Dec 23 15:34:16 2013
+++ src/sys/kern/subr_userconf.c Sun Sep 16 23:18:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_userconf.c,v 1.26 2013/12/23 15:34:16 skrll Exp $ */
+/* $NetBSD: subr_userconf.c,v 1.27 2018/09/16 23:18:55 mrg Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_userconf.c,v 1.26 2013/12/23 15:34:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_userconf.c,v 1.27 2018/09/16 23:18:55 mrg Exp $");
#include
#include
@@ -103,7 +103,9 @@ userconf_more(void)
if (userconf_cnt != -1) {
if (userconf_cnt == userconf_lines) {
printf("-- more --");
+ cnpollc(1);
c = cngetc();
+ cnpollc(0);
userconf_cnt = 0;
printf("\r\r");
}
@@ -391,7 +393,9 @@ userconf_change(int devno)
while (c != 'y' && c != 'Y' && c != 'n' && c != 'N') {
printf("change (y/n) ?");
+ cnpollc(1);
c = cngetc();
+ cnpollc(0);
printf("\n");
}
CVS commit: src/sbin/newbtconf
Module Name:src
Committed By: kre
Date: Sun Sep 16 22:37:24 UTC 2018
Modified Files:
src/sbin/newbtconf: newbtconf.sh
Log Message:
Remove uses of test -o
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/newbtconf/newbtconf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newbtconf/newbtconf.sh
diff -u src/sbin/newbtconf/newbtconf.sh:1.8 src/sbin/newbtconf/newbtconf.sh:1.9
--- src/sbin/newbtconf/newbtconf.sh:1.8 Mon Jan 5 23:23:33 2004
+++ src/sbin/newbtconf/newbtconf.sh Sun Sep 16 22:37:24 2018
@@ -15,7 +15,7 @@ FILES="defaultdomain fstab ifconfig.* in
rc.conf rc.conf.d resolv.conf"
if [ $dir = init ] ; then
- if [ -d /etc/etc.network -o -e /etc/etc.current ] ; then
+ if [ -d /etc/etc.network ] || [ -e /etc/etc.current ] ; then
echo "Error: multi-configuration already initialized"
exit 1
fi
@@ -25,7 +25,7 @@ if [ $dir = init ] ; then
ln -s $dir etc.current
ln -s $dir etc.default
for i in ${FILES}; do
- if [ -f $i -o -d $i ] ; then
+ if [ -f $i ] || [ -d $i ] ; then
mv $i $dir
ln -s etc.current/$i .
fi
@@ -41,7 +41,7 @@ if [ $dir = revert ] ; then
fi
cd /etc
for i in ${FILES}; do
- if [ -f $i -o -d $i ] ; then
+ if [ -f $i ] || [ -d $i ] ; then
stat="`ls -ld $i`"
case x"$stat" in
xl*) :;;
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Sun Sep 16 22:31:30 UTC 2018
Modified Files:
src/bin/sh: mkinit.sh
Log Message:
Begone unspecified test-a ... and be more obious what it was doing.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/bin/sh/mkinit.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/mkinit.sh
diff -u src/bin/sh/mkinit.sh:1.7 src/bin/sh/mkinit.sh:1.8
--- src/bin/sh/mkinit.sh:1.7 Sun Mar 27 14:34:46 2016
+++ src/bin/sh/mkinit.sh Sun Sep 16 22:31:30 2018
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: mkinit.sh,v 1.7 2016/03/27 14:34:46 christos Exp $
+# $NetBSD: mkinit.sh,v 1.8 2018/09/16 22:31:30 kre Exp $
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -102,8 +102,11 @@ for src in $srcs; do
read -r line
[ "$line" != "}" ]
do
- [ -n "$line" -a "$line" = "${line###}" ] &&
-line=" $line"
+ case "$line" in
+ ('') ;;
+ ('#'*) ;;
+ (*) line=" $line";;
+ esac
ev="${ev}${line}${nl}"
done
ev="${ev} }${nl}"
CVS commit: src/distrib/amiga/floppies/inst
Module Name:src
Committed By: kre
Date: Sun Sep 16 22:22:44 UTC 2018
Modified Files:
src/distrib/amiga/floppies/inst: install.sh
Log Message:
Remove uses of test ([) -a operator. More cleanups.
This script looks like it cold do with an agressive cleanup, but
I have no rational way to test it, so it won't get done by me...
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amiga/floppies/inst/install.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amiga/floppies/inst/install.sh
diff -u src/distrib/amiga/floppies/inst/install.sh:1.9 src/distrib/amiga/floppies/inst/install.sh:1.10
--- src/distrib/amiga/floppies/inst/install.sh:1.9 Sat Jul 26 17:06:28 2003
+++ src/distrib/amiga/floppies/inst/install.sh Sun Sep 16 22:22:44 2018
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sh,v 1.9 2003/07/26 17:06:28 salo Exp $
+# $NetBSD: install.sh,v 1.10 2018/09/16 22:22:44 kre Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -45,7 +45,7 @@ FSTAB=${FSTABDIR}/fstab
getresp() {
read resp
- if [ "X$resp" = "X" ]; then
+ if [ -z "$resp" ]; then
resp=$1
fi
}
@@ -55,7 +55,7 @@ getvar() {
}
shiftvar() {
- local - var
+ local var
var="$1"
list="$(getvar $var)"
set -- $list
@@ -76,7 +76,7 @@ getdrives() {
for du in /dev/r${drivetype}?a; do
dd if=$du of=/dev/null bs=1b count=1 >/dev/null 2>&1
if [ $? -eq 0 ]; then
- thisunit=`echo $du | sed -e 's,/dev/r\(...\)a,\1,g'`
+ thisunit=$( echo $du | sed -e 's,/dev/r\(...\)a,\1,g' )
driveunits="$driveunits $thisunit"
else
continue;
@@ -136,7 +136,9 @@ sect_fwd=""
getdrives
for du in $driveunits; do
set -- $(getvar $du)
- if [ $# -ge 2 -a "$1" = "a" -a "`echo $2 | sed -e 's,.*BSD.*,BSD,'`" = "BSD" ]; then
+ if [ $# -ge 2 ] &&
+ [ "$1" = a ] &&
+ [ "$( echo "$2" | sed -e 's,.*BSD.*,BSD,' )" = BSD ]; then
rdev=$du
fi
done
@@ -147,10 +149,10 @@ echo " "${driveunits}
echo ""
prefdev=${rdev}
rdev=""
-while [ "X${rdev}" = "X" ]; do
+while [ -z "${rdev}" ]; do
echo -n "Which device would you like to install on ? [${prefdev}] "
getresp ${prefdev}
- otherdrives=`echo "${driveunits}" | sed -e s,${resp},,`
+ otherdrives=$( echo "${driveunits}" | sed -e "s,${resp},," )
if [ "X${driveunits}" = "X${otherdrives}" ]; then
echo ""
echo "\"${resp}\" is an invalid drive name. Valid choices"
@@ -163,8 +165,8 @@ done
echo ""
echo "The root device you have chosen is on: ${rdev}"
echo ""
-# driveunits=`ls /dev/${drivetype}?a | sed -e 's,/dev/\(...\)a,\1,g'`
-if [ "X${driveunits}" = "X" ]; then
+# driveunits=$( ls /dev/${drivetype}?a | sed -e 's,/dev/\(...\)a,\1,g' )
+if [ -z "${driveunits}" ]; then
echo "FATAL ERROR:"
echo "No devices for disks of type '${drivetype}'."
echo "This is probably a bug in the install disks."
@@ -178,9 +180,9 @@ echo ""
echo "(answering yes will format your root partition on $rdev)"
echo -n "Are you SURE you want NetBSD installed on your hard drive? (yes/no) "
answer=""
-while [ "$answer" = "" ]; do
+while [ -z "$answer" ]; do
getresp
- case $resp in
+ case "$resp" in
yes|YES)
echo ""
answer=yes
@@ -214,10 +216,10 @@ echo ""
echo "Now lets setup your /usr file system"
echo "(Once a valid input for drive and partition is seen"
echo "it will be FORMATTED and inserted in the fstab.)"
-while [ "X$usrpart" = "X" ]; do
+while [ -z "$usrpart" ]; do
resp=""
drivename=""
- while [ "X$resp" = "X" ]; do
+ while [ -z "$resp" ]; do
echo "choices: $driveunits"
echo "which drive do you want /usr on?"
getresp
@@ -238,11 +240,12 @@ while [ "X$usrpart" = "X" ]; do
usrpart=""
echo "You have selected $drivename"
echo "here is a list of partitions on $drivename"
- disklabel $drivename 2>/dev/null | sed -e '/^[ ][ ][ad-p]:/p;/^#[ \t]*size/p;d'
+ disklabel $drivename 2>/dev/null |
+ sed -e '/^[ ][ ][ad-p]:/p;/^#[ \t]*size/p;d'
echo "which partition would you like to format and have"
echo -n "mounted as /usr? (supply the letter): "
getresp
- if [ "X$resp" = "X" ]; then
+ if [ -z "$resp" ]; then
continue;
fi
@@ -250,10 +253,11 @@ while [ "X$usrpart" = "X" ]; do
set -- $list
while [ $# -gt 0 ]; do
if [ "$resp" = "$1" ]; then
- if [ "`echo $2 | sed -e 's,.*BSD.*,BSD,'`" != "BSD" ]; then
+ if [ "$( echo $2 | sed -e 's,.*BSD.*,BSD,' )" != "BSD" ]
+ then
echo ""
-echo -n "$drivename$resp is of type $2 which is not"
-echo " a BSD filesystem type"
+echo -n "$drivename$resp is of type $2 which"
+echo " is not a BSD filesystem type"
break
fi
usrpart=$drivename$resp
@@ -263,7 +267,7 @@ while [ "X$usrpart" = "X" ]; do
shift
fi
done
- if [ "X$usrpart" = "X" ]; then
+ if [ -z "$usrpart" ]; then
echo "$resp is not a valid input."
echo ""
fi
CVS commit: src/distrib/common
Module Name:src
Committed By: kre
Date: Sun Sep 16 21:49:18 UTC 2018
Modified Files:
src/distrib/common: buildfloppies.sh
Log Message:
Remove use of test ([) -o (and a couple of other trivial cleanups).
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/common/buildfloppies.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/buildfloppies.sh
diff -u src/distrib/common/buildfloppies.sh:1.18 src/distrib/common/buildfloppies.sh:1.19
--- src/distrib/common/buildfloppies.sh:1.18 Sat Feb 11 03:07:06 2017
+++ src/distrib/common/buildfloppies.sh Sun Sep 16 21:49:18 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: buildfloppies.sh,v 1.18 2017/02/11 03:07:06 christos Exp $
+# $NetBSD: buildfloppies.sh,v 1.19 2018/09/16 21:49:18 kre Exp $
#
# Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -58,12 +58,12 @@ _USAGE_
plural()
{
- [ $1 -ne 1 ] && echo "s"
+ [ "$1" -ne 1 ] && echo "s"
}
roundup()
{
- echo $(( ( $1 + $2 - 1 ) / ( $2 ) ))
+ echo $(( ( ( $1 ) + ( $2 ) - 1 ) / ( $2 ) ))
}
@@ -148,8 +148,10 @@ for file in $files; do
set -- $(ls -ln $file)
file_bytes=$5
pad_bytes=$(($(roundup $file_bytes 512) * 512 - $file_bytes))
- [ "$file_bytes" != 0 -o "$file" = "${file#USTAR.volsize.}" ] &&
+ if [ "$file_bytes" != 0 ] || [ "$file" = "${file#USTAR.volsize.}" ]
+ then
msg="$msg $file $pad_bytes,"
+ fi
free_space=$(($free_space - 512 - $file_bytes - $pad_bytes))
done
echo "Free space in last tar block:$msg"
CVS commit: src/distrib/common
Module Name:src
Committed By: kre
Date: Sun Sep 16 21:41:34 UTC 2018
Modified Files:
src/distrib/common: sunbootcd.sh
Log Message:
Remove test ([) -o usage, and make a couple of minor cleanups as well.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/common/sunbootcd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/sunbootcd.sh
diff -u src/distrib/common/sunbootcd.sh:1.6 src/distrib/common/sunbootcd.sh:1.7
--- src/distrib/common/sunbootcd.sh:1.6 Wed Feb 22 16:12:34 2012
+++ src/distrib/common/sunbootcd.sh Sun Sep 16 21:41:34 2018
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: sunbootcd.sh,v 1.6 2012/02/22 16:12:34 martin Exp $
+# $NetBSD: sunbootcd.sh,v 1.7 2018/09/16 21:41:34 kre Exp $
#
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -59,11 +59,13 @@ _USAGE_
exit 1
}
-if [ $# -lt 2 -o $# -gt 6 ]; then
- usage
-fi
+case "$#" in
+([23456]) ;;
+(*) usage;;
+esac
-for curfile in $*; do
+for curfile
+do
[ "$curfile" = "-" ] && continue
if [ ! -f "$curfile" ]; then
echo 1>&2 "${PROGNAME}: ${curfile}: No such file."
@@ -81,7 +83,8 @@ printf "${FORMAT}" "fsimage:" 0 ${ISOCYL
ENDCYL=${ISOCYLS}
curpart=0
-for curfile in $*; do
+for curfile
+do
curpart=$(( ${curpart} + 1 ))
[ "$curfile" = "-" ] && continue
CVS commit: src/distrib/miniroot
Module Name:src
Committed By: kre
Date: Sun Sep 16 21:32:29 UTC 2018
Modified Files:
src/distrib/miniroot: install.sh upgrade.sh
Log Message:
Remove uses of test ... -a ... and test ... -o ...
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/miniroot/install.sh
cvs rdiff -u -r1.22 -r1.23 src/distrib/miniroot/upgrade.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/miniroot/install.sh
diff -u src/distrib/miniroot/install.sh:1.25 src/distrib/miniroot/install.sh:1.26
--- src/distrib/miniroot/install.sh:1.25 Sun Sep 20 22:44:06 2009
+++ src/distrib/miniroot/install.sh Sun Sep 16 21:32:29 2018
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sh,v 1.25 2009/09/20 22:44:06 abs Exp $
+# $NetBSD: install.sh,v 1.26 2018/09/16 21:32:29 kre Exp $
#
# Copyright (c) 1996,1997,1999,2000,2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -377,7 +377,7 @@ mount_fs /tmp/fstab.shadow
mount | while read line; do
set -- $line
- if [ "$2" = "/" -a "$3" = "nfs" ]; then
+ if [ "$2" = "/" ] && [ "$3" = "nfs" ]; then
echo "You appear to be running diskless."
echo -n "Are the install sets on one of your currently mounted filesystems? [n] "
getresp "n"
Index: src/distrib/miniroot/upgrade.sh
diff -u src/distrib/miniroot/upgrade.sh:1.22 src/distrib/miniroot/upgrade.sh:1.23
--- src/distrib/miniroot/upgrade.sh:1.22 Wed Apr 30 13:10:48 2008
+++ src/distrib/miniroot/upgrade.sh Sun Sep 16 21:32:29 2018
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: upgrade.sh,v 1.22 2008/04/30 13:10:48 martin Exp $
+# $NetBSD: upgrade.sh,v 1.23 2018/09/16 21:32:29 kre Exp $
#
# Copyright (c) 1996-2000,2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -238,8 +238,8 @@ esac
(
> /tmp/fstab
while read _dev _mp _fstype _rest ; do
- if [ "X${_fstype}" = X"ufs" -o \
- "X${_fstype}" = X"ffs" ]; then
+ if [ "X${_fstype}" = X"ufs" ] ||
+ [ "X${_fstype}" = X"ffs" ]; then
if [ "X${_fstype}" = X"ufs" ]; then
# Convert ufs to ffs.
_fstype=ffs
CVS commit: src/sys/sys
Module Name:src
Committed By: mrg
Date: Sun Sep 16 20:40:20 UTC 2018
Modified Files:
src/sys/sys: socket.h
Log Message:
clean up a comment left behind from the previous commit.
this now only has sysctl pcb info.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/sys/socket.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/socket.h
diff -u src/sys/sys/socket.h:1.127 src/sys/sys/socket.h:1.128
--- src/sys/sys/socket.h:1.127 Wed Aug 22 01:05:24 2018
+++ src/sys/sys/socket.h Sun Sep 16 20:40:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.127 2018/08/22 01:05:24 msaitoh Exp $ */
+/* $NetBSD: socket.h,v 1.128 2018/09/16 20:40:20 mrg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -377,15 +377,7 @@ struct sockcred {
#if defined(_NETBSD_SOURCE)
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families below.
- */
-
+/* Definition for CTL_NET PCB fetching sysctls */
struct kinfo_pcb {
__uint64_t ki_pcbaddr; /* PTR: pcb addr */
__uint64_t ki_ppcbaddr; /* PTR: ppcb addr */
CVS commit: src/sys/kern
Module Name:src
Committed By: mrg
Date: Sun Sep 16 20:39:04 UTC 2018
Modified Files:
src/sys/kern: init_sysctl.c
Log Message:
CTL_DEBUG_MAXID is only used to size a static array that the compiler
can do just fine itself. use the compiler and remove the define.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sys/kern/init_sysctl.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/kern/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.216 src/sys/kern/init_sysctl.c:1.217
--- src/sys/kern/init_sysctl.c:1.216 Mon Sep 3 16:29:35 2018
+++ src/sys/kern/init_sysctl.c Sun Sep 16 20:39:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.216 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.217 2018/09/16 20:39:04 mrg Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.216 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.217 2018/09/16 20:39:04 mrg Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
@@ -632,9 +632,7 @@ struct ctldebug /* debug0, */ /* debug1,
struct ctldebug debug5, debug6, debug7, debug8, debug9;
struct ctldebug debug10, debug11, debug12, debug13, debug14;
struct ctldebug debug15, debug16, debug17, debug18, debug19;
-
-#define CTL_DEBUG_MAXID 20
-static struct ctldebug *debugvars[CTL_DEBUG_MAXID] = {
+static struct ctldebug *debugvars[] = {
, , , , ,
, , , , ,
, , , , ,
@@ -668,7 +666,7 @@ SYSCTL_SETUP(sysctl_debug_setup, "sysctl
*/
- for (i = 0; i < CTL_DEBUG_MAXID; i++) {
+ for (i = 0; i < __arraycount(debugvars); i++) {
cdp = debugvars[i];
if (cdp->debugname == NULL || cdp->debugvar == NULL)
continue;
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Sun Sep 16 20:21:56 UTC 2018
Modified Files:
src/sys/dev/usb: ehci.c ohci.c uhci.c usb.c usbdi.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
consolidate the handling of polling across HC drivers, and generic USB:
- don't take mutexes if polling
- normalise the code across all drivers
- add some not yet code to block discovery to/from polling
- minor CSE
- adjust comment for usbd_set_polling() to reality now i properly
understand what it is used for and why.
this, with a hack to make RB_ASKNAME to wait 5 seconds allows boot -a
work with USB keyboards. there are still multiple issues remaining:
- discovery and polling need to be mutually exclusive
- attachment of ukbd and wskbd is not handled by config_pending, and
the 5 second delay isn't going to always be enough.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.286 -r1.287 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.283 -r1.284 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.54 -r1.55 src/sys/external/bsd/dwc2/dwc2.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/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.263 src/sys/dev/usb/ehci.c:1.264
--- src/sys/dev/usb/ehci.c:1.263 Sun Sep 16 09:25:47 2018
+++ src/sys/dev/usb/ehci.c Sun Sep 16 20:21:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.263 2018/09/16 09:25:47 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.264 2018/09/16 20:21:56 mrg Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.263 2018/09/16 09:25:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.264 2018/09/16 20:21:56 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2637,13 +2637,16 @@ Static usbd_status
ehci_root_intr_start(struct usbd_xfer *xfer)
{
ehci_softc_t *sc = EHCI_XFER2SC(xfer);
+ const bool polling = sc->sc_bus.ub_usepolling;
if (sc->sc_dying)
return USBD_IOERROR;
- mutex_enter(>sc_lock);
+ if (!polling)
+ mutex_enter(>sc_lock);
sc->sc_intrxfer = xfer;
- mutex_exit(>sc_lock);
+ if (!polling)
+ mutex_exit(>sc_lock);
return USBD_IN_PROGRESS;
}
@@ -3538,6 +3541,7 @@ ehci_device_ctrl_start(struct usbd_xfer
ehci_softc_t *sc = EHCI_XFER2SC(xfer);
ehci_soft_qtd_t *setup, *status, *next;
ehci_soft_qh_t *sqh;
+ const bool polling = sc->sc_bus.ub_usepolling;
EHCIHIST_FUNC(); EHCIHIST_CALLED();
@@ -3657,7 +3661,8 @@ ehci_device_ctrl_start(struct usbd_xfer
DPRINTFN(5, "--- dump end ---", 0, 0, 0, 0);
#endif
- mutex_enter(>sc_lock);
+ if (!polling)
+ mutex_enter(>sc_lock);
/* Insert qTD in QH list - also does usb_syncmem(sqh) */
ehci_set_qh_qtd(sqh, setup);
@@ -3667,7 +3672,8 @@ ehci_device_ctrl_start(struct usbd_xfer
}
ehci_add_intr_list(sc, exfer);
xfer->ux_status = USBD_IN_PROGRESS;
- mutex_exit(>sc_lock);
+ if (!polling)
+ mutex_exit(>sc_lock);
#if 0
#ifdef EHCI_DEBUG
@@ -3814,6 +3820,7 @@ ehci_device_bulk_start(struct usbd_xfer
ehci_soft_qh_t *sqh;
ehci_soft_qtd_t *end;
int len, isread, endpt;
+ const bool polling = sc->sc_bus.ub_usepolling;
EHCIHIST_FUNC(); EHCIHIST_CALLED();
@@ -3837,7 +3844,8 @@ ehci_device_bulk_start(struct usbd_xfer
#endif
/* Take lock here to protect nexttoggle */
- mutex_enter(>sc_lock);
+ if (!polling)
+ mutex_enter(>sc_lock);
ehci_reset_sqtd_chain(sc, xfer, len, isread, >nexttoggle, );
@@ -3864,7 +3872,8 @@ ehci_device_bulk_start(struct usbd_xfer
}
ehci_add_intr_list(sc, exfer);
xfer->ux_status = USBD_IN_PROGRESS;
- mutex_exit(>sc_lock);
+ if (!polling)
+ mutex_exit(>sc_lock);
#if 0
#ifdef EHCI_DEBUG
@@ -4029,6 +4038,7 @@ ehci_device_intr_start(struct usbd_xfer
ehci_soft_qtd_t *end;
ehci_soft_qh_t *sqh;
int len, isread, endpt;
+ const bool polling = sc->sc_bus.ub_usepolling;
EHCIHIST_FUNC(); EHCIHIST_CALLED();
@@ -4052,7 +4062,8 @@ ehci_device_intr_start(struct usbd_xfer
#endif
/* Take lock to protect nexttoggle */
- mutex_enter(>sc_lock);
+ if (!polling)
+ mutex_enter(>sc_lock);
ehci_reset_sqtd_chain(sc, xfer, len, isread, >nexttoggle, );
@@ -4079,7 +4090,8 @@ ehci_device_intr_start(struct usbd_xfer
}
ehci_add_intr_list(sc, exfer);
xfer->ux_status = USBD_IN_PROGRESS;
- mutex_exit(>sc_lock);
+ if (!polling)
+ mutex_exit(>sc_lock);
#if 0
#ifdef EHCI_DEBUG
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.286 src/sys/dev/usb/ohci.c:1.287
--- src/sys/dev/usb/ohci.c:1.286 Sun Sep 16 10:29:39 2018
+++ src/sys/dev/usb/ohci.c Sun Sep 16 20:21:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.286 2018/09/16 10:29:39 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.287 2018/09/16 20:21:56 mrg Exp $ */
/*
CVS commit: src/sys/arch/arm/conf
Module Name:src Committed By: skrll Date: Sun Sep 16 15:40:36 UTC 2018 Modified Files: src/sys/arch/arm/conf: files.arm Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/sys/arch/arm/conf/files.arm 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/conf/files.arm diff -u src/sys/arch/arm/conf/files.arm:1.141 src/sys/arch/arm/conf/files.arm:1.142 --- src/sys/arch/arm/conf/files.arm:1.141 Fri Aug 10 17:47:14 2018 +++ src/sys/arch/arm/conf/files.arm Sun Sep 16 15:40:36 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.arm,v 1.141 2018/08/10 17:47:14 maxv Exp $ +# $NetBSD: files.arm,v 1.142 2018/09/16 15:40:36 skrll Exp $ # temporary define to allow easy moving to ../arch/arm/arm32 defflagARM32 @@ -87,7 +87,7 @@ defflag opt_arm_bus_space.h __BUS_SPACE defflag opt_arm_timer.h __HAVE_GENERIC_CPU_INITCLOCKS # Floating point emulator -obsolete defflagARMFPE +obsolete defflag ARMFPE # VFP support file arch/arm/vfp/vfp_init.c arm32
CVS commit: src/sys/arch/sparc/stand/binstall
Module Name:src
Committed By: kre
Date: Sun Sep 16 14:26:04 UTC 2018
Modified Files:
src/sys/arch/sparc/stand/binstall: binstall.sh
Log Message:
General cleanups...
Better quote usage
No more need for sed
(should be no need for getopt either, but did not do that one)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/stand/binstall/binstall.sh
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/sparc/stand/binstall/binstall.sh
diff -u src/sys/arch/sparc/stand/binstall/binstall.sh:1.16 src/sys/arch/sparc/stand/binstall/binstall.sh:1.17
--- src/sys/arch/sparc/stand/binstall/binstall.sh:1.16 Sun Sep 16 14:23:04 2018
+++ src/sys/arch/sparc/stand/binstall/binstall.sh Sun Sep 16 14:26:04 2018
@@ -1,12 +1,10 @@
#!/bin/sh
-# $NetBSD: binstall.sh,v 1.16 2018/09/16 14:23:04 kre Exp $
+# $NetBSD: binstall.sh,v 1.17 2018/09/16 14:26:04 kre Exp $
#
vecho () {
-# echo if VERBOSE on
- if [ "$VERBOSE" = "1" ]; then
- echo "$@" 1>&2
- fi
+ # echo if VERBOSE on
+ [ -n "$VERBOSE" ] && echo "$*" 1>&2
return 0
}
@@ -25,7 +23,7 @@ Options () {
}
Usage () {
- echo "Usage: $0 [options] <"'"net"|"ffs"'"> "
+ echo "Usage: $0"' [options] <"net"|"ffs"> '
Options
exit 1
}
@@ -33,7 +31,7 @@ Usage () {
Help () {
echo "This script copies the boot programs to one of several"
echo "commonly used places."
- echo "When installing an \"ffs\" boot program, this script also runs"
+ echo 'When installing an "ffs" boot program, this script also runs'
echo "installboot(8) which installs the default proto bootblocks into"
echo "the appropriate filesystem partition or filesystem image."
Options
@@ -48,38 +46,36 @@ Secure () {
}
PATH=/bin:/usr/bin:/sbin:/usr/sbin
+VERBOSE=
: ${MDEC:=/usr/mdec}
: ${INSTALLBOOT:=/usr/sbin/installboot}
: ${BOOTPROG:=boot}
: ${OFWBOOTBLK:=ofwboot}
-if [ "`sysctl -n machdep.cpu_arch`" = 9 ]; then
- ULTRASPARC=1
-else
- ULTRASPARC=0
-fi
+[ "$( sysctl -n machdep.cpu_arch )" = 9 ] && ULTRASPARC=true || ULTRASPARC=false
-set -- `getopt "b:hf:i:m:tUuv" "$@"`
+### XXX this should be converted to use getopts
+set -- $(getopt "b:hf:i:m:tUuv" "$@" )
if [ $? -gt 0 ]; then
Usage
fi
-for a in $*
+for a
do
- case $1 in
+ case "$1" in
-h) Help; shift ;;
- -u) ULTRASPARC=1; shift ;;
- -U) ULTRASPARC=0; shift ;;
+ -u) ULTRASPARC=true; shift ;;
+ -U) ULTRASPARC=false; shift ;;
-b) BOOTPROG=$2; OFWBOOTBLK=$2; shift 2 ;;
-f) DEV=$2; shift 2 ;;
-m) MDEC=$2; shift 2 ;;
-i) INSTALLBOOT=$2; shift 2 ;;
- -t) TEST=1; VERBOSE=1; shift ;;
- -v) VERBOSE=1; shift ;;
+ -t) TEST=1; VERBOSE=-v; shift ;;
+ -v) VERBOSE=-v; shift ;;
--) shift; break ;;
esac
done
-if [ "`sysctl -n kern.securelevel`" -gt 0 ] && [ ! -f "$DEV" ]; then
+if [ "$( sysctl -n kern.securelevel )" -gt 0 ] && ! [ -f "$DEV" ]; then
Secure
fi
@@ -92,12 +88,13 @@ fi
WHAT=$1
DEST=$2
-if [ ! -d $DEST ]; then
+if ! [ -d "$DEST" ]; then
echo "$DEST: not a directory"
Usage
fi
-if [ "$ULTRASPARC" = "1" ]; then
+if $ULTRASPARC
+then
machine=sparc64
targ=ofwboot
stage2=""
@@ -114,42 +111,42 @@ fi
case $WHAT in
"ffs")
- if [ "$DEV" = "" ]; then
+ if [ -z "$DEV" ]; then
# Lookup device mounted on DEST
- DEV=`mount | while read line; do
+ DEV=$( mount | while read line; do
set -- $line
vecho "Inspecting \"$line\""
if [ "$2" = "on" ] && [ "$3" = "$DEST" ]; then
-if [ ! -b $1 ]; then
- continue
-fi
-RAW=\`echo -n "$1" | sed -e 's;/dev/;/dev/r;'\`
-if [ ! -c \$RAW ]; then
- continue
-fi
-echo -n $RAW
+[ -b "$1" ] || continue
+case "$1" in
+(*/*) RAW="${1%/*}/r${1##*/}";;
+(*) RAW="r$1";;
+esac
+[ -c "$RAW" ] || continue
+echo -n "$RAW"
break;
fi
- done`
- if [ "$DEV" = "" ]; then
+ done )
+ if [ -z "$DEV" ]; then
echo "Cannot find \"$DEST\" in mount table"
exit 1
fi
fi
- vecho Boot device: $DEV
- vecho Primary boot program: $BOOTXX
- vecho Secondary boot program: $DEST/$targ
+ vecho "Boot device: $DEV"
+ vecho "Primary boot program: $BOOTXX"
+ vecho "Secondary boot program: $DEST/$targ"
- $DOIT cp -p -f ${MDEC}/${BOOTPROG} $DEST/$targ
+ $DOIT cp -p -f "${MDEC}/${BOOTPROG}" "$DEST/$targ"
sync; sync; sync
- vecho ${INSTALLBOOT} ${VERBOSE:+-v} -m $machine $DEV ${BOOTXX} $stage2
- $DOIT ${INSTALLBOOT} ${VERBOSE:+-v} -m $machine $DEV ${BOOTXX} $stage2
+ vecho "${INSTALLBOOT} ${VERBOSE} -m $machine $DEV $BOOTXX $stage2"
+ $DOIT "${INSTALLBOOT}" ${VERBOSE} -m "$machine" \
+ "$DEV" "$BOOTXX" "$stage2"
;;
"net")
- vecho Network boot program: $DEST/$boot.${machine}.netbsd
- $DOIT cp -p -f ${MDEC}/$netboot $DEST/$boot.${machine}.netbsd
+ vecho "Network boot program: $DEST/$boot.${machine}.netbsd"
+ $DOIT cp -p -f "${MDEC}/$netboot" "$DEST/$boot.${machine}.netbsd"
;;
*)
CVS commit: src/sys/arch/sparc/stand/binstall
Module Name:src
Committed By: kre
Date: Sun Sep 16 14:23:04 UTC 2018
Modified Files:
src/sys/arch/sparc/stand/binstall: binstall.sh
Log Message:
PR install/53610
Remove use of -a in test(1) - deprecated in standard, and no
longer supported in SMALL (install media) versions of test in /bin/sh
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/stand/binstall/binstall.sh
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/sparc/stand/binstall/binstall.sh
diff -u src/sys/arch/sparc/stand/binstall/binstall.sh:1.15 src/sys/arch/sparc/stand/binstall/binstall.sh:1.16
--- src/sys/arch/sparc/stand/binstall/binstall.sh:1.15 Wed Jul 12 21:34:45 2006
+++ src/sys/arch/sparc/stand/binstall/binstall.sh Sun Sep 16 14:23:04 2018
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: binstall.sh,v 1.15 2006/07/12 21:34:45 he Exp $
+# $NetBSD: binstall.sh,v 1.16 2018/09/16 14:23:04 kre Exp $
#
vecho () {
@@ -119,7 +119,7 @@ case $WHAT in
DEV=`mount | while read line; do
set -- $line
vecho "Inspecting \"$line\""
- if [ "$2" = "on" -a "$3" = "$DEST" ]; then
+ if [ "$2" = "on" ] && [ "$3" = "$DEST" ]; then
if [ ! -b $1 ]; then
continue
fi
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: jmcneill
Date: Sun Sep 16 13:21:36 UTC 2018
Modified Files:
src/sys/arch/arm/cortex: gtmr.c gtmr_var.h
src/sys/arch/arm/sunxi: sunxi_platform.c
Log Message:
port-evbarm/53308: evbarm-earmv7hf performance regression under qemu
Revert gtmr.c r1.27 and apply a workaround for Allwinner A64 SoCs based
on analysis of the issue from LKML: https://lkml.org/lkml/2018/5/10/774
Since this bug is specific to the Allwinner A64 SoC, only apply the
workaround when the root ("/") node of the device tree is compatible
with "allwinner,sun50i-a64".
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/cortex/gtmr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/cortex/gtmr_var.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/sunxi/sunxi_platform.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/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.34 src/sys/arch/arm/cortex/gtmr.c:1.35
--- src/sys/arch/arm/cortex/gtmr.c:1.34 Mon Sep 10 10:55:02 2018
+++ src/sys/arch/arm/cortex/gtmr.c Sun Sep 16 13:21:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr.c,v 1.34 2018/09/10 10:55:02 skrll Exp $ */
+/* $NetBSD: gtmr.c,v 1.35 2018/09/16 13:21:36 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.34 2018/09/10 10:55:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.35 2018/09/16 13:21:36 jmcneill Exp $");
#include
#include
@@ -50,48 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.3
#include
#include
-#define stable_write(reg) \
-static struct evcnt reg ## _write_ev; \
-static void \
-reg ## _stable_write(struct gtmr_softc *sc, uint64_t val) \
-{ \
- int retry; \
- reg ## _write(val); \
- retry = 0; \
- while (reg ## _read() != (val) && retry++ < 200) \
- reg ## _write(val); \
- if (retry > reg ## _write_ev.ev_count) { \
- reg ## _write_ev.ev_count = retry; \
- } \
-}
-
-stable_write(gtmr_cntv_tval);
-
-#define stable_read(reg) \
-static struct evcnt reg ## _read_ev; \
-static uint64_t \
-reg ## _stable_read(struct gtmr_softc *sc) \
-{ \
- uint64_t oval, val; \
- int retry = 0; \
- val = reg ## _read(); \
- while (++retry < 200) { \
- oval = val; \
- val = reg ## _read(); \
- if (val == oval) \
- break; \
- } \
- if (retry > reg ## _read_ev.ev_count) { \
- reg ## _read_ev.ev_count = retry; \
- } \
- return val; \
-}
-
-#ifdef DIAGNOSTIC
-stable_read(gtmr_cntv_cval);
-#endif
-stable_read(gtmr_cntvct);
-
static int gtmr_match(device_t, cfdata_t, void *);
static void gtmr_attach(device_t, device_t, void *);
@@ -142,6 +100,7 @@ gtmr_attach(device_t parent, device_t se
struct gtmr_softc *sc = _sc;
prop_dictionary_t dict = device_properties(self);
char freqbuf[sizeof("X.XXX SHz")];
+ bool flag;
/*
* This runs at a fixed frequency of 1 to 50MHz.
@@ -156,6 +115,11 @@ gtmr_attach(device_t parent, device_t se
aprint_naive("\n");
aprint_normal(": ARM Generic Timer (%s)\n", freqbuf);
+ if (prop_dictionary_get_bool(dict, "sun50i-a64-unstable-timer", ) && flag) {
+ sc->sc_flags |= GTMR_FLAG_SUN50I_A64_UNSTABLE_TIMER;
+ aprint_debug_dev(self, "enabling Allwinner A64 timer workaround\n");
+ }
+
/*
* Enable the virtual counter to be accessed from usermode.
*/
@@ -172,15 +136,6 @@ gtmr_attach(device_t parent, device_t se
evcnt_attach_dynamic(>sc_ev_missing_ticks, EVCNT_TYPE_MISC, NULL,
device_xname(self), "missing interrupts");
- evcnt_attach_dynamic(_cntv_tval_write_ev, EVCNT_TYPE_MISC, NULL,
- device_xname(self), "CNTV_TVAL write retry max");
-#ifdef DIAGNOSTIC
- evcnt_attach_dynamic(_cntv_cval_read_ev, EVCNT_TYPE_MISC, NULL,
- device_xname(self), "CNTV_CVAL read retry max");
-#endif
- evcnt_attach_dynamic(_cntvct_read_ev, EVCNT_TYPE_MISC, NULL,
- device_xname(self), "CNTVCT read retry max");
-
if (mpcaa->mpcaa_irq != -1) {
sc->sc_global_ih = intr_establish(mpcaa->mpcaa_irq, IPL_CLOCK,
IST_LEVEL | IST_MPSAFE, gtmr_intr, NULL);
@@ -209,6 +164,27 @@ gtmr_attach(device_t parent, device_t se
gtmr_cntv_ctl_write(0);
}
+static uint64_t
+gtmr_read_cntvct(struct gtmr_softc *sc)
+{
+ if (ISSET(sc->sc_flags, GTMR_FLAG_SUN50I_A64_UNSTABLE_TIMER)) {
+ /*
+ * The Allwinner A64 SoC has an unstable architectural timer.
+ * To workaround this problem, ignore reads where the lower
+ * 11 bits are all 0s or 1s.
+ */
+ uint64_t val;
+ u_int bits;
+ do {
+ val = gtmr_cntvct_read();
+ bits = val & __BITS(10,0);
+ } while (bits == 0 || bits == __BITS(10,0));
+ return val;
+ }
+
+ return gtmr_cntvct_read();
+}
+
void
gtmr_init_cpu_clock(struct cpu_info *ci)
{
@@ -227,10 +203,10 @@ gtmr_init_cpu_clock(struct cpu_info *ci)
* Get now and update the compare timer.
*/
arm_isb();
- ci->ci_lastintr = gtmr_cntvct_stable_read(sc);
- gtmr_cntv_tval_stable_write(sc,
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Sep 16 13:14:12 UTC 2018
Modified Files:
src/share/mk: bsd.README
Log Message:
add what {PROG,LIB}DPLIBS are useful for
To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 src/share/mk/bsd.README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.383 src/share/mk/bsd.README:1.384
--- src/share/mk/bsd.README:1.383 Sun Sep 16 09:11:48 2018
+++ src/share/mk/bsd.README Sun Sep 16 09:14:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.383 2018/09/16 13:11:48 christos Exp $
+# $NetBSD: bsd.README,v 1.384 2018/09/16 13:14:12 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1330,6 +1330,10 @@ LIBDPLIBS/
PROGDPLIBS A list of the tuples:
libname path-to-srcdir-of-libname
+ Instead of depending on installed versions of the libraries,
+ one can depend on their built version in the source directory.
+ This is useful for finding private libraries (LIBISPRIVATE).
+
For each tuple;
* LIBDO.libname contains the .OBJDIR of the library
`libname', and if it is not set it is determined
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Sun Sep 16 13:11:48 UTC 2018 Modified Files: src/share/mk: bsd.README Log Message: document PROGDPLIBS To generate a diff of this commit: cvs rdiff -u -r1.382 -r1.383 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.382 src/share/mk/bsd.README:1.383 --- src/share/mk/bsd.README:1.382 Sun Aug 12 07:50:51 2018 +++ src/share/mk/bsd.README Sun Sep 16 09:11:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.382 2018/08/12 11:50:51 christos Exp $ +# $NetBSD: bsd.README,v 1.383 2018/09/16 13:11:48 christos Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -1326,7 +1326,8 @@ SRCS List of source files to build the to .c files of the same name. (This is not the default for versions of make.) -LIBDPLIBS A list of the tuples: +LIBDPLIBS/ +PROGDPLIBS A list of the tuples: libname path-to-srcdir-of-libname For each tuple; @@ -1343,8 +1344,8 @@ LIBDPLIBS A list of the tuples: of the NetBSD source tree and only causes -llibname to be added to LDADD. - This variable may be used for individual libraries, as - well as in parent directories to cache common libraries + This variable may be used for individual libraries/programs, + as well as in parent directories to cache common libraries as a build-time optimization. The include file includes the file named "../Makefile.inc"
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Sun Sep 16 11:34:20 UTC 2018
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c
Log Message:
G/C
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/arm32/arm32_boot.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/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.21 src/sys/arch/arm/arm32/arm32_boot.c:1.22
--- src/sys/arch/arm/arm32/arm32_boot.c:1.21 Wed Aug 15 06:00:02 2018
+++ src/sys/arch/arm/arm32/arm32_boot.c Sun Sep 16 11:34:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.21 2018/08/15 06:00:02 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.22 2018/09/16 11:34:20 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.21 2018/08/15 06:00:02 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.22 2018/09/16 11:34:20 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -337,13 +337,6 @@ cpu_hatch(struct cpu_info *ci, cpuid_t c
*/
splhigh();
-#ifdef CPU_CORTEX
-#if 0
- KASSERTMSG(armreg_auxctl_read() & CORTEXA9_AUXCTL_SMP, "auxctl %#x",
- armreg_auxctl_read());
-#endif
-#endif
-
VPRINTF("%s(%s): ", __func__, ci->ci_data.cpu_name);
uint32_t mpidr = armreg_mpidr_read();
if (mpidr & MPIDR_MT) {
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src
Committed By: skrll
Date: Sun Sep 16 11:24:29 UTC 2018
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Use do { } while (/* CONSTCOND */ 0) for nop VPRINTF
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/fdt/fdt_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/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.36 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.37
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.36 Fri Sep 14 22:08:49 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Sep 16 11:24:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.36 2018/09/14 22:08:49 jakllsch Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.37 2018/09/16 11:24:29 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.36 2018/09/14 22:08:49 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.37 2018/09/16 11:24:29 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -160,7 +160,7 @@ earlyconsgetc(dev_t dev)
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...)
+#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
#endif
/*
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Sun Sep 16 10:29:39 UTC 2018 Modified Files: src/sys/dev/usb: ohci.c Log Message: avoid __diagused. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/sys/dev/usb/ohci.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/dev/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.285 src/sys/dev/usb/ohci.c:1.286 --- src/sys/dev/usb/ohci.c:1.285 Mon Sep 3 16:29:33 2018 +++ src/sys/dev/usb/ohci.c Sun Sep 16 10:29:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.285 2018/09/03 16:29:33 riastradh Exp $ */ +/* $NetBSD: ohci.c,v 1.286 2018/09/16 10:29:39 mrg Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.285 2018/09/03 16:29:33 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.286 2018/09/16 10:29:39 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1389,9 +1389,8 @@ ohci_softintr(void *v) int len, cc; int i, j, actlen, iframes, uedir; ohci_physaddr_t done; - bool polling __diagused = sc->sc_bus.ub_usepolling; - KASSERT(polling || mutex_owned(>sc_lock)); + KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(>sc_lock)); OHCIHIST_FUNC(); OHCIHIST_CALLED(); @@ -1624,7 +1623,7 @@ ohci_softintr(void *v) } DPRINTFN(10, "done", 0, 0, 0, 0); - KASSERT(polling || mutex_owned(>sc_lock)); + KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(>sc_lock)); } void
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: mrg Date: Sun Sep 16 10:15:22 UTC 2018 Modified Files: src/sys/arch/evbmips/conf: ERLITE Log Message: enable ext2fs, nullfs, cd9660, disable FFS_NO_SNAPSHOT, and remove not relevant PCI IDE stuff. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/conf/ERLITE 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/evbmips/conf/ERLITE diff -u src/sys/arch/evbmips/conf/ERLITE:1.19 src/sys/arch/evbmips/conf/ERLITE:1.20 --- src/sys/arch/evbmips/conf/ERLITE:1.19 Wed Aug 1 20:04:11 2018 +++ src/sys/arch/evbmips/conf/ERLITE Sun Sep 16 10:15:22 2018 @@ -1,11 +1,11 @@ -# $NetBSD: ERLITE,v 1.19 2018/08/01 20:04:11 maxv Exp $ +# $NetBSD: ERLITE,v 1.20 2018/09/16 10:15:22 mrg Exp $ include "arch/mips/conf/std.octeon" include "arch/evbmips/conf/files.octeon" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ERLITE-$Revision: 1.19 $" +#ident "ERLITE-$Revision: 1.20 $" maxusers 32 @@ -54,17 +54,17 @@ include "conf/compat_netbsd50.co # File systems file-system FFS # Berkeley Fast Filesystem file-system MFS # memory-based filesystem -#file-system EXT2FS # second extended file system (linux) +file-system EXT2FS # second extended file system (linux) file-system NFS # Sun NFS-compatible filesystem client file-system TMPFS # Efficient memory file-system file-system KERNFS # kernel data-structure filesystem -#file-system NULLFS # NULL layered filesystem +file-system NULLFS # NULL layered filesystem #file-system OVERLAY # overlay file system #file-system FDESC # user file descriptor filesystem #file-system UMAPFS # uid/gid remapping filesystem #file-system LFS # Log-based filesystem (still experimental) file-system PROCFS # /proc -#file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system CD9660 # ISO 9660 + Rock Ridge file system #file-system UNION # union file system file-system MSDOSFS # MS-DOS FAT filesystem(s). #file-system CODA # Coda File System; also needs vcoda (below) @@ -77,7 +77,7 @@ options NFSSERVER # Sun NFS-compatible #options DISKLABEL_EI # disklabel Endian Independent support #options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support -options FFS_NO_SNAPSHOT # No FFS snapshot support +#options FFS_NO_SNAPSHOT # No FFS snapshot support #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. @@ -100,13 +100,6 @@ options SLJIT # Warning, these may compile large string tables into the kernel! options MIIVERBOSE # verbose PHY autoconfig messages -# Bitmask for enabling the PCI IDE channels in the southbridge. -# Set bit 0 (0x01) for channel 0, bit 1 (0x02) for channel 1. -# -# Do this if your firmware (usually PMON and YAMON) doens't enable the IDE -# channels for you (thus causing the NetBSD `pciide' driver to ignore them). -#options PCI_NETBSD_ENABLE_IDE=0x1 - options NFS_BOOT_DHCP config netbsd root on ? type ?
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Sun Sep 16 09:25:48 UTC 2018
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_reg.h
src/sys/arch/arm/imx: imx6_ccmreg.h
src/sys/arch/arm/omap: omap4430_intr.h omap5430_intr.h
src/sys/arch/arm/zynq: zynq7000_board.c
src/sys/arch/mips/include: cpu.h
src/sys/arch/mips/rmi: rmixl_iobus.c
src/sys/arch/powerpc/booke: e500_intr.c
src/sys/arch/powerpc/powerpc: powerpc_machdep.c
src/sys/arch/usermode/usermode: pmap.c
src/sys/dev/pci: if_lmc.h
src/sys/dev/usb: ehci.c
src/sys/netinet: sctp_output.c
Log Message:
interrupt has two 'r's
fix another typo while I'm here (flsah)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/broadcom/bcm53xx_reg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imx6_ccmreg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omap4430_intr.h \
src/sys/arch/arm/omap/omap5430_intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/zynq/zynq7000_board.c
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_iobus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/powerpc/booke/e500_intr.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/usermode/usermode/pmap.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_lmc.h
cvs rdiff -u -r1.262 -r1.263 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netinet/sctp_output.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/broadcom/bcm53xx_reg.h
diff -u src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.16 src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.17
--- src/sys/arch/arm/broadcom/bcm53xx_reg.h:1.16 Wed Mar 26 03:18:56 2014
+++ src/sys/arch/arm/broadcom/bcm53xx_reg.h Sun Sep 16 09:25:46 2018
@@ -727,7 +727,7 @@ struct gmac_txdb {
};
#define TXDB_FLAG_SF __BIT(31) // Start oF Frame
#define TXDB_FLAG_EF __BIT(30) // End oF Frame
-#define TXDB_FLAG_IC __BIT(29) // Interupt on Completetion
+#define TXDB_FLAG_IC __BIT(29) // Interrupt on Completetion
#define TXDB_FLAG_ET __BIT(28) // End Of Table
struct gmac_rxdb {
Index: src/sys/arch/arm/imx/imx6_ccmreg.h
diff -u src/sys/arch/arm/imx/imx6_ccmreg.h:1.8 src/sys/arch/arm/imx/imx6_ccmreg.h:1.9
--- src/sys/arch/arm/imx/imx6_ccmreg.h:1.8 Wed Jun 20 07:05:37 2018
+++ src/sys/arch/arm/imx/imx6_ccmreg.h Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_ccmreg.h,v 1.8 2018/06/20 07:05:37 hkenken Exp $ */
+/* $NetBSD: imx6_ccmreg.h,v 1.9 2018/09/16 09:25:46 skrll Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu
@@ -32,7 +32,7 @@
#include
/*
- * PERIPHCLK_N is an arm root clock divider for MPcore interupt controller.
+ * PERIPHCLK_N is an arm root clock divider for MPcore interrupt controller.
* PERIPHCLK_N is equal to, or greater than two.
* see "Cortex-A9 MPCore Technical Reference Manual" -
* Chapter 5: Clocks, Resets, and Power Management, 5.1: Clocks.
Index: src/sys/arch/arm/omap/omap4430_intr.h
diff -u src/sys/arch/arm/omap/omap4430_intr.h:1.3 src/sys/arch/arm/omap/omap4430_intr.h:1.4
--- src/sys/arch/arm/omap/omap4430_intr.h:1.3 Thu Apr 9 21:33:54 2015
+++ src/sys/arch/arm/omap/omap4430_intr.h Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: omap4430_intr.h,v 1.3 2015/04/09 21:33:54 matt Exp $ */
+/* $NetBSD: omap4430_intr.h,v 1.4 2018/09/16 09:25:46 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -144,7 +144,7 @@
#define IRQ_EMIF2 (32+111) // EMIF2 interrupt
#define IRQ_MCPDM (32+112) // MCPDM interrupt
#define IRQ_DMM (32+113) // DMM interrupt
-#define IRQ_DMIC (32+114) // DMIC interupt
+#define IRQ_DMIC (32+114) // DMIC interrupt
#define IRQ_SYS_NIRQ2 (32+119) // External interrupt 2 (active low)
#define IRQ_KBD_CTL (32+120) // Keyboard controller interrupt
Index: src/sys/arch/arm/omap/omap5430_intr.h
diff -u src/sys/arch/arm/omap/omap5430_intr.h:1.3 src/sys/arch/arm/omap/omap5430_intr.h:1.4
--- src/sys/arch/arm/omap/omap5430_intr.h:1.3 Thu Apr 9 21:33:54 2015
+++ src/sys/arch/arm/omap/omap5430_intr.h Sun Sep 16 09:25:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: omap5430_intr.h,v 1.3 2015/04/09 21:33:54 matt Exp $ */
+/* $NetBSD: omap5430_intr.h,v 1.4 2018/09/16 09:25:46 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -141,11 +141,11 @@
#define IRQ_EMIF2 IRQ_SPI(111) // EMIF2 interrupt
#define IRQ_MCPDM IRQ_SPI(112) // MCPDM interrupt
#define IRQ_DMM IRQ_SPI(113) // DMM interrupt
-#define IRQ_DMIC IRQ_SPI(114) // DMIC interupt
+#define IRQ_DMIC IRQ_SPI(114) // DMIC interrupt
#define IRQ_SYS_NIRQ2 IRQ_SPI(119) // External interrupt 2 (active low)
#define IRQ_KBD_CTL IRQ_SPI(120) // Keyboard controller interrupt
-#define IRQ_GPIO8 IRQ_SPI(121) //
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Sep 16 09:15:12 UTC 2018
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h
Log Message:
Now that the build cluster creates stable "latest" links, use them
as default for downloading sets.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/sysinst/defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.11 src/usr.sbin/sysinst/Makefile.inc:1.12
--- src/usr.sbin/sysinst/Makefile.inc:1.11 Wed Sep 12 13:44:05 2018
+++ src/usr.sbin/sysinst/Makefile.inc Sun Sep 16 09:15:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2018/09/12 13:44:05 martin Exp $
+# $NetBSD: Makefile.inc,v 1.12 2018/09/16 09:15:12 martin Exp $
#
# Makefile for sysinst
@@ -50,9 +50,6 @@ CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.C
-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} \
${NODISKLABEL:D-DNO_DISKLABEL}
-.if (defined(BUILDID))
-COPTS+= -DBUILDID=\"${BUILDID}\"
-.endif
.if defined(NETBSD_OFFICIAL_RELEASE) && ${NETBSD_OFFICIAL_RELEASE} == "yes"
CPPFLAGS+= -DSYSINST_FTP_HOST=\"ftp.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
CPPFLAGS+= -DSYSINST_HTTP_HOST=\"cdn.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.17 src/usr.sbin/sysinst/defs.h:1.18
--- src/usr.sbin/sysinst/defs.h:1.17 Wed Sep 12 13:44:05 2018
+++ src/usr.sbin/sysinst/defs.h Sun Sep 16 09:15:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.17 2018/09/12 13:44:05 martin Exp $ */
+/* $NetBSD: defs.h,v 1.18 2018/09/16 09:15:12 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -347,10 +347,8 @@ int clean_xfer_dir;
#if !defined(SYSINST_FTP_DIR)
#if defined(NETBSD_OFFICIAL_RELEASE)
#define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL
-#elif defined(BUILDID) && defined(REL_PATH)
-#define SYSINST_FTP_DIR "pub/NetBSD-daily/" REL_PATH "/" BUILDID
#elif defined(REL_PATH)
-#define SYSINST_FTP_DIR "pub/NetBSD-daily/" REL_PATH
+#define SYSINST_FTP_DIR "pub/NetBSD-daily/" REL_PATH "/latest"
#else
#define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL
#endif
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: martin
Date: Sun Sep 16 06:09:01 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vfsops.c
Log Message:
Do not initialize .vfs_fhtovp twice
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.16 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.17
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.16 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Sun Sep 16 06:09:01 2018
@@ -163,7 +163,6 @@ struct vfsops zfs_vfsops = {
.vfs_sync = zfs_netbsd_sync,
.vfs_vget = zfs_vget,
.vfs_loadvnode = zfs_loadvnode,
- .vfs_fhtovp = zfs_fhtovp,
.vfs_init = zfs_init,
.vfs_done = zfs_fini,
.vfs_start = (void *)nullop,
