CVS commit: src/sys/arch/amd64/amd64
Module Name:src
Committed By: maxv
Date: Mon Sep 24 05:47:33 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: asan.c
Log Message:
Don't go beyond start().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/amd64/asan.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/amd64/amd64/asan.c
diff -u src/sys/arch/amd64/amd64/asan.c:1.7 src/sys/arch/amd64/amd64/asan.c:1.8
--- src/sys/arch/amd64/amd64/asan.c:1.7 Mon Aug 27 08:53:19 2018
+++ src/sys/arch/amd64/amd64/asan.c Mon Sep 24 05:47:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.c,v 1.7 2018/08/27 08:53:19 maxv Exp $ */
+/* $NetBSD: asan.c,v 1.8 2018/09/24 05:47:33 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: asan.c,v 1.7 2018/08/27 08:53:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asan.c,v 1.8 2018/09/24 05:47:33 maxv Exp $");
#include
#include
@@ -297,6 +297,9 @@ kasan_unwind(void)
}
rbp = (uint64_t *)*(rbp);
+ if (rbp == 0) {
+ break;
+ }
nsym++;
if (nsym >= 15) {
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch
Module Name:src
Committed By: christos
Date: Mon Sep 24 00:45:12 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
Log Message:
sparc has memcmp and cpuid
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.7 Sun Feb 25 20:33:05 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Sun Sep 23 20:45:12 2018
@@ -2,6 +2,7 @@
.PATH.c: ${.PARSEDIR}
CPUID = yes
CPUID_SRCS += sparccpuid.S sparccap.c
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
.if ${MACHINE} == "sparc64"
CPUID_SRCS += sparcv9-mont.S sparcv9a-mont.S
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.6 Fri Oct 14 12:09:44 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Sun Sep 23 20:45:12 2018
@@ -1,6 +1,7 @@
.PATH.S: ${.PARSEDIR}
CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
CPUID_SRCS += sparct4-mont.S vis3-mont.S
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
CPUID = yes
#CPPFLAGS += -DOPENSSL_BN_ASM_MONT
.include "../../crypto.inc"
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: christos Date: Mon Sep 24 00:42:34 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c Log Message: Add more casts to make clang happy. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.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/external/bsd/drm2/dist/drm/i915/intel_display.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.23 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.24 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.23 Thu Sep 13 04:25:55 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Sun Sep 23 20:42:34 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_display.c,v 1.23 2018/09/13 08:25:55 mrg Exp $ */ +/* $NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $ */ /* * Copyright © 2006-2007 Intel Corporation @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.23 2018/09/13 08:25:55 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $"); #include #include @@ -2039,7 +2039,7 @@ static void lpt_enable_pch_transcoder(st /* FDI must be feeding us bits for PCH ports */ assert_fdi_tx_enabled(dev_priv, (enum i915_pipe) cpu_transcoder); - assert_fdi_rx_enabled(dev_priv, TRANSCODER_A); + assert_fdi_rx_enabled(dev_priv, (enum i915_pipe) TRANSCODER_A); /* Workaround: set timing override bit. */ val = I915_READ(TRANS_CHICKEN2(PIPE_A)); @@ -2132,7 +2132,7 @@ static void intel_enable_pipe(struct int assert_sprites_disabled(dev_priv, pipe); if (HAS_PCH_LPT(dev_priv->dev)) - pch_transcoder = TRANSCODER_A; + pch_transcoder = (enum i915_pipe)TRANSCODER_A; else pch_transcoder = pipe; @@ -4307,7 +4307,7 @@ static void lpt_pch_enable(struct drm_cr struct intel_crtc *intel_crtc = to_intel_crtc(crtc); enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; - assert_pch_transcoder_disabled(dev_priv, TRANSCODER_A); + assert_pch_transcoder_disabled(dev_priv, (enum i915_pipe) TRANSCODER_A); lpt_program_iclkip(crtc);
CVS commit: [pgoyette-compat] src/doc
Module Name:src Committed By: pgoyette Date: Mon Sep 24 00:03:53 UTC 2018 Modified Files: src/doc [pgoyette-compat]: TODO.compat-module Log Message: Make a note about clockctl vs NTP To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/TODO.compat-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.compat-module diff -u src/doc/TODO.compat-module:1.1.2.8 src/doc/TODO.compat-module:1.1.2.9 --- src/doc/TODO.compat-module:1.1.2.8 Fri Sep 21 02:53:00 2018 +++ src/doc/TODO.compat-module Mon Sep 24 00:03:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.compat-module,v 1.1.2.8 2018/09/21 02:53:00 pgoyette Exp $ */ +/* $NetBSD: TODO.compat-module,v 1.1.2.9 2018/09/24 00:03:53 pgoyette Exp $ */ DONE @@ -124,3 +124,5 @@ TODO - Not required for branch merge .a compat library, it might be useful to make it work with the .o library. +24. The clockctl module currently assumes that NTP exists. We need to +introduce some hook(s) for this.
CVS commit: [pgoyette-compat] src/sys/modules/clockctl
Module Name:src
Committed By: pgoyette
Date: Mon Sep 24 00:02:50 UTC 2018
Modified Files:
src/sys/modules/clockctl [pgoyette-compat]: Makefile
Log Message:
For clockctl module purposes, assume that NTP is available.
XXX Will revisit this later
To generate a diff of this commit:
cvs rdiff -u -r1.1.20.1 -r1.1.20.2 src/sys/modules/clockctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/clockctl/Makefile
diff -u src/sys/modules/clockctl/Makefile:1.1.20.1 src/sys/modules/clockctl/Makefile:1.1.20.2
--- src/sys/modules/clockctl/Makefile:1.1.20.1 Wed Mar 21 04:48:32 2018
+++ src/sys/modules/clockctl/Makefile Mon Sep 24 00:02:50 2018
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1.20.1 2018/03/21 04:48:32 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.20.2 2018/09/24 00:02:50 pgoyette Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev
+CPPFLAGS+= -DNTP
+
KMOD= clockctl
IOCONF= clockctl.ioconf
SRCS= clockctl.c
CVS commit: [pgoyette-compat] src/sys/dev
Module Name:src
Committed By: pgoyette
Date: Mon Sep 24 00:01:13 UTC 2018
Modified Files:
src/sys/dev [pgoyette-compat]: clockctl.c
Log Message:
Don't compile NTP-related case if NTP is not available.
No HOOK required here since NTP is not modularized.
To generate a diff of this commit:
cvs rdiff -u -r1.35.14.4 -r1.35.14.5 src/sys/dev/clockctl.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/clockctl.c
diff -u src/sys/dev/clockctl.c:1.35.14.4 src/sys/dev/clockctl.c:1.35.14.5
--- src/sys/dev/clockctl.c:1.35.14.4 Tue Sep 18 23:03:54 2018
+++ src/sys/dev/clockctl.c Mon Sep 24 00:01:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.4 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.4 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.5 2018/09/24 00:01:13 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -251,6 +251,7 @@ clockctlioctl(
error = clock_settime1(l->l_proc, args->clock_id, , false);
break;
}
+#ifdef NTP
case CLOCKCTL_NTP_ADJTIME: {
struct clockctl_ntp_adjtime *args = data;
struct timex ntv;
@@ -270,6 +271,7 @@ clockctlioctl(
args->retval = ntp_timestatus();
break;
}
+#endif
default:
error = clockctl_ioctl_50_hook_f_call(dev, cmd, data, flags, l);
if (error == ENOSYS)
CVS commit: src/etc
Module Name:src
Committed By: kre
Date: Sun Sep 23 23:48:33 UTC 2018
Modified Files:
src/etc: security
Log Message:
Convert uses of test (aka '[') to use only posix specified forms,
mostly just on general principle... this resulted in one or two minor
code reformattings to keep 80 char limits - a few needless uses of
quotes ("no" ??) were also removed (sh is not C. strings are strings
without quotes around them...)
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/etc/security
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/security
diff -u src/etc/security:1.122 src/etc/security:1.123
--- src/etc/security:1.122 Sat Jan 6 23:44:06 2018
+++ src/etc/security Sun Sep 23 23:48:33 2018
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: security,v 1.122 2018/01/06 23:44:06 mlelstv Exp $
+# $NetBSD: security,v 1.123 2018/09/23 23:48:33 kre Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@@ -86,27 +86,28 @@ migrate_file()
{
_old=$1
_new=$2
- if [ -z "$_old" -o -z "$_new" ]; then
+ if [ -z "$_old" ] || [ -z "$_new" ]; then
err 3 "USAGE: migrate_file old new"
fi
if [ ! -d "${_new%/*}" ]; then
mkdir -p "${_new%/*}"
fi
- if [ -f "${_old}" -a ! -f "${_new}" ]; then
+ if [ -f "${_old}" ] && ! [ -f "${_new}" ]; then
echo "==> migrating ${_old}"
echo " to ${_new}"
mv "${_old}" "${_new}"
fi
- if [ -f "${_old}.current" -a ! -f "${_new}.current" ]; then
+ if [ -f "${_old}.current" ] && ! [ -f "${_new}.current" ]; then
echo "==> migrating ${_old}.current"
echo " to ${_new}.current"
mv "${_old}.current" "${_new}.current"
- if [ -f "${_old}.current,v" -a ! -f "${_new}.current,v" ]; then
+ if [ -f "${_old}.current,v" ] &&
+ ! [ -f "${_new}.current,v" ]; then
echo "==> migrating ${_old}.current,v"
echo " to ${_new}.current,v"
mv "${_old}.current,v" "${_new}.current,v"
fi
- if [ -f "${_old}.backup" -a ! -f "${_new}.backup" ]; then
+ if [ -f "${_old}.backup" ] && ! [ -f "${_new}.backup" ]; then
echo "==> migrating ${_old}.backup"
echo " to ${_new}.backup"
mv "${_old}.backup" "${_new}.backup"
@@ -124,7 +125,7 @@ backup_and_diff()
{
_file=$1
_printdiff=$2
- if [ -z "$_file" -o -z "$_printdiff" ]; then
+ if [ -z "$_file" ] || [ -z "$_printdiff" ]; then
err 3 "USAGE: backup_and_diff file printdiff"
fi
! checkyesno _printdiff
@@ -398,12 +399,12 @@ end-of-csh
< $TMP1
fi
done > $OUTPUT
- if [ $umaskset = "no" -o -s $OUTPUT ] ; then
+ if [ $umaskset = no ] -o [ -s $OUTPUT ] ; then
printf "\nChecking root csh paths, umask values:\n$list\n\n"
if [ -s $OUTPUT ]; then
cat $OUTPUT
fi
- if [ $umaskset = "no" ] ; then
+ if [ $umaskset = no ] ; then
printf "\tRoot csh startup files do not set the umask.\n"
fi
fi
@@ -443,12 +444,12 @@ end-of-sh
fi
done > $OUTPUT
- if [ $umaskset = "no" -o -s $OUTPUT ] ; then
+ if [ $umaskset = no ] || [ -s $OUTPUT ] ; then
printf "\nChecking root sh paths, umask values:\n$list\n"
if [ -s $OUTPUT ]; then
cat $OUTPUT
fi
- if [ $umaskset = "no" ] ; then
+ if [ $umaskset = no ] ; then
printf "\tRoot sh startup files do not set the umask.\n"
fi
fi
@@ -507,8 +508,10 @@ if checkyesno check_rhosts; then
fi
while read uid homedir; do
- if [ -f ${homedir}/.rhosts -a -r ${homedir}/.rhosts ] && \
- cat -f ${homedir}/.rhosts | egrep '\+' > /dev/null ; then
+ if [ -f ${homedir}/.rhosts ] &&
+ [ -r ${homedir}/.rhosts ] &&
+ cat -f ${homedir}/.rhosts | egrep '\+' > /dev/null
+ then
printf -- "$uid: + in .rhosts file.\n"
fi
done < $MPBYPATH > $OUTPUT
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: kre
Date: Sun Sep 23 23:34:45 UTC 2018
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
Since we need an int paramater, and uio_resid is size_t cast it to int
to avoid warnings from the ever friendly compiler... (check that size if
in range was already made).
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pad/pad.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/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.55 src/sys/dev/pad/pad.c:1.56
--- src/sys/dev/pad/pad.c:1.55 Sun Sep 23 23:30:51 2018
+++ src/sys/dev/pad/pad.c Sun Sep 23 23:34:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.55 2018/09/23 23:30:51 kre Exp $ */
+/* $NetBSD: pad.c,v 1.56 2018/09/23 23:34:45 kre Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.55 2018/09/23 23:30:51 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.56 2018/09/23 23:34:45 kre Exp $");
#include
#include
@@ -387,8 +387,8 @@ pad_read(dev_t dev, struct uio *uio, int
if (sc->sc_bytes_count >= BYTESTOSLEEP)
sc->sc_bytes_count -= BYTESTOSLEEP;
- err = pad_get_block(sc, ,
- uio->uio_residuio_resid : PAD_BLKSIZE);
+ err = pad_get_block(sc, , uio->uio_resid < PAD_BLKSIZE ?
+(int)uio->uio_resid : PAD_BLKSIZE);
if (!err) {
getmicrotime(>sc_last);
sc->sc_bytes_count += pb.pb_len;
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: kre
Date: Sun Sep 23 23:30:51 UTC 2018
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
Open code min() so we don't need to find its prototype ...
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pad/pad.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/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.54 src/sys/dev/pad/pad.c:1.55
--- src/sys/dev/pad/pad.c:1.54 Sun Sep 23 21:18:30 2018
+++ src/sys/dev/pad/pad.c Sun Sep 23 23:30:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.54 2018/09/23 21:18:30 nakayama Exp $ */
+/* $NetBSD: pad.c,v 1.55 2018/09/23 23:30:51 kre Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.54 2018/09/23 21:18:30 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.55 2018/09/23 23:30:51 kre Exp $");
#include
#include
@@ -387,7 +387,8 @@ pad_read(dev_t dev, struct uio *uio, int
if (sc->sc_bytes_count >= BYTESTOSLEEP)
sc->sc_bytes_count -= BYTESTOSLEEP;
- err = pad_get_block(sc, , min(uio->uio_resid, PAD_BLKSIZE));
+ err = pad_get_block(sc, ,
+ uio->uio_residuio_resid : PAD_BLKSIZE);
if (!err) {
getmicrotime(>sc_last);
sc->sc_bytes_count += pb.pb_len;
CVS commit: src/etc
Module Name:src
Committed By: kre
Date: Sun Sep 23 23:16:34 UTC 2018
Modified Files:
src/etc: daily
Log Message:
Convert uses of test (ie: '[') to use only POSIX specified forms,
just on general principle (all but 3 of the changes are in code that
is commented out...)
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/etc/daily
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.92 src/etc/daily:1.93
--- src/etc/daily:1.92 Sat Dec 13 02:53:08 2014
+++ src/etc/daily Sun Sep 23 23:16:34 2018
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.92 2014/12/13 02:53:08 uebayasi Exp $
+# $NetBSD: daily,v 1.93 2018/09/23 23:16:34 kre Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -32,7 +32,7 @@ else
exit 1;
fi
-if [ -z "$MAILTO" -o "$USER" != "root" ]; then
+if [ -z "$MAILTO" ] || [ "$USER" != "root" ]; then
MAILTO=root
fi
@@ -50,14 +50,14 @@ echo "Uptime: $(uptime)"
#
#echo ""
#echo "Removing scratch and junk files:"
-#if [ -d /tmp -a ! -h /tmp ]; then
+#if [ -d /tmp ] && ! [ -h /tmp ]; then
# cd /tmp && {
# find . -type f -atime +3 -exec rm -f -- {} \;
# find . ! -name . -type d -mtime +1 -exec rmdir -- {} \; \
# >/dev/null 2>&1; }
#fi
-#if [ -d /var/tmp -a ! -h /var/tmp ]; then
+#if [ -d /var/tmp ] && ! [ -h /var/tmp ]; then
# cd /var/tmp && {
# find . ! -name . -atime +7 -exec rm -f -- {} \;
# find . ! \( -name . -o -name vi.recover \) -type d \
@@ -66,14 +66,14 @@ echo "Uptime: $(uptime)"
#fi
# Additional junk directory cleanup would go like this:
-#if [ -d /scratch -a ! -h /scratch ]; then
+#if [ -d /scratch ] && ! [ -h /scratch ]; then
# cd /scratch && {
# find . ! -name . -atime +1 -exec rm -f -- {} \;
# find . ! -name . -type d -mtime +1 -exec rmdir -- {} \; \
# >/dev/null 2>&1; }
#fi
-#if [ -d /var/rwho -a ! -h /var/rwho ] ; then
+#if [ -d /var/rwho ] && ! [ -h /var/rwho ] ; then
# cd /var/rwho && {
# find . ! -name . -mtime +7 -exec rm -f -- {} \; ; }
#fi
@@ -174,7 +174,7 @@ if checkyesno check_disks; then
if [ -s /etc/dumpdates ] ; then
dump -W > $TMP2
fi
- if [ -s $TMP -o -s $TMP2 ]; then
+ if [ -s $TMP ] || [ -s $TMP2 ]; then
echo ""
echo "Checking subsystem status:"
echo ""
@@ -307,7 +307,7 @@ if checkyesno run_skeyaudit; then
fi
if checkyesno run_makemandb; then
- if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then
+ if [ -f /etc/man.conf ] && [ -x /usr/sbin/makemandb ]; then
echo ""
echo "Updating man page index:"
(umask 022; nice -n 5 /usr/sbin/makemandb -Q)
CVS commit: src/etc
Module Name:src Committed By: kre Date: Sun Sep 23 23:12:21 UTC 2018 Modified Files: src/etc: weekly Log Message: Convert to POSIX specified usage of test (even though it would probably have never been an issue here, it is trivial..., and one of the two uses that needed changing was (and still is) commented out anyway). To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/etc/weekly Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/weekly diff -u src/etc/weekly:1.31 src/etc/weekly:1.32 --- src/etc/weekly:1.31 Sat Nov 28 14:20:32 2015 +++ src/etc/weekly Sun Sep 23 23:12:21 2018 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: weekly,v 1.31 2015/11/28 14:20:32 darcy Exp $ +# $NetBSD: weekly,v 1.32 2018/09/23 23:12:21 kre Exp $ # from: @(#)weekly 8.2 (Berkeley) 1/2/94 # @@ -44,8 +44,8 @@ TMP=weekly.$$ # see if /usr/src exists and is local # before looking there for checked-out files -#if [ -d /usr/src -a \ -# -n "$(find -f /usr/src ! -fstype local -prune -or -type d -print -prune)" ]; +#if [ -d /usr/src ] && +# [ -n "$(find -f /usr/src ! -fstype local -prune -or -type d -print -prune)" ]; #then # echo "" # echo "Looking for checked out files:" @@ -81,7 +81,7 @@ fi if checkyesno rebuild_mandb; then echo "" - if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then + if [ -f /etc/man.conf ] && [ -x /usr/sbin/makemandb ]; then echo "Rebuilding man page index:" (umask 022; nice -n 5 /usr/sbin/makemandb -f -Q) else
CVS commit: src/etc
Module Name:src
Committed By: kre
Date: Sun Sep 23 23:02:39 UTC 2018
Modified Files:
src/etc: rc.subr
Log Message:
rc.subr can be used in install images (from sysinst) so must use only
POSIX specified test uses (no -a or -o). Also, use printf always,
rather than echo (replace echo as a function using echo with one which
uses printf).
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/etc/rc.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.subr
diff -u src/etc/rc.subr:1.102 src/etc/rc.subr:1.103
--- src/etc/rc.subr:1.102 Wed Apr 11 18:51:22 2018
+++ src/etc/rc.subr Sun Sep 23 23:02:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.102 2018/04/11 18:51:22 christos Exp $
+# $NetBSD: rc.subr,v 1.103 2018/09/23 23:02:39 kre Exp $
#
# Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -85,7 +85,9 @@ checkyesno()
checkyesnox $1
var=$?
- [ $var = 0 -o $var = 1 ] && return $var
+ case "${var}" in
+ ( 0 | 1 ) return $var;;
+ esac
warn "\$${1} is not set properly - see ${rcvar_manpage}."
return 1
}
@@ -209,7 +211,7 @@ check_pidfile()
_pidfile=$1
_procname=$2
_interpreter=$3
- if [ -z "$_pidfile" -o -z "$_procname" ]; then
+ if [ -z "$_pidfile" ] || [ -z "$_procname" ]; then
err 3 'USAGE: check_pidfile pidfile procname [interpreter]'
fi
if [ ! -f $_pidfile ]; then
@@ -523,7 +525,7 @@ run_rc_command()
_procname=${procname:-${command}}
# setup pid check command if not fast
- if [ -z "$rc_fast" -a -n "$_procname" ]; then
+ if [ -z "$rc_fast" ] && [ -n "$_procname" ]; then
if [ -n "$pidfile" ]; then
_pidcmd='rc_pid=$(check_pidfile '"$pidfile $_procname $command_interpreter"')'
else
@@ -561,7 +563,7 @@ run_rc_command()
# and return if that failed or warn
# user and exit when interactive
#
- if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then
+ if [ -n "${rcvar}" ] && [ "$rc_arg" != "rcvar" ]; then
if ! checkyesno ${rcvar}; then
# check whether interactive or not
if [ -n "$_run_rc_script" ]; then
@@ -849,7 +851,7 @@ run_rc_script()
{
_file=$1
_arg=$2
- if [ -z "$_file" -o -z "$_arg" ]; then
+ if [ -z "$_file" ] || [ -z "$_arg" ]; then
err 3 'USAGE: run_rc_script file arg'
fi
@@ -940,7 +942,7 @@ load_rc_config_var()
fi
eval $(eval '(
load_rc_config '$1' >/dev/null;
- if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then
+ if [ -n "${'$2'}" ] || [ "${'$2'-UNSET}" != "UNSET" ]; then
echo '$2'=\'\''${'$2'}\'\'';
fi
)' )
@@ -1039,7 +1041,7 @@ backup_file()
# current backup is not lost
if [ -f $_cur ]; then
# no archive, or current newer than archive
- if [ ! -f $_cur,v -o $_cur -nt $_cur,v ]; then
+ if [ ! -f $_cur,v ] || [ $_cur -nt $_cur,v ]; then
ci -q -f -u -t-"$_msg0" -m"$_msg1" $_cur
rcs -q -kb -U $_cur
co -q -f -u $_cur
@@ -1339,13 +1341,25 @@ dirname()
# will call these functions. To call the real echo and printf
# commands, use "command echo" or "command printf".
#
+# Avoid use of echo altogether as much as possible, printf works better
+#
echo()
{
- command echo "$@"
+ local IFS=' ' NL='\n' # not a literal newline...
+
case "$1" in
- '-n') _flush_rc_output ;;
+ -n) NL=; shift;;
esac
+
+ command printf "%s${NL}" "$*"
+
+ if test -z "${NL}"
+ then
+ _flush_rc_output
+ fi
+ return 0
}
+
printf()
{
command printf "$@"
@@ -1353,6 +1367,7 @@ printf()
*'\n') : ;;
*) _flush_rc_output ;;
esac
+ return 0
}
kat() {
CVS commit: [pgoyette-compat] src/sys/kern
Module Name:src Committed By: pgoyette Date: Sun Sep 23 22:00:58 UTC 2018 Modified Files: src/sys/kern [pgoyette-compat]: compat_stub.c Log Message: Actually allocate/define the kern_proc_32 hook To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/sys/kern/compat_stub.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/compat_stub.c diff -u src/sys/kern/compat_stub.c:1.1.2.23 src/sys/kern/compat_stub.c:1.1.2.24 --- src/sys/kern/compat_stub.c:1.1.2.23 Fri Sep 21 03:42:20 2018 +++ src/sys/kern/compat_stub.c Sun Sep 23 22:00:58 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_stub.c,v 1.1.2.23 2018/09/21 03:42:20 pgoyette Exp $ */ +/* $NetBSD: compat_stub.c,v 1.1.2.24 2018/09/23 22:00:58 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -163,3 +163,8 @@ struct compat_modstat_80_hook_t compat_m * mask for kern_sig_43's killpg (updated by compat_09) */ int kern_sig_43_pgid_mask = ~0; + +/* + * hook for kern_proc_32 + */ +struct kern_proc_32_hook_t kern_proc_32_hook;
CVS commit: [pgoyette-compat] src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 21:47:07 UTC 2018
Modified Files:
src/sys/modules [pgoyette-compat]: Makefile
Log Message:
Restore compat_netbsd32 for amd64, too.
To generate a diff of this commit:
cvs rdiff -u -r1.202.2.38 -r1.202.2.39 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/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.38 src/sys/modules/Makefile:1.202.2.39
--- src/sys/modules/Makefile:1.202.2.38 Sun Sep 23 21:38:08 2018
+++ src/sys/modules/Makefile Sun Sep 23 21:47:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.38 2018/09/23 21:38:08 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.39 2018/09/23 21:47:07 pgoyette Exp $
.include
@@ -287,6 +287,7 @@ SUBDIR+= compat_netbsd32_sysvipc_50
.if ${MACHINE_ARCH} == "x86_64"
SUBDIR+= compat_linux32
+SUBDIR+= compat_netbsd32
SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
SUBDIR+= compat_netbsd32_13 compat_netbsd32_16
SUBDIR+= compat_netbsd32_20 compat_netbsd32_30
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src Committed By: christos Date: Sun Sep 23 21:44:01 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc Log Message: we provide memcmp and rdtsc To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.10 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.9 Wed Mar 7 15:38:39 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Sun Sep 23 17:44:01 2018 @@ -3,6 +3,7 @@ CPUID_SRCS += armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S CPUID = yes CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m +CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ .include "../../crypto.inc"
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 21:43:46 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c
netbsd32_mod.c
Log Message:
Use a .h file to define the xxx_{init,fini} routines, and include
the compat_stub.h header to get the definition of the kern_proc_32
hook.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.13.16.15 -r1.13.16.16 src/sys/compat/netbsd32/netbsd32_mod.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/compat/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.3 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.4
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.3 Sun Sep 23 11:50:03 2018
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Sun Sep 23 21:43:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -100,11 +100,13 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ker
#include
#include
#include
+#include
#include
#include
#include
+#include
static int
copyin_psstrings_32(struct proc *p, struct ps_strings *arginfo)
@@ -141,7 +143,7 @@ MODULE_UNSET_HOOK2(kern_proc_32_hook);
#endif
void
-kern_proc_32_init(void)
+netbsd32_kern_proc_32_init(void)
{
#if !defined(_RUMPSERVER)
@@ -150,7 +152,7 @@ kern_proc_32_init(void)
}
void
-kern_proc_32_fini(void)
+netbsd32_kern_proc_32_fini(void)
{
#if !defined(_RUMPSERVER)
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.16
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 Sun Sep 23 11:29:53 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Sep 23 21:43:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -112,19 +112,19 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi
if (error == 0) {
netbsd32_sysctl_init();
netbsd32_machdep_md_init();
- kern_proc_32_init();
+ netbsd32_kern_proc_32_init();
}
return error;
case MODULE_CMD_FINI:
netbsd32_machdep_md_fini();
netbsd32_sysctl_fini();
- kern_proc_32_fini();
+ netbsd32_kern_proc_32_fini();
error = exec_remove(netbsd32_execsw,
__arraycount(netbsd32_execsw));
if (error) {
- kern_proc_32_init();
+ netbsd32_kern_proc_32_init();
netbsd32_sysctl_init();
netbsd32_machdep_md_init();
}
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: christos
Date: Sun Sep 23 21:43:00 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: curve448.inc
Log Message:
Kill stack protector warnings.
XXX: need to understand why gcc complains; it is not obvious to me.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/curve448.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/curve448.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/curve448.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/curve448.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/curve448.inc:1.1 Sun Sep 23 09:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/curve448.inc Sun Sep 23 17:43:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: curve448.inc,v 1.1 2018/09/23 13:33:04 christos Exp $
+# $NetBSD: curve448.inc,v 1.2 2018/09/23 21:43:00 christos Exp $
#
# SRCS extracted from src/crypto/dist/openssl/crypto/ec/curve448
#
@@ -16,6 +16,9 @@ f_impl.c \
scalar.c
SRCS += ${CURVE448_SRCS}
+COPTS.curve448.c+=-Wno-error=stack-protector
+COPTS.eddsa.c+=-Wno-error=stack-protector
+COPTS.f_generic.c+=-Wno-error=stack-protector
.for cryptosrc in ${CURVE448_SRCS}
CPPFLAGS.${cryptosrc} = -I${CURVE448} -I${CURVE448}/arch_32 ${CURVE448CPPFLAGS}
CVS commit: [pgoyette-compat] src
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 21:38:08 UTC 2018
Modified Files:
src/distrib/sets/lists/modules [pgoyette-compat]: ad.arm ad.mips
md.amd64
src/sys/modules [pgoyette-compat]: Makefile
Log Message:
Reenable the compat_netbsd32 module. It is _NOT_ an all-version monolithic
module (as was compat_netbsd).
To generate a diff of this commit:
cvs rdiff -u -r1.10.12.7 -r1.10.12.8 src/distrib/sets/lists/modules/ad.arm
cvs rdiff -u -r1.10.12.6 -r1.10.12.7 src/distrib/sets/lists/modules/ad.mips
cvs rdiff -u -r1.75.2.9 -r1.75.2.10 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.202.2.37 -r1.202.2.38 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/modules/ad.arm
diff -u src/distrib/sets/lists/modules/ad.arm:1.10.12.7 src/distrib/sets/lists/modules/ad.arm:1.10.12.8
--- src/distrib/sets/lists/modules/ad.arm:1.10.12.7 Sun Sep 23 07:16:41 2018
+++ src/distrib/sets/lists/modules/ad.arm Sun Sep 23 21:38:08 2018
@@ -1,7 +1,7 @@
-# $NetBSD: ad.arm,v 1.10.12.7 2018/09/23 07:16:41 pgoyette Exp $
+# $NetBSD: ad.arm,v 1.10.12.8 2018/09/23 21:38:08 pgoyette Exp $
-./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod
#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.10.12.6 src/distrib/sets/lists/modules/ad.mips:1.10.12.7
--- src/distrib/sets/lists/modules/ad.mips:1.10.12.6 Sat Sep 22 11:41:35 2018
+++ src/distrib/sets/lists/modules/ad.mips Sun Sep 23 21:38:08 2018
@@ -1,6 +1,6 @@
-# $NetBSD: ad.mips,v 1.10.12.6 2018/09/22 11:41:35 pgoyette Exp $
-./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete
+# $NetBSD: ad.mips,v 1.10.12.7 2018/09/23 21:38:08 pgoyette Exp $
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod,arch64,nocompatmodules
./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod,arch64,nocompatmodules
#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod,arch64,nocompatmodules
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.75.2.9 src/distrib/sets/lists/modules/md.amd64:1.75.2.10
--- src/distrib/sets/lists/modules/md.amd64:1.75.2.9 Sun Sep 23 03:50:12 2018
+++ src/distrib/sets/lists/modules/md.amd64 Sun Sep 23 21:38:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.75.2.9 2018/09/23 03:50:12 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.75.2.10 2018/09/23 21:38:08 pgoyette Exp $
#
# NOTE that there are two sets of files here:
# @MODULEDIR@ and amd64-xen
@@ -53,8 +53,8 @@
./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_linux32 base-kernel-modules kmod
./@MODULEDIR@/compat_linux32/compat_linux32.kmod base-kernel-modules kmod
-./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete
-./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete
+./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
+./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod
#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.37 src/sys/modules/Makefile:1.202.2.38
--- src/sys/modules/Makefile:1.202.2.37 Sun Sep 23 04:31:17 2018
+++ src/sys/modules/Makefile Sun Sep 23 21:38:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.37 2018/09/23 04:31:17 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.38 2018/09/23 21:38:08 pgoyette Exp $
.include
@@ -269,6 +269,7 @@ SUBDIR+= wmimsi
.if ${MACHINE_CPU} == "arm" \
|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
+SUBDIR+= compat_netbsd32
SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
SUBDIR+= compat_netbsd32_13 compat_netbsd32_16
SUBDIR+= compat_netbsd32_20 compat_netbsd32_30
CVS commit: src/sys/external/bsd/libnv/dist
Module Name:src
Committed By: rmind
Date: Sun Sep 23 21:35:26 UTC 2018
Modified Files:
src/sys/external/bsd/libnv/dist: nv_kern_netbsd.c
Log Message:
nvlist_copyin: fix the flag handling.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/libnv/dist/nv_kern_netbsd.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/external/bsd/libnv/dist/nv_kern_netbsd.c
diff -u src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.4 src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.5
--- src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.4 Sun Sep 23 19:07:10 2018
+++ src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c Sun Sep 23 21:35:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nv_kern_netbsd.c,v 1.4 2018/09/23 19:07:10 rmind Exp $ */
+/* $NetBSD: nv_kern_netbsd.c,v 1.5 2018/09/23 21:35:26 rmind Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.4 2018/09/23 19:07:10 rmind Exp $");
+__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.5 2018/09/23 21:35:26 rmind Exp $");
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include
@@ -74,9 +74,9 @@ int
nvlist_copyin(const nvlist_ref_t *nref, nvlist_t **nvlp, size_t lim)
{
const size_t len = nref->len;
+ int flags, error;
nvlist_t *nvl;
void *buf;
- int error;
if (len >= lim) {
return E2BIG;
@@ -87,7 +87,8 @@ nvlist_copyin(const nvlist_ref_t *nref,
kmem_free(buf, len);
return error;
}
- nvl = nvlist_unpack(buf, len, nref->flags);
+ flags = nref->flags & (NV_FLAG_IGNORE_CASE | NV_FLAG_NO_UNIQUE);
+ nvl = nvlist_unpack(buf, len, flags);
kmem_free(buf, len);
if (nvl == NULL) {
return EINVAL;
@@ -126,7 +127,7 @@ nvlist_copyout(nvlist_ref_t *nref, const
(vaddr_t)uaddr + len);
goto err;
}
- nref->flags = nvlist_error(nvl);
+ nref->flags = nvlist_flags(nvl);
nref->buf = uaddr;
nref->len = len;
err:
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: nakayama
Date: Sun Sep 23 21:18:30 UTC 2018
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
pad(4) mixer has only 1 channel, so return EINVAL in the case other than 1.
This fixes the following strange output of mixerctl(1):
outputs.master=255,0
inputs.dac=255,0
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pad/pad.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/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.53 src/sys/dev/pad/pad.c:1.54
--- src/sys/dev/pad/pad.c:1.53 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pad/pad.c Sun Sep 23 21:18:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.53 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: pad.c,v 1.54 2018/09/23 21:18:30 nakayama Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,23 +27,18 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.53 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.54 2018/09/23 21:18:30 nakayama Exp $");
#include
#include
#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
#include
@@ -57,17 +52,9 @@ __KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.53
#include
-#define MAXDEVS 128
-#define PADCLONER 254
#define PADUNIT(x) minor(x)
-#define PADFREQ 44100
-#define PADCHAN 2
-#define PADPREC 16
-#define PADENC AUDIO_ENCODING_SLINEAR_LE
-
extern struct cfdriver pad_cd;
-kmutex_t padconfig;
typedef struct pad_block {
uint8_t *pb_ptr;
@@ -112,18 +99,7 @@ static stream_filter_t *pad_swvol_filter
const audio_params_t *, const audio_params_t *);
static void pad_swvol_dtor(stream_filter_t *);
-static int pad_close(struct pad_softc *);
-static int pad_read(struct pad_softc *, off_t *, struct uio *, kauth_cred_t, int);
-
-static int fops_pad_close(struct file *);
-static int fops_pad_read(struct file *, off_t *, struct uio *, kauth_cred_t, int);
-static int pad_write(struct file *, off_t *, struct uio *, kauth_cred_t, int);
-static int pad_ioctl(struct file *, u_long, void *);
-static int pad_kqfilter(struct file *, struct knote *);
-static int pad_poll(struct file *, int);
-static int pad_stat(struct file *, struct stat *);
-static int pad_mmap(struct file *, off_t *, size_t, int, int *, int *,
- struct uvm_object **, int *);
+static bool pad_is_attached; /* Do we have an audio* child? */
static const struct audio_hw_if pad_hw_if = {
.open = pad_audio_open,
@@ -144,8 +120,8 @@ static const struct audio_hw_if pad_hw_i
#define PAD_NFORMATS 1
static const struct audio_format pad_formats[PAD_NFORMATS] = {
- { NULL, AUMODE_PLAY|AUMODE_RECORD, PADENC, PADPREC, PADPREC,
- PADCHAN, AUFMT_STEREO, 1, { PADFREQ } },
+ { NULL, AUMODE_PLAY|AUMODE_RECORD, AUDIO_ENCODING_SLINEAR_LE, 16, 16,
+ 2, AUFMT_STEREO, 1, { 44100 } },
};
extern void padattach(int);
@@ -154,13 +130,13 @@ static int pad_add_block(pad_softc_t *,
static int pad_get_block(pad_softc_t *, pad_block_t *, int);
dev_type_open(pad_open);
-dev_type_close(cdev_pad_close);
-dev_type_read(cdev_pad_read);
+dev_type_close(pad_close);
+dev_type_read(pad_read);
const struct cdevsw pad_cdevsw = {
.d_open = pad_open,
- .d_close = cdev_pad_close,
- .d_read = cdev_pad_read,
+ .d_close = pad_close,
+ .d_read = pad_read,
.d_write = nowrite,
.d_ioctl = noioctl,
.d_stop = nostop,
@@ -172,36 +148,34 @@ const struct cdevsw pad_cdevsw = {
.d_flag = D_OTHER | D_MPSAFE,
};
-const struct fileops pad_fileops = {
- .fo_name = "pad",
- .fo_read = fops_pad_read,
- .fo_write = pad_write,
- .fo_ioctl = pad_ioctl,
- .fo_fcntl = fnullop_fcntl,
- .fo_stat = pad_stat,
- .fo_poll = pad_poll,
- .fo_close = fops_pad_close,
- .fo_mmap = pad_mmap,
- .fo_kqfilter = pad_kqfilter,
- .fo_restart = fnullop_restart
-};
-
CFATTACH_DECL2_NEW(pad, sizeof(pad_softc_t), pad_match, pad_attach, pad_detach,
NULL, NULL, pad_childdet);
void
padattach(int n)
{
- int error;
+ int i, err;
+ cfdata_t cf;
- error = config_cfattach_attach(pad_cd.cd_name, _ca);
- if (error) {
+ aprint_debug("pad: requested %d units\n", n);
+
+ err = config_cfattach_attach(pad_cd.cd_name, _ca);
+ if (err) {
aprint_error("%s: couldn't register cfattach: %d\n",
- pad_cd.cd_name, error);
+ pad_cd.cd_name, err);
config_cfdriver_detach(_cd);
return;
}
- mutex_init(, MUTEX_DEFAULT, IPL_NONE);
+
+ for (i = 0; i < n; i++) {
+ cf = kmem_alloc(sizeof(struct cfdata), KM_SLEEP);
+ cf->cf_name = pad_cd.cd_name;
+ cf->cf_atname = pad_cd.cd_name;
+ cf->cf_unit = i;
+ cf->cf_fstate = FSTATE_STAR;
+
+ (void)config_attach_pseudo(cf);
+ }
return;
}
@@ -244,7 +218,7 @@ pad_get_block(pad_softc_t *sc, pad_block
KASSERT(mutex_owned(>sc_lock));
KASSERT(pb != NULL);
- if (sc->sc_buflen < (uint)blksize)
+ if
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jmcneill
Date: Sun Sep 23 19:32:03 UTC 2018
Modified Files:
src/sys/dev/fdt: fdtbus.c
Log Message:
Support rescan and child detachment
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/fdt/fdtbus.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/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.23 src/sys/dev/fdt/fdtbus.c:1.24
--- src/sys/dev/fdt/fdtbus.c:1.23 Sun Sep 9 21:14:04 2018
+++ src/sys/dev/fdt/fdtbus.c Sun Sep 23 19:32:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.23 2018/09/09 21:14:04 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.24 2018/09/23 19:32:03 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.23 2018/09/09 21:14:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.24 2018/09/23 19:32:03 jmcneill Exp $");
#include
#include
@@ -70,6 +70,9 @@ struct fdt_softc {
static int fdt_match(device_t, cfdata_t, void *);
static void fdt_attach(device_t, device_t, void *);
+static int fdt_rescan(device_t, const char *, const int *);
+static void fdt_childdet(device_t, device_t);
+
static int fdt_scan_submatch(device_t, cfdata_t, const int *, void *);
static void fdt_scan(struct fdt_softc *, int);
static void fdt_add_node(struct fdt_node *);
@@ -78,8 +81,8 @@ static u_int fdt_get_order(int);
static const char * const fdtbus_compatible[] =
{ "simple-bus", "simple-mfd", NULL };
-CFATTACH_DECL_NEW(simplebus, sizeof(struct fdt_softc),
-fdt_match, fdt_attach, NULL, NULL);
+CFATTACH_DECL2_NEW(simplebus, sizeof(struct fdt_softc),
+fdt_match, fdt_attach, NULL, NULL, fdt_rescan, fdt_childdet);
static int
fdt_match(device_t parent, cfdata_t cf, void *aux)
@@ -112,7 +115,6 @@ fdt_attach(device_t parent, device_t sel
const struct fdt_attach_args *faa = aux;
const int phandle = faa->faa_phandle;
const char *descr;
- int pass;
sc->sc_dev = self;
sc->sc_phandle = phandle;
@@ -134,6 +136,15 @@ fdt_attach(device_t parent, device_t sel
return;
/* Scan devices */
+ fdt_rescan(self, NULL, NULL);
+}
+
+static int
+fdt_rescan(device_t self, const char *ifattr, const int *locs)
+{
+ struct fdt_softc *sc = device_private(self);
+ int pass;
+
pass = 0;
fdt_need_rescan = false;
do {
@@ -145,6 +156,20 @@ fdt_attach(device_t parent, device_t sel
pass++;
}
} while (pass <= FDTCF_PASS_DEFAULT);
+
+ return 0;
+}
+
+static void
+fdt_childdet(device_t parent, device_t child)
+{
+ struct fdt_node *node;
+
+ TAILQ_FOREACH(node, _nodes, n_nodes)
+ if (node->n_dev == child) {
+ node->n_dev = NULL;
+ break;
+ }
}
static void
CVS commit: src/sys/external/bsd/libnv/dist
Module Name:src
Committed By: rmind
Date: Sun Sep 23 19:07:10 UTC 2018
Modified Files:
src/sys/external/bsd/libnv/dist: nv_impl.h nv_kern_netbsd.c
Log Message:
libnv: add a wrapper around free(9) since in FreeBSD it can take NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/libnv/dist/nv_impl.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/libnv/dist/nv_kern_netbsd.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/external/bsd/libnv/dist/nv_impl.h
diff -u src/sys/external/bsd/libnv/dist/nv_impl.h:1.4 src/sys/external/bsd/libnv/dist/nv_impl.h:1.5
--- src/sys/external/bsd/libnv/dist/nv_impl.h:1.4 Sat Sep 22 17:13:30 2018
+++ src/sys/external/bsd/libnv/dist/nv_impl.h Sun Sep 23 19:07:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nv_impl.h,v 1.4 2018/09/22 17:13:30 rmind Exp $ */
+/* $NetBSD: nv_impl.h,v 1.5 2018/09/23 19:07:10 rmind Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -65,10 +65,11 @@ extern void *nv_calloc(size_t, size_t);
# endif
# define nv_realloc(buf, size) realloc((buf), (size), M_NVLIST, \
M_WAITOK)
-# define nv_free(buf) free((buf), M_NVLIST)
# ifdef __FreeBSD__
+# define nv_free(buf) free((buf), M_NVLIST)
# define nv_strdup(buf) strdup((buf), M_NVLIST)
# else
+extern void nv_free(void *);
extern char *nv_strdup(const char *);
# endif
# define nv_vasprintf(ptr, ...) vasprintf(ptr, M_NVLIST, __VA_ARGS__)
Index: src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c
diff -u src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.3 src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.4
--- src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.3 Sat Sep 22 17:13:30 2018
+++ src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c Sun Sep 23 19:07:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nv_kern_netbsd.c,v 1.3 2018/09/22 17:13:30 rmind Exp $ */
+/* $NetBSD: nv_kern_netbsd.c,v 1.4 2018/09/23 19:07:10 rmind Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.3 2018/09/22 17:13:30 rmind Exp $");
+__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.4 2018/09/23 19:07:10 rmind Exp $");
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include
@@ -61,6 +61,15 @@ extern void dealloc(void *, unsigned int
#ifndef _STANDALONE
#ifdef _KERNEL
+void
+nv_free(void *buf)
+{
+ if (!buf) {
+ return;
+ }
+ free(buf, M_NVLIST);
+}
+
int
nvlist_copyin(const nvlist_ref_t *nref, nvlist_t **nvlp, size_t lim)
{
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Sep 23 18:04:52 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #1020 - #1029, #1031 - #1035 To generate a diff of this commit: cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.24 src/doc/CHANGES-8.1:1.1.2.25 --- src/doc/CHANGES-8.1:1.1.2.24 Mon Sep 10 17:56:49 2018 +++ src/doc/CHANGES-8.1 Sun Sep 23 18:04:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.24 2018/09/10 17:56:49 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.25 2018/09/23 18:04:52 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -1021,3 +1021,97 @@ sbin/raidctl/rf_configure.h 1.2 Support NAME= syntax for disks and spares. [nakayama, ticket #1019] +usr.bin/printf/printf.c1.46 + + Fix sh builtin printf %b \c state handling. + [kre, ticket #1020] + +sys/dev/hpc/hpckbd.c1.33-1.35 + + Fix hpcmips kernel crash when attaching console. + Fix comment formatting and clarify. + [rin, ticket #1021] + +sys/dev/pci/hdaudio_pci.c 1.9,1.10 + + Use 64 bit dma if available. + [mrg, ticket #1022] + +sys/dev/scsipi/scsipi_verbose.c 1.34 + + Don't print a blank line that ends up in logs and console output. + [mrg, ticket #1023] + +sys/ddb/db_command.c1.157,1.158 +sys/kern/subr_lockdebug.c 1.67 + + Fix rebooting from ddb, avoid lockdebug checks and allow + interrupts to work. + [mrg, ticket #1024] + +sys/kern/kern_drvctl.c1.44 +sys/kern/subr_autoconf.c 1.263 +sys/sys/device.h1.156 +sys/sys/systm.h 1.278 + + - move export for devmon_insert_vec into sys/device.h. + - export root_is_mounted for future USB RB_ASKNAME hack. + - make some things in subr_autoconf.c static + - move device_printf() prototype out from the middle of two sets of + aprint_*() prototypes. + [mrg, ticket #1025] + +sys/arch/x86/include/specialreg.h 1.130 +sys/arch/x86/x86/procfs_machdep.c 1.24 + + - Add cpuid 7 edx L1D_FLUSH bit. + - Add IA32_ARCH_SKIP_L1DFL_VMENTRY bit. + - Add IA32_FLUSH_CMD MSR. + [msaitoh, ticket #1026] + +sys/dev/pci/if_wm.c1.586-1.588 + + - Split txdrop evcnt into pcqdrop and descdrop. + - Simplify evcnt name by removing duplicated "tx" or "rx". + - Reduce the number of DMA segments if they do not fix. + - Reduce the max number of DMA segments + [msaitoh, ticket #1027] + +sys/dev/pci/pci_subr.c1.203 +sys/dev/pci/pcireg.h1.140 + + Add ATS Relaxed Ordering supported bit described in Address Translation + Relaxed Ordering ECN. + [msaitoh, ticket #1028] + +sys/dev/pci/ixgbe/ixgbe.c 1.166 + + - The location of some registers in Denverton were changed. + - Fix sysctl knobs for WOL for some devices. + [msaitoh, ticket #1029] + +sys/kern/kern_synch.c1.317 + + Avoid a long hang (maybe forever) in pserialize. + [bouyer, ticket #1031] + +usr.sbin/sysinst/arch/sgimips/md.c 1.5,1.6 + + Fix bootloader installation on sgimips (PR 53583). + [tsutsui, ticket #1032] + +sys/arch/pmax/pmax/dec_3min.c 1.74 + + Fix hangup after framebuffers are attached on 3MIN (PR 53611). + [tsutsui, ticket #1033] + +sys/arch/xen/xen/xbdback_xenbus.c (apply patch) + + Avoid sleeping with a spin lock held. + [manu, ticket #1034] + +sys/dev/pci/files.pci1.403 + + ixg and ixv depend on mii and mii_phy. + [nakayama, ticket #1035] +
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Sep 23 18:00:53 UTC 2018 Modified Files: src/sys/dev/pci [netbsd-8]: files.pci Log Message: Pull up following revision(s) (requested by nakayama in ticket #1035): sys/dev/pci/files.pci: revision 1.403 ixg and ixv depend on mii and mii_phy. To generate a diff of this commit: cvs rdiff -u -r1.388.4.1 -r1.388.4.2 src/sys/dev/pci/files.pci 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/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.388.4.1 src/sys/dev/pci/files.pci:1.388.4.2 --- src/sys/dev/pci/files.pci:1.388.4.1 Thu Dec 21 19:28:53 2017 +++ src/sys/dev/pci/files.pci Sun Sep 23 18:00:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.388.4.1 2017/12/21 19:28:53 snj Exp $ +# $NetBSD: files.pci,v 1.388.4.2 2018/09/23 18:00:53 martin Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -665,7 +665,7 @@ attach stge at pci file dev/pci/if_stge.c stge # Intel i82598 & i82599 10-Gigabit Ethernet -device ixg: ether, ifnet, arp +device ixg: ether, ifnet, arp, mii, mii_phy attach ixg at pci file dev/pci/ixgbe/ixgbe.c ixg | ixv file dev/pci/ixgbe/ix_txrx.c ixg | ixv @@ -684,7 +684,7 @@ file dev/pci/ixgbe/if_bypass.c ixg | ixv file dev/pci/ixgbe/if_fdir.c ixg | ixv # This appears to be the driver for virtual instances of i82599. -device ixv: ether, ifnet, arp +device ixv: ether, ifnet, arp, mii, mii_phy attach ixv at pci file dev/pci/ixgbe/ixv.c ixv
CVS commit: [netbsd-8] src/sys/arch/xen/xen
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:58:51 UTC 2018
Modified Files:
src/sys/arch/xen/xen [netbsd-8]: xbdback_xenbus.c
Log Message:
Apply patch, requested by manu in ticket #1034:
Avoid sleeping with a spin lock held (solved differently on HEAD).
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.8.1 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.63 src/sys/arch/xen/xen/xbdback_xenbus.c:1.63.8.1
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.63 Mon Dec 26 08:16:28 2016
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Sun Sep 23 17:58:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.63 2016/12/26 08:16:28 skrll Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.63.8.1 2018/09/23 17:58:51 martin Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.63 2016/12/26 08:16:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.63.8.1 2018/09/23 17:58:51 martin Exp $");
#include
#include
@@ -674,15 +674,16 @@ err:
static void
xbdback_disconnect(struct xbdback_instance *xbdi)
{
-
+
+ hypervisor_mask_event(xbdi->xbdi_evtchn);
+ event_remove_handler(xbdi->xbdi_evtchn, xbdback_evthandler,
+ xbdi);
+
mutex_enter(>xbdi_lock);
if (xbdi->xbdi_status == DISCONNECTED) {
mutex_exit(>xbdi_lock);
return;
}
- hypervisor_mask_event(xbdi->xbdi_evtchn);
- event_remove_handler(xbdi->xbdi_evtchn, xbdback_evthandler,
- xbdi);
/* signal thread that we want to disconnect, then wait for it */
xbdi->xbdi_status = DISCONNECTING;
CVS commit: [netbsd-8] src/sys/arch/pmax/pmax
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:51:09 UTC 2018
Modified Files:
src/sys/arch/pmax/pmax [netbsd-8]: dec_3min.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1033):
sys/arch/pmax/pmax/dec_3min.c: revision 1.74
Fix hangup after framebuffers are attached on 3MIN. PR port-pmax/53611
Ok'ed by mrg@. Should be pulled up to netbsd-7 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.22.1 src/sys/arch/pmax/pmax/dec_3min.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/pmax/pmax/dec_3min.c
diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.73 src/sys/arch/pmax/pmax/dec_3min.c:1.73.22.1
--- src/sys/arch/pmax/pmax/dec_3min.c:1.73 Mon Mar 24 19:31:40 2014
+++ src/sys/arch/pmax/pmax/dec_3min.c Sun Sep 23 17:51:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.73 2014/03/24 19:31:40 christos Exp $ */
+/* $NetBSD: dec_3min.c,v 1.73.22.1 2018/09/23 17:51:09 martin Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -70,7 +70,7 @@
#define __INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.73 2014/03/24 19:31:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.73.22.1 2018/09/23 17:51:09 martin Exp $");
#include
#include
@@ -292,12 +292,7 @@ dec_3min_intr_establish(device_t dev, vo
case SYS_DEV_OPT0:
case SYS_DEV_OPT1:
case SYS_DEV_OPT2:
- /* it's an option slot */
- {
- int s = splhigh();
- s |= mask;
- splx(s);
- }
+ /* it's an option slot and handled via MIPS_INT_MASK_[012] */
break;
default:
/* it's a baseboard device going via the IOASIC */
CVS commit: [netbsd-8] src/usr.sbin/sysinst/arch/sgimips
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:49:12 UTC 2018
Modified Files:
src/usr.sbin/sysinst/arch/sgimips [netbsd-8]: md.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1032):
usr.sbin/sysinst/arch/sgimips/md.c: revision 1.5
usr.sbin/sysinst/arch/sgimips/md.c: revision 1.6
PR port-sgimips/53583: fetch kernel name always before using it.
Make the struct utsname local to avoid future similar issues.
Make sure to install a bootloader even on upgrade installation.
-
Fixes another part of port-sgimips/53583.
Should be pulled up (with rev 1.5) to netbsd-7 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/usr.sbin/sysinst/arch/sgimips/md.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.sbin/sysinst/arch/sgimips/md.c
diff -u src/usr.sbin/sysinst/arch/sgimips/md.c:1.3.8.1 src/usr.sbin/sysinst/arch/sgimips/md.c:1.3.8.2
--- src/usr.sbin/sysinst/arch/sgimips/md.c:1.3.8.1 Sun Mar 18 11:21:47 2018
+++ src/usr.sbin/sysinst/arch/sgimips/md.c Sun Sep 23 17:49:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3.8.1 2018/03/18 11:21:47 martin Exp $ */
+/* $NetBSD: md.c,v 1.3.8.2 2018/09/23 17:49:12 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,7 +51,6 @@
#include "msg_defs.h"
#include "menu_defs.h"
-struct utsname instsys;
void
md_init(void)
@@ -61,13 +60,15 @@ md_init(void)
void
md_init_set_status(int flags)
{
+ struct utsname instsys;
+
(void)flags;
/*
* Get the name of the Install Kernel we are running under and
* enable the installation of the corresponding GENERIC kernel.
*/
-uname();
+ uname();
if (strstr(instsys.version, "(INSTALL32_IP3x"))
set_kernel_set(SET_KERNEL_2);
else if (strstr(instsys.version, "(INSTALL32_IP2x"))
@@ -156,7 +157,10 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
-if (strstr(instsys.version, "(INSTALL32_IP3x"))
+ struct utsname instsys;
+ uname();
+
+ if (strstr(instsys.version, "(INSTALL32_IP3x"))
return run_program(RUN_DISPLAY,
"%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot",
pm->diskdev);
@@ -194,9 +198,12 @@ md_post_extract(void)
void
md_cleanup_install(void)
{
+ struct utsname instsys;
+
#ifndef DEBUG
enable_rc_conf();
#endif
+ uname();
if (strstr(instsys.version, "(GENERIC32_IP12"))
run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
@@ -213,7 +220,7 @@ md_pre_update(void)
int
md_update(void)
{
- md_post_newfs();
+ md_post_disklabel();
return 1;
}
CVS commit: [netbsd-8] src/sys/kern
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:46:16 UTC 2018
Modified Files:
src/sys/kern [netbsd-8]: kern_synch.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1031):
sys/kern/kern_synch.c: revision 1.317
In mi_switch(), also call pserialize_switchpoint() if we're not switching
to another lwp, as proposed on
http://mail-index.netbsd.org/tech-kern/2018/07/20/msg023709.html
Without it, on a SMP machine with few processes running (e.g while
running sysinst), pserialize could hang for a long time until all
CPUs got a LWP to run (or, eventually, forever).
Tested on Xen domUs with 4 CPUs, and on a 64-threads AMD machine.
To generate a diff of this commit:
cvs rdiff -u -r1.311.10.1 -r1.311.10.2 src/sys/kern/kern_synch.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/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.311.10.1 src/sys/kern/kern_synch.c:1.311.10.2
--- src/sys/kern/kern_synch.c:1.311.10.1 Mon Feb 26 00:43:23 2018
+++ src/sys/kern/kern_synch.c Sun Sep 23 17:46:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.311.10.1 2018/02/26 00:43:23 snj Exp $ */
+/* $NetBSD: kern_synch.c,v 1.311.10.2 2018/09/23 17:46:16 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.311.10.1 2018/02/26 00:43:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.311.10.2 2018/09/23 17:46:16 martin Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -759,6 +759,7 @@ mi_switch(lwp_t *l)
retval = 1;
} else {
/* Nothing to do - just unlock and return. */
+ pserialize_switchpoint();
mutex_spin_exit(spc->spc_mutex);
lwp_unlock(l);
retval = 0;
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:43:37 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1029):
sys/dev/pci/ixgbe/ixgbe.c: revision 1.166
- Fix a bug that Denverton accessed wrong register in
ixgbe_setup_low_power_mode(). The location of some registers in Denverton
were changed. The GRC register is one of them, so use IXGBE_GRC_BY_MAC(hw)
instead of IXGBE_GRC.
- ixgbe_check_wol_support() tests the capability of WOL, but the sysctl
knobs for WOL were added only for IXGBE_DEV_ID_X550EM_X_10G_T. Add the
knobs when adapter->wol_support is not 0.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.88.2.23 -r1.88.2.24 src/sys/dev/pci/ixgbe/ixgbe.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.23 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.24
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.23 Wed Sep 5 08:42:22 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sun Sep 23 17:43:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.23 2018/09/05 08:42:22 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.24 2018/09/23 17:43:36 martin Exp $ */
/**
@@ -3277,7 +3277,7 @@ ixgbe_add_device_sysctls(struct adapter
aprint_error_dev(dev, "could not create sysctl\n");
/* for WoL-capable devices */
- if (hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T) {
+ if (adapter->wol_support) {
if (sysctl_createv(log, 0, , , CTLFLAG_READWRITE,
CTLTYPE_BOOL, "wol_enable",
SYSCTL_DESCR("Enable/Disable Wake on LAN"),
@@ -3663,8 +3663,8 @@ ixgbe_setup_low_power_mode(struct adapte
IXGBE_WRITE_REG(hw, IXGBE_WUC, 0);
} else {
/* Turn off support for APM wakeup. (Using ACPI instead) */
- IXGBE_WRITE_REG(hw, IXGBE_GRC,
- IXGBE_READ_REG(hw, IXGBE_GRC) & ~(u32)2);
+ IXGBE_WRITE_REG(hw, IXGBE_GRC_BY_MAC(hw),
+ IXGBE_READ_REG(hw, IXGBE_GRC_BY_MAC(hw)) & ~(u32)2);
/*
* Clear Wake Up Status register to prevent any previous wakeup
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:40:38 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: pci_subr.c pcireg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1028):
sys/dev/pci/pci_subr.c: revision 1.203
sys/dev/pci/pcireg.h: revision 1.140
Add ATS Relaxed Ordering supported bit described in Address Translation
Relaxed Ordering ECN.
To generate a diff of this commit:
cvs rdiff -u -r1.183.2.6 -r1.183.2.7 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.130.2.5 -r1.130.2.6 src/sys/dev/pci/pcireg.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/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.183.2.6 src/sys/dev/pci/pci_subr.c:1.183.2.7
--- src/sys/dev/pci/pci_subr.c:1.183.2.6 Thu Jul 26 23:11:59 2018
+++ src/sys/dev/pci/pci_subr.c Sun Sep 23 17:40:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.183.2.6 2018/07/26 23:11:59 snj Exp $ */
+/* $NetBSD: pci_subr.c,v 1.183.2.7 2018/09/23 17:40:37 martin Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.6 2018/07/26 23:11:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.7 2018/09/23 17:40:37 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -3152,6 +3152,7 @@ pci_conf_print_ats_cap(const pcireg_t *r
printf(" Invalidate Queue Depth: %u\n", num);
onoff("Page Aligned Request", reg, PCI_ATS_CAP_PALIGNREQ);
onoff("Global Invalidate", reg, PCI_ATS_CAP_GLOBALINVL);
+ onoff("Relaxed Ordering", reg, PCI_ATS_CAP_RELAXORD);
printf("Control register: 0x%04x\n", ctl);
printf(" Smallest Translation Unit: %u\n",
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.130.2.5 src/sys/dev/pci/pcireg.h:1.130.2.6
--- src/sys/dev/pci/pcireg.h:1.130.2.5 Thu Jul 26 23:11:59 2018
+++ src/sys/dev/pci/pcireg.h Sun Sep 23 17:40:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.130.2.5 2018/07/26 23:11:59 snj Exp $ */
+/* $NetBSD: pcireg.h,v 1.130.2.6 2018/09/23 17:40:37 martin Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -1770,6 +1770,7 @@ struct pci_rom {
#define PCI_ATS_CAP_INVQDEPTH __BITS(4, 0) /* Invalidate Queue Depth */
#define PCI_ATS_CAP_PALIGNREQ __BIT(5) /* Page Aligned Request */
#define PCI_ATS_CAP_GLOBALINVL __BIT(6) /* Global Invalidate Support */
+#define PCI_ATS_CAP_RELAXORD __BIT(7) /* Relaxed Ordering */
#define PCI_ATS_CTL 0x04 /* Control Register */
#define PCI_ATS_CTL_STU __BITS(20, 16) /* Smallest Translation Unit */
#define PCI_ATS_CTL_EN __BIT(31) /* Enable */
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:39:02 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1027):
sys/dev/pci/if_wm.c: revision 1.586
sys/dev/pci/if_wm.c: revision 1.587
sys/dev/pci/if_wm.c: revision 1.588
- Split txdrop evcnt into pcqdrop and descdrop.
- Simplify evcnt name by removing duplicated "tx" or "rx".
- s/tu/underrun/
- Try m_defrag() to reduce the number of DMA segment if bus_dmamap_load_mbuf()
returned EFBIG. When m_defrag() is called, txqNNdefrag event counter is
incremented. If the 2nd try of bus_dmamap_load_mbuf() failed, txqNNtoomanyseg
event counter is incremented.
- Reduce the max number of DMA segments from 256 to 64 (it's the same value
as other BSD's (EM_MAX_SCATTER) and more than before if_wm.c rev. 1.75's
value (40)) because we do m_defrag() now.
Fix comment.
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.22 -r1.508.4.23 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.22 src/sys/dev/pci/if_wm.c:1.508.4.23
--- src/sys/dev/pci/if_wm.c:1.508.4.22 Sat Aug 11 14:47:31 2018
+++ src/sys/dev/pci/if_wm.c Sun Sep 23 17:39:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.22 2018/08/11 14:47:31 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.23 2018/09/23 17:39:02 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.22 2018/08/11 14:47:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.23 2018/09/23 17:39:02 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -197,11 +197,12 @@ static int wm_watchdog_timeout = WM_WATC
* of packets, and we go ahead and manage up to 64 (16 for the i82547)
* of them at a time.
*
- * We allow up to 256 (!) DMA segments per packet. Pathological packet
+ * We allow up to 64 DMA segments per packet. Pathological packet
* chains containing many small mbufs have been observed in zero-copy
- * situations with jumbo frames.
+ * situations with jumbo frames. If a mbuf chain has more than 64 DMA segments,
+ * m_defrag() is called to reduce it.
*/
-#define WM_NTXSEGS 256
+#define WM_NTXSEGS 64
#define WM_IFQUEUELEN 256
#define WM_TXQUEUELEN_MAX 64
#define WM_TXQUEUELEN_MAX_82547 16
@@ -376,23 +377,27 @@ struct wm_txqueue {
uint32_t txq_packets; /* for AIM */
uint32_t txq_bytes; /* for AIM */
#ifdef WM_EVENT_COUNTERS
- WM_Q_EVCNT_DEFINE(txq, txsstall) /* Tx stalled due to no txs */
- WM_Q_EVCNT_DEFINE(txq, txdstall) /* Tx stalled due to no txd */
- WM_Q_EVCNT_DEFINE(txq, txfifo_stall) /* Tx FIFO stalls (82547) */
- WM_Q_EVCNT_DEFINE(txq, txdw) /* Tx descriptor interrupts */
- WM_Q_EVCNT_DEFINE(txq, txqe) /* Tx queue empty interrupts */
- /* XXX not used? */
-
- WM_Q_EVCNT_DEFINE(txq, txipsum) /* IP checksums comp. out-bound */
- WM_Q_EVCNT_DEFINE(txq, txtusum) /* TCP/UDP cksums comp. out-bound */
- WM_Q_EVCNT_DEFINE(txq, txtusum6) /* TCP/UDP v6 cksums comp. out-bound */
- WM_Q_EVCNT_DEFINE(txq, txtso) /* TCP seg offload out-bound (IPv4) */
- WM_Q_EVCNT_DEFINE(txq, txtso6) /* TCP seg offload out-bound (IPv6) */
- WM_Q_EVCNT_DEFINE(txq, txtsopain) /* painful header manip. for TSO */
-
- WM_Q_EVCNT_DEFINE(txq, txdrop) /* Tx packets dropped(too many segs) */
-
- WM_Q_EVCNT_DEFINE(txq, tu) /* Tx underrun */
+ /* TX event counters */
+ WM_Q_EVCNT_DEFINE(txq, txsstall)/* Stalled due to no txs */
+ WM_Q_EVCNT_DEFINE(txq, txdstall)/* Stalled due to no txd */
+ WM_Q_EVCNT_DEFINE(txq, fifo_stall) /* FIFO stalls (82547) */
+ WM_Q_EVCNT_DEFINE(txq, txdw) /* Tx descriptor interrupts */
+ WM_Q_EVCNT_DEFINE(txq, txqe) /* Tx queue empty interrupts */
+ /* XXX not used? */
+
+ WM_Q_EVCNT_DEFINE(txq, ipsum) /* IP checksums comp. */
+ WM_Q_EVCNT_DEFINE(txq, tusum) /* TCP/UDP cksums comp. */
+ WM_Q_EVCNT_DEFINE(txq, tusum6) /* TCP/UDP v6 cksums comp. */
+ WM_Q_EVCNT_DEFINE(txq, tso) /* TCP seg offload (IPv4) */
+ WM_Q_EVCNT_DEFINE(txq, tso6) /* TCP seg offload (IPv6) */
+ WM_Q_EVCNT_DEFINE(txq, tsopain) /* Painful header manip. for TSO */
+ WM_Q_EVCNT_DEFINE(txq, pcqdrop) /* Pkt dropped in pcq */
+ WM_Q_EVCNT_DEFINE(txq, descdrop)/* Pkt dropped in MAC desc ring */
+ /* other than toomanyseg */
+
+ WM_Q_EVCNT_DEFINE(txq, toomanyseg) /* Pkt dropped(toomany DMA segs) */
+ WM_Q_EVCNT_DEFINE(txq, defrag) /* m_defrag() */
+ WM_Q_EVCNT_DEFINE(txq, underrun)/* Tx underrun */
char txq_txseg_evcnt_names[WM_NTXSEGS][sizeof("txqXXtxsegXXX")];
struct evcnt txq_ev_txseg[WM_NTXSEGS]; /* Tx packets w/ N segments */
@@ -433,11 +438,12 @@ struct wm_rxqueue {
uint32_t rxq_packets; /*
CVS commit: [netbsd-8] src/sys/arch/x86
Module Name:src Committed By: martin Date: Sun Sep 23 17:35:33 UTC 2018 Modified Files: src/sys/arch/x86/include [netbsd-8]: specialreg.h src/sys/arch/x86/x86 [netbsd-8]: procfs_machdep.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1026): sys/arch/x86/x86/procfs_machdep.c: revision 1.24 sys/arch/x86/include/specialreg.h: revision 1.130 OK'd by maxv: - Add cpuid 7 edx L1D_FLUSH bit. - Add IA32_ARCH_SKIP_L1DFL_VMENTRY bit. - Add IA32_FLUSH_CMD MSR. To generate a diff of this commit: cvs rdiff -u -r1.98.2.6 -r1.98.2.7 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.15.2.5 -r1.15.2.6 src/sys/arch/x86/x86/procfs_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/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.98.2.6 src/sys/arch/x86/include/specialreg.h:1.98.2.7 --- src/sys/arch/x86/include/specialreg.h:1.98.2.6 Fri Jul 13 15:51:28 2018 +++ src/sys/arch/x86/include/specialreg.h Sun Sep 23 17:35:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.98.2.6 2018/07/13 15:51:28 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.98.2.7 2018/09/23 17:35:33 martin Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -402,13 +402,14 @@ #define CPUID_SEF_AVX512_4FMAPS __BIT(3) #define CPUID_SEF_IBRS __BIT(26) /* IBRS / IBPB Speculation Control */ #define CPUID_SEF_STIBP __BIT(27) /* STIBP Speculation Control */ +#define CPUID_SEF_L1D_FLUSH __BIT(28) /* IA32_FLUSH_CMD MSR */ #define CPUID_SEF_ARCH_CAP __BIT(29) /* IA32_ARCH_CAPABILITIES */ #define CPUID_SEF_SSBD __BIT(31) /* Speculative Store Bypass Disable */ #define CPUID_SEF_FLAGS2 "\20" \ "\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \ "\33" "IBRS" "\34" "STIBP" \ - "\36" "ARCH_CAP" "\40" "SSBD" + "\35" "L1D_FLUSH" "\36" "ARCH_CAP" "\40" "SSBD" /* * CPUID Processor extended state Enumeration Fn000d @@ -661,7 +662,10 @@ #define IA32_ARCH_RDCL_NO 0x01 #define IA32_ARCH_IBRS_ALL 0x02 #define IA32_ARCH_RSBA 0x04 +#define IA32_ARCH_SKIP_L1DFL_VMENTRY 0x08 #define IA32_ARCH_SSB_NO 0x10 +#define MSR_IA32_FLUSH_CMD 0x10b +#define IA32_FLUSH_CMD_L1D_FLUSH 0x01 #define MSR_BBL_CR_ADDR 0x116 /* PII+ only */ #define MSR_BBL_CR_DECC 0x118 /* PII+ only */ #define MSR_BBL_CR_CTL 0x119 /* PII+ only */ Index: src/sys/arch/x86/x86/procfs_machdep.c diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.15.2.5 src/sys/arch/x86/x86/procfs_machdep.c:1.15.2.6 --- src/sys/arch/x86/x86/procfs_machdep.c:1.15.2.5 Sat Jun 9 15:14:49 2018 +++ src/sys/arch/x86/x86/procfs_machdep.c Sun Sep 23 17:35:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_machdep.c,v 1.15.2.5 2018/06/09 15:14:49 martin Exp $ */ +/* $NetBSD: procfs_machdep.c,v 1.15.2.6 2018/09/23 17:35:33 martin Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.15.2.5 2018/06/09 15:14:49 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.15.2.6 2018/09/23 17:35:33 martin Exp $"); #include #include @@ -190,7 +190,8 @@ static const char * const x86_features[] NULL, NULL, "avx512_4vnniw", "avx512_4fmaps", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, "arch_capabilities", NULL, "ssbd"}, + NULL, NULL, NULL, NULL, + "flush_l1d", "arch_capabilities", NULL, "ssbd"}, }; static int procfs_getonecpu(int, struct cpu_info *, char *, size_t *);
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:33:15 UTC 2018
Modified Files:
src/sys/kern [netbsd-8]: kern_drvctl.c subr_autoconf.c
src/sys/sys [netbsd-8]: device.h systm.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1025):
sys/kern/subr_autoconf.c: revision 1.263
sys/kern/kern_drvctl.c: revision 1.44
sys/sys/device.h: revision 1.156
sys/sys/systm.h: revision 1.278
- move export for devmon_insert_vec into sys/device.h.
- export root_is_mounted for future USB RB_ASKNAME hack.
- make some things in subr_autoconf.c static
- move device_printf() prototype out from the middle of two sets of
aprint_*() prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.253 -r1.253.2.1 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.149 -r1.149.10.1 src/sys/sys/device.h
cvs rdiff -u -r1.272 -r1.272.8.1 src/sys/sys/systm.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/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.42 src/sys/kern/kern_drvctl.c:1.42.2.1
--- src/sys/kern/kern_drvctl.c:1.42 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/kern_drvctl.c Sun Sep 23 17:33:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.42 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.42.2.1 2018/09/23 17:33:15 martin Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.42 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.42.2.1 2018/09/23 17:33:15 martin Exp $");
#include
#include
@@ -106,7 +106,6 @@ static const struct fileops drvctl_fileo
#define MAXLOCATORS 100
-extern int (*devmon_insert_vec)(const char *, prop_dictionary_t);
static int (*saved_insert_vec)(const char *, prop_dictionary_t) = NULL;
static int drvctl_command(struct lwp *, struct plistref *, u_long, int);
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.253 src/sys/kern/subr_autoconf.c:1.253.2.1
--- src/sys/kern/subr_autoconf.c:1.253 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/subr_autoconf.c Sun Sep 23 17:33:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.253 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.253.2.1 2018/09/23 17:33:15 martin Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.253 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.253.2.1 2018/09/23 17:33:15 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -192,17 +192,17 @@ struct deferred_config {
TAILQ_HEAD(deferred_config_head, deferred_config);
-struct deferred_config_head deferred_config_queue =
+static struct deferred_config_head deferred_config_queue =
TAILQ_HEAD_INITIALIZER(deferred_config_queue);
-struct deferred_config_head interrupt_config_queue =
+static struct deferred_config_head interrupt_config_queue =
TAILQ_HEAD_INITIALIZER(interrupt_config_queue);
-int interrupt_config_threads = 8;
-struct deferred_config_head mountroot_config_queue =
+static int interrupt_config_threads = 8;
+static struct deferred_config_head mountroot_config_queue =
TAILQ_HEAD_INITIALIZER(mountroot_config_queue);
-int mountroot_config_threads = 2;
+static int mountroot_config_threads = 2;
static lwp_t **mountroot_config_lwpids;
static size_t mountroot_config_lwpids_size;
-static bool root_is_mounted = false;
+bool root_is_mounted = false;
static void config_process_deferred(struct deferred_config_head *, device_t);
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.149 src/sys/sys/device.h:1.149.10.1
--- src/sys/sys/device.h:1.149 Sun Jun 19 09:35:06 2016
+++ src/sys/sys/device.h Sun Sep 23 17:33:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.149 2016/06/19 09:35:06 bouyer Exp $ */
+/* $NetBSD: device.h,v 1.149.10.1 2018/09/23 17:33:15 martin Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -417,6 +417,7 @@ extern int booted_partition; /* the par
extern daddr_t booted_startblk; /* or the start of a wedge */
extern uint64_t booted_nblks; /* and the size of that wedge */
extern char *bootspec; /* and the device/wedge name */
+extern bool root_is_mounted; /* true if root is mounted */
struct vnode *opendisk(device_t);
int getdisksize(struct vnode *, uint64_t *, unsigned int *);
@@ -431,6 +432,7 @@ int config_fini_component(struct cfdrive
void config_init_mi(void);
void drvctl_init(void);
void drvctl_fini(void);
+extern int (*devmon_insert_vec)(const char *, prop_dictionary_t);
int config_cfdriver_attach(struct cfdriver *);
int config_cfdriver_detach(struct cfdriver *);
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.272
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:28:25 UTC 2018
Modified Files:
src/sys/ddb [netbsd-8]: db_command.c
src/sys/kern [netbsd-8]: subr_lockdebug.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1024):
sys/ddb/db_command.c: revision 1.157
sys/ddb/db_command.c: revision 1.158
sys/kern/subr_lockdebug.c: revision 1.67
always call lockdebug_dismiss() from DDB -- there are always some
minimal lockdebug checks in place, even without LOCKDEBUG.
adjust lockdebug_abort() to ignore problems after ld_panic is set
so that there's a chance of this working.
this fixes ddb 'reboot' on softiron od1000.
call spl0() before cpu_reboot(), so that there's a chance that:
- interrupts can work afterwards
- this also means if IO stalls, serial break might work again.
this mimics how reboot(2) ends up calling cpu_reboot().
To generate a diff of this commit:
cvs rdiff -u -r1.148.8.3 -r1.148.8.4 src/sys/ddb/db_command.c
cvs rdiff -u -r1.57.2.2 -r1.57.2.3 src/sys/kern/subr_lockdebug.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.148.8.3 src/sys/ddb/db_command.c:1.148.8.4
--- src/sys/ddb/db_command.c:1.148.8.3 Fri Sep 7 12:34:18 2018
+++ src/sys/ddb/db_command.c Sun Sep 23 17:28:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.148.8.3 2018/09/07 12:34:18 martin Exp $ */
+/* $NetBSD: db_command.c,v 1.148.8.4 2018/09/23 17:28:25 martin 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.148.8.3 2018/09/07 12:34:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.148.8.4 2018/09/23 17:28:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -1352,10 +1352,10 @@ db_reboot_cmd(db_expr_t addr, bool have_
*/
db_recover = 0;
/* Avoid all mutex errors */
-#ifdef LOCKDEBUG
lockdebug_dismiss();
-#endif
panicstr = "reboot forced via kernel debugger";
+ /* Make it possible to break into the debugger again */
+ spl0();
cpu_reboot((int)bootflags, NULL);
#else /* _KERNEL */
db_printf("This command can only be used in-kernel.\n");
Index: src/sys/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.57.2.2 src/sys/kern/subr_lockdebug.c:1.57.2.3
--- src/sys/kern/subr_lockdebug.c:1.57.2.2 Fri Sep 7 12:34:18 2018
+++ src/sys/kern/subr_lockdebug.c Sun Sep 23 17:28:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_lockdebug.c,v 1.57.2.2 2018/09/07 12:34:18 martin Exp $ */
+/* $NetBSD: subr_lockdebug.c,v 1.57.2.3 2018/09/23 17:28:25 martin Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.57.2.2 2018/09/07 12:34:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.57.2.3 2018/09/23 17:28:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1012,20 +1012,21 @@ lockdebug_abort(const char *func, size_t
#endif /* LOCKDEBUG */
/*
- * Complain first on the occurrance only. Otherwise proceeed to
- * panic where we will `rendezvous' with other CPUs if the machine
- * is going down in flames.
+ * Don't make the situation worse if the system is already going
+ * down in flames. Once a panic is triggered, lockdebug state
+ * becomes stale and cannot be trusted.
*/
- if (atomic_inc_uint_nv(_panic) == 1) {
- printf_nolog("%s error: %s,%zu: %s\n\n"
- "lock address : %#018lx\n"
- "current cpu : %18d\n"
- "current lwp : %#018lx\n",
- ops->lo_name, func, line, msg, (long)lock,
- (int)cpu_index(curcpu()), (long)curlwp);
- (*ops->lo_dump)(lock);
- printf_nolog("\n");
- }
+ if (atomic_inc_uint_nv(_panic) > 1)
+ return;
+
+ printf_nolog("%s error: %s,%zu: %s\n\n"
+ "lock address : %#018lx\n"
+ "current cpu : %18d\n"
+ "current lwp : %#018lx\n",
+ ops->lo_name, func, line, msg, (long)lock,
+ (int)cpu_index(curcpu()), (long)curlwp);
+ (*ops->lo_dump)(lock);
+ printf_nolog("\n");
panic("lock error: %s: %s,%zu: %s: lock %p cpu %d lwp %p",
ops->lo_name, func, line, msg, lock, cpu_index(curcpu()), curlwp);
CVS commit: [netbsd-8] src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:24:59 UTC 2018
Modified Files:
src/sys/dev/scsipi [netbsd-8]: scsipi_verbose.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1023):
sys/dev/scsipi/scsipi_verbose.c: revision 1.34
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.33.8.1 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.33.8.1
--- 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 23 17:24:59 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.33.8.1 2018/09/23 17:24:59 martin 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.33.8.1 2018/09/23 17:24:59 martin 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: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:22:52 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: hdaudio_pci.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1022):
sys/dev/pci/hdaudio_pci.c: revision 1.9
sys/dev/pci/hdaudio_pci.c: revision 1.10
use pci_mapreg_type() instead of assuming PCI_MAPREG_TYPE_MEM.
suggested by riastradh@.
fixes hdaudio on thinkpad P51 where the registers are mapped
over 4GB range. probably fixes intel X10-based systems that
map hdaudio high as well, but i was able to work around that
in the BIOS. not so for the P51.
XXX: pullup-7, pullup-8.
use pa_dmat64 if pci_dma64_available().
To generate a diff of this commit:
cvs rdiff -u -r1.7.2.1 -r1.7.2.2 src/sys/dev/pci/hdaudio_pci.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/pci/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio_pci.c:1.7.2.1 src/sys/dev/pci/hdaudio_pci.c:1.7.2.2
--- src/sys/dev/pci/hdaudio_pci.c:1.7.2.1 Mon Jun 5 08:13:05 2017
+++ src/sys/dev/pci/hdaudio_pci.c Sun Sep 23 17:22:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.7.2.1 2017/06/05 08:13:05 snj Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.7.2.2 2018/09/23 17:22:51 martin Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.7.2.1 2017/06/05 08:13:05 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.7.2.2 2018/09/23 17:22:51 martin Exp $");
#include
#include
@@ -107,8 +107,8 @@ hdaudio_pci_attach(device_t parent, devi
struct hdaudio_pci_softc *sc = device_private(self);
struct pci_attach_args *pa = opaque;
const char *intrstr;
- pcireg_t csr;
- int err;
+ pcireg_t csr, maptype;
+ int err, reg;
char intrbuf[PCI_INTRSTR_LEN];
aprint_naive("\n");
@@ -127,7 +127,9 @@ hdaudio_pci_attach(device_t parent, devi
pci_conf_write(sc->sc_pc, sc->sc_tag, PCI_COMMAND_STATUS_REG, csr);
/* Map MMIO registers */
- err = pci_mapreg_map(pa, HDAUDIO_PCI_AZBARL, PCI_MAPREG_TYPE_MEM, 0,
+ reg = HDAUDIO_PCI_AZBARL;
+ maptype = pci_mapreg_type(sc->sc_pc, sc->sc_tag, reg);
+ err = pci_mapreg_map(pa, reg, maptype, 0,
>sc_hdaudio.sc_memt,
>sc_hdaudio.sc_memh,
>sc_hdaudio.sc_membase,
@@ -137,7 +139,10 @@ hdaudio_pci_attach(device_t parent, devi
return;
}
sc->sc_hdaudio.sc_memvalid = true;
- sc->sc_hdaudio.sc_dmat = pa->pa_dmat;
+ if (pci_dma64_available(pa))
+ sc->sc_hdaudio.sc_dmat = pa->pa_dmat64;
+ else
+ sc->sc_hdaudio.sc_dmat = pa->pa_dmat;
/* Map interrupt and establish handler */
if (pci_intr_alloc(pa, >sc_pihp, NULL, 0)) {
CVS commit: [netbsd-8] src/sys/dev/hpc
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:20:08 UTC 2018
Modified Files:
src/sys/dev/hpc [netbsd-8]: hpckbd.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1021):
sys/dev/hpc/hpckbd.c: revision 1.33
sys/dev/hpc/hpckbd.c: revision 1.34
sys/dev/hpc/hpckbd.c: revision 1.35
Apply workaround introduced in r1.31 to hpcmips.
Fix kernel crash when console is attached. Now, my MC/R550 boots multiuser.
Thanks Masahiko Ito for encouraging me to do bisection to find this out.
XXX pullup-8, pullup-7
Fix comment formatting in previous.
Clarify the comment in the "unconst" version of hpckbd_keymap_setup.
Both sh3 (P1) and mips (kseg0) have the kernel directly mapped.
To generate a diff of this commit:
cvs rdiff -u -r1.30.30.2 -r1.30.30.3 src/sys/dev/hpc/hpckbd.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/hpc/hpckbd.c
diff -u src/sys/dev/hpc/hpckbd.c:1.30.30.2 src/sys/dev/hpc/hpckbd.c:1.30.30.3
--- src/sys/dev/hpc/hpckbd.c:1.30.30.2 Wed Aug 9 05:57:32 2017
+++ src/sys/dev/hpc/hpckbd.c Sun Sep 23 17:20:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.30.30.2 2017/08/09 05:57:32 snj Exp $ */
+/* $NetBSD: hpckbd.c,v 1.30.30.3 2018/09/23 17:20:08 martin Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.30.30.2 2017/08/09 05:57:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.30.30.3 2018/09/23 17:20:08 martin Exp $");
#include
#include
@@ -261,10 +261,11 @@ hpckbd_getevent(struct hpckbd_core* hc,
}
-#ifdef hpcsh
+#if defined(hpcsh) || defined(hpcmips)
/*
- * XXX: Use the old wrong code for now as hpcsh attaches console very
- * early and it's convenient to be able to do early DDB on wscons.
+ * XXX: Use the old wrong code for now as hpcsh and hpcmips attach
+ * console very early when malloc(9) is not yet available. It is
+ * convenient to be able to do early DDB on wscons.
*/
void
hpckbd_keymap_setup(struct hpckbd_core *hc,
@@ -278,8 +279,9 @@ hpckbd_keymap_setup(struct hpckbd_core *
* XXX The way this is done is really wrong. The __UNCONST()
* is a hint as to what is wrong. This actually ends up modifying
* initialized data which is marked "const".
- * The reason we get away with it here is that on sh3 kernel
- * is directly mapped.
+ *
+ * The reason we get away with it here is that on sh3 and mips
+ * the kernel is directly mapped.
*/
desc = (struct wscons_keydesc *)__UNCONST(hpckbd_keymapdata.keydesc);
for (i = 0; desc[i].name != 0; i++) {
CVS commit: [netbsd-8] src/usr.bin/printf
Module Name:src
Committed By: martin
Date: Sun Sep 23 17:16:33 UTC 2018
Modified Files:
src/usr.bin/printf [netbsd-8]: printf.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1020):
usr.bin/printf/printf.c: revision 1.46
A truly ancient bug found by Edgar Fuss
When printf is running builtin in a sh, global vars aren't reset to
0 between invocations. This affects "rval" which remembers state
from a previous %b \c and thereafter always exits after the first
format conversion, until we get a conversion that generates an
error (which resets the flag almost by accident)
printf %b abc\\c
abc (no \n)
printf %s%s hello world
hello (no \n, of course, no world ...)
printf %s%s hello world
hello
printf %s%s hello world
hello
printf %d hello
printf: hello: expected numeric value
0 (no \n)
printf %s%s hello world
helloworld (no \n, and we are back!)
This affects both /bin/sh and /bin/csh (and has for a very long time).
XXX pullup -8
To generate a diff of this commit:
cvs rdiff -u -r1.37.8.2 -r1.37.8.3 src/usr.bin/printf/printf.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/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.37.8.2 src/usr.bin/printf/printf.c:1.37.8.3
--- src/usr.bin/printf/printf.c:1.37.8.2 Sat Sep 1 06:28:23 2018
+++ src/usr.bin/printf/printf.c Sun Sep 23 17:16:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.37.8.2 2018/09/01 06:28:23 martin Exp $ */
+/* $NetBSD: printf.c,v 1.37.8.3 2018/09/23 17:16:33 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
-__RCSID("$NetBSD: printf.c,v 1.37.8.2 2018/09/01 06:28:23 martin Exp $");
+__RCSID("$NetBSD: printf.c,v 1.37.8.3 2018/09/23 17:16:33 martin Exp $");
#endif
#endif /* not lint */
@@ -134,6 +134,8 @@ int main(int argc, char *argv[])
(void)setlocale (LC_ALL, "");
#endif
+ rval = 0; /* clear for builtin versions (avoid holdover) */
+
while ((o = getopt(argc, argv, "")) != -1) {
switch (o) {
case '?':
CVS commit: src/sys/arch
Module Name:src Committed By: cherry Date: Sun Sep 23 15:28:49 UTC 2018 Modified Files: src/sys/arch/i386/i386: cpufunc.S machdep.c src/sys/arch/i386/include: segments.h src/sys/arch/x86/x86: idt.c src/sys/arch/xen/x86: xenfunc.c Log Message: Fix for i386, functionality intended in: http://mail-index.netbsd.org/source-changes/2018/09/23/msg099357.html This should fix the build for both GENERIC and XEN3PAE_DOM0 This has not been boot tested on native or xen3pae Notes: pmap_changeprot_local() seems to be x86_64 only. I was a bit surprised by this initially, but I suspect that the table protections are enforced via ring0/ring1 fencing rather than page protections the gdt registration code in i386 is still messy. I will leave it as is for now - to avoid a rabbit hole. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/i386/cpufunc.S cvs rdiff -u -r1.809 -r1.810 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.66 -r1.67 src/sys/arch/i386/include/segments.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/x86/idt.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/xen/x86/xenfunc.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/i386/i386/cpufunc.S diff -u src/sys/arch/i386/i386/cpufunc.S:1.23 src/sys/arch/i386/i386/cpufunc.S:1.24 --- src/sys/arch/i386/i386/cpufunc.S:1.23 Sat Jul 21 16:21:27 2018 +++ src/sys/arch/i386/i386/cpufunc.S Sun Sep 23 15:28:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.23 2018/07/21 16:21:27 maxv Exp $ */ +/* $NetBSD: cpufunc.S,v 1.24 2018/09/23 15:28:48 cherry Exp $ */ /*- * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #include -__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.23 2018/07/21 16:21:27 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.24 2018/09/23 15:28:48 cherry Exp $"); #include "opt_xen.h" @@ -65,11 +65,13 @@ ENTRY(x86_mfence) ret END(x86_mfence) -ENTRY(lidt) +#ifndef XEN + ENTRY(lidt) movl 4(%esp), %eax lidt (%eax) ret END(lidt) +#endif /* XEN */ ENTRY(rcr3) movl %cr3, %eax Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.809 src/sys/arch/i386/i386/machdep.c:1.810 --- src/sys/arch/i386/i386/machdep.c:1.809 Sun Sep 23 00:59:59 2018 +++ src/sys/arch/i386/i386/machdep.c Sun Sep 23 15:28:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.809 2018/09/23 00:59:59 cherry Exp $ */ +/* $NetBSD: machdep.c,v 1.810 2018/09/23 15:28:48 cherry Exp $ */ /* * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009, 2017 @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.809 2018/09/23 00:59:59 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.810 2018/09/23 15:28:48 cherry Exp $"); #include "opt_beep.h" #include "opt_compat_freebsd.h" @@ -1360,19 +1360,20 @@ init386(paddr_t first_avail) default: break; } - set_istgate([x], IDTVEC(exceptions)[x], 0, SDT_SYS386IGT, + set_idtgate([x], IDTVEC(exceptions)[x], 0, SDT_SYS386IGT, sel, GSEL(GCODE_SEL, SEL_KPL)); } /* new-style interrupt gate for syscalls */ idt_vec_reserve(128); - set_istgate([128], (syscall), 0, SDT_SYS386IGT, SEL_UPL, + set_idtgate([128], (syscall), 0, SDT_SYS386IGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL)); +#ifndef XEN setregion(, gdtstore, NGDT * sizeof(gdtstore[0]) - 1); lgdt(); - - cpu_init_idt(); +#endif + lldt(GSEL(GLDT_SEL, SEL_KPL)); cpu_init_idt(); Index: src/sys/arch/i386/include/segments.h diff -u src/sys/arch/i386/include/segments.h:1.66 src/sys/arch/i386/include/segments.h:1.67 --- src/sys/arch/i386/include/segments.h:1.66 Sun Sep 23 07:54:42 2018 +++ src/sys/arch/i386/include/segments.h Sun Sep 23 15:28:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: segments.h,v 1.66 2018/09/23 07:54:42 cherry Exp $ */ +/* $NetBSD: segments.h,v 1.67 2018/09/23 15:28:49 cherry Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -200,7 +200,7 @@ extern idt_descriptor_t *idt; extern union descriptor *gdtstore, *ldtstore; void setgate(struct gate_descriptor *, void *, int, int, int, int); -void set_idtgate(idt_descriptor_t *, void *, int, int, int); +void set_idtgate(idt_descriptor_t *, void *, int, int, int, int); void unset_idtgate(idt_descriptor_t *); void setregion(struct region_descriptor *, void *, size_t); void setsegment(struct segment_descriptor *, const void *, size_t, int, int, Index: src/sys/arch/x86/x86/idt.c diff -u src/sys/arch/x86/x86/idt.c:1.7 src/sys/arch/x86/x86/idt.c:1.8 --- src/sys/arch/x86/x86/idt.c:1.7 Sun Sep 23 00:59:59 2018 +++ src/sys/arch/x86/x86/idt.c Sun Sep 23 15:28:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: idt.c,v 1.7 2018/09/23 00:59:59 cherry Exp $ */ +/* $NetBSD: idt.c,v 1.8 2018/09/23 15:28:49 cherry Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2009 The NetBSD Foundation, Inc. @@ -65,7
CVS commit: src/crypto/external/bsd/openssl/lib
Module Name:src Committed By: christos Date: Sun Sep 23 15:08:41 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/lib: Makefile Log Message: oops forgot to commit (add libcryptotest) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/Makefile diff -u src/crypto/external/bsd/openssl/lib/Makefile:1.4 src/crypto/external/bsd/openssl/lib/Makefile:1.5 --- src/crypto/external/bsd/openssl/lib/Makefile:1.4 Sun May 21 11:28:37 2017 +++ src/crypto/external/bsd/openssl/lib/Makefile Sun Sep 23 11:08:41 2018 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2017/05/21 15:28:37 riastradh Exp $ +# $NetBSD: Makefile,v 1.5 2018/09/23 15:08:41 christos Exp $ .include "bsd.own.mk" # OpenSSL libraries. -SUBDIR= libcrypto libdes +SUBDIR= libcrypto libcryptotest libdes SUBDIR+= .WAIT libssl # depends on libcrypto
CVS commit: src/doc
Module Name:src Committed By: maxv Date: Sun Sep 23 13:48:16 UTC 2018 Modified Files: src/doc: TODO.smpnet Log Message: remove references to isdn To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.24 src/doc/TODO.smpnet:1.25 --- src/doc/TODO.smpnet:1.24 Thu Sep 6 06:46:25 2018 +++ src/doc/TODO.smpnet Sun Sep 23 13:48:16 2018 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.24 2018/09/06 06:46:25 maxv Exp $ +$NetBSD: TODO.smpnet,v 1.25 2018/09/23 13:48:16 maxv Exp $ MP-safe components == @@ -90,7 +90,6 @@ Unprotected ones - Bluetooth (sys/netbt/) - altq(4) - CIFS (sys/netsmb/) - - ISDN (sys/netisbn/) - kttcp(4) - NFS @@ -117,7 +116,6 @@ This is the list of the functions that h - sca_frame_process() @ sys/dev/ic/hd64570.c - rxintr_cleanup() @ sys/dev/pci/if_lmc.c - - ipr_rx_data_rdy() @ sys/netisdn/i4b_ipr.c Ideally we should make the functions run in softint somehow, but we don't have actual devices, no time (or interest/love) to work on the task, so instead we
CVS commit: src/doc
Module Name:src Committed By: maxv Date: Sun Sep 23 13:46:53 UTC 2018 Modified Files: src/doc: CHANGES Log Message: note removal of isdn To generate a diff of this commit: cvs rdiff -u -r1.2442 -r1.2443 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2442 src/doc/CHANGES:1.2443 --- src/doc/CHANGES:1.2442 Thu Sep 20 09:03:36 2018 +++ src/doc/CHANGES Sun Sep 23 13:46:53 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2442 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2443 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -225,3 +225,6 @@ Changes from NetBSD 8.0 to NetBSD 9.0: libnv: Imported from FreeBSD [christos 20180908] rkpmic(4): Add support for Rockchip RK805 Power Management IC. [jmcneill 20180920] + kernel: Remove the ISDN code, including daic(4), iavc(4), isic(4), + ifpci(4), ifritz, iwic(4), and all the ISDN-related + userland tools. [maxv 20180923]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sun Sep 23 13:36:04 UTC 2018 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi Log Message: merge openssl-1.1.1 To generate a diff of this commit: cvs rdiff -u -r1.848 -r1.849 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2230 -r1.2231 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.267 -r1.268 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.208 -r1.209 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1625 -r1.1626 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.794 -r1.795 src/distrib/sets/lists/tests/mi 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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.848 src/distrib/sets/lists/base/shl.mi:1.849 --- src/distrib/sets/lists/base/shl.mi:1.848 Sat Sep 22 08:54:34 2018 +++ src/distrib/sets/lists/base/shl.mi Sun Sep 23 09:36:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.848 2018/09/22 12:54:34 rmind Exp $ +# $NetBSD: shl.mi,v 1.849 2018/09/23 13:36:04 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -25,8 +25,8 @@ ./lib/libcrypto.sobase-crypto-shlib dynamicroot ./lib/libcrypto.so.12base-crypto-shlib dynamicroot,openssl=10 ./lib/libcrypto.so.12.0base-crypto-shlib dynamicroot,openssl=10 -./lib/libcrypto.so.13base-crypto-shlib dynamicroot,openssl=11 -./lib/libcrypto.so.13.0base-crypto-shlib dynamicroot,openssl=11 +./lib/libcrypto.so.14base-crypto-shlib dynamicroot,openssl=11 +./lib/libcrypto.so.14.0base-crypto-shlib dynamicroot,openssl=11 ./lib/libdevmapper.sobase-lvm-shlib dynamicroot,lvm ./lib/libdevmapper.so.1base-lvm-shlib dynamicroot,lvm ./lib/libdevmapper.so.1.0 base-lvm-shlib dynamicroot,lvm @@ -232,8 +232,8 @@ ./usr/lib/libcrypto.sobase-crypto-shlib compatfile ./usr/lib/libcrypto.so.12 base-crypto-shlib compatfile,openssl=10 ./usr/lib/libcrypto.so.12.0 base-crypto-shlib compatfile,openssl=10 -./usr/lib/libcrypto.so.13 base-crypto-shlib compatfile,openssl=11 -./usr/lib/libcrypto.so.13.0 base-crypto-shlib compatfile,openssl=11 +./usr/lib/libcrypto.so.14 base-crypto-shlib compatfile,openssl=11 +./usr/lib/libcrypto.so.14.0 base-crypto-shlib compatfile,openssl=11 ./usr/lib/libcrypto_idea.so.7 base-obsolete compatfile,obsolete ./usr/lib/libcrypto_idea.so.7.0 base-obsolete compatfile,obsolete ./usr/lib/libcrypto_mdc2.so.7 base-obsolete compatfile,obsolete @@ -250,8 +250,8 @@ ./usr/lib/libdes.sobase-crypto-shlib compatfile ./usr/lib/libdes.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libdes.so.12.0base-crypto-shlib compatfile,openssl=10 -./usr/lib/libdes.so.13base-crypto-shlib compatfile,openssl=11 -./usr/lib/libdes.so.13.0base-crypto-shlib compatfile,openssl=11 +./usr/lib/libdes.so.14base-crypto-shlib compatfile,openssl=11 +./usr/lib/libdes.so.14.0base-crypto-shlib compatfile,openssl=11 ./usr/lib/libdevmapper.so base-lvm-shlib compatfile,lvm ./usr/lib/libdevmapper.so.1 base-lvm-shlib compatfile,lvm ./usr/lib/libdevmapper.so.1.0 base-lvm-shlib compatfile,lvm @@ -820,8 +820,8 @@ ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 -./usr/lib/libssl.so.13base-crypto-shlib compatfile,openssl=11 -./usr/lib/libssl.so.13.0 base-crypto-shlib compatfile,openssl=11 +./usr/lib/libssl.so.14base-crypto-shlib compatfile,openssl=11 +./usr/lib/libssl.so.14.0 base-crypto-shlib compatfile,openssl=11 ./usr/lib/libstdc++.sobase-sys-shlib compatfile,gcc,cxx,libstdcxx ./usr/lib/libstdc++.so.8 base-sys-shlib compatfile,gcc,cxx,libstdcxx ./usr/lib/libstdc++.so.8.0 base-sys-shlib compatfile,gcc=5,cxx,libstdcxx Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2230 src/distrib/sets/lists/comp/mi:1.2231 --- src/distrib/sets/lists/comp/mi:1.2230 Sun Sep 23 05:20:57 2018 +++ src/distrib/sets/lists/comp/mi Sun Sep 23 09:36:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2230 2018/09/23 09:20:57 maxv Exp $ +# $NetBSD: mi,v 1.2231 2018/09/23 13:36:04 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -2607,28 +2607,40 @@ ./usr/include/openpgpsdk/version.h comp-obsolete obsolete ./usr/include/openpgpsdk/writer.h comp-obsolete obsolete ./usr/include/openpgpsdk/writer_armoured.h comp-obsolete obsolete -./usr/include/openssl/aes.h comp-c-include -./usr/include/openssl/asn1.h comp-c-include -./usr/include/openssl/asn1_mac.h comp-c-include
CVS commit: src/tests/crypto/libcrypto
Module Name:src
Committed By: christos
Date: Sun Sep 23 13:34:58 UTC 2018
Modified Files:
src/tests/crypto/libcrypto: Makefile Makefile.inc t_ciphers.sh
src/tests/crypto/libcrypto/evp: Makefile
src/tests/crypto/libcrypto/idea: Makefile
src/tests/crypto/libcrypto/mdc2: Makefile
src/tests/crypto/libcrypto/rc5: Makefile
Log Message:
Merge openssl-1.1.1
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/crypto/libcrypto/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/tests/crypto/libcrypto/t_ciphers.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/evp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/idea/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/mdc2/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/rc5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.13 src/tests/crypto/libcrypto/Makefile:1.14
--- src/tests/crypto/libcrypto/Makefile:1.13 Thu Feb 22 09:24:03 2018
+++ src/tests/crypto/libcrypto/Makefile Sun Sep 23 09:34:57 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2018/02/22 14:24:03 martin Exp $
+# $NetBSD: Makefile,v 1.14 2018/09/23 13:34:57 christos Exp $
.include
SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine evp hmac \
- md2 md4 md5 rand rc2 rc4 ripemd rsa sha1 srp threads
+ md2 rc2 rc4 rsa srp threads
SUBDIR+=idea mdc2
SUBDIR+=rc5
Index: src/tests/crypto/libcrypto/Makefile.inc
diff -u src/tests/crypto/libcrypto/Makefile.inc:1.8 src/tests/crypto/libcrypto/Makefile.inc:1.9
--- src/tests/crypto/libcrypto/Makefile.inc:1.8 Thu Feb 8 18:41:26 2018
+++ src/tests/crypto/libcrypto/Makefile.inc Sun Sep 23 09:34:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2018/02/08 23:41:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2018/09/23 13:34:57 christos Exp $
.include
.include "../Makefile.inc"
@@ -25,10 +25,11 @@ CPPFLAGS+= -I${OPENSSLSRC}/crypto/includ
CRYPTODIST= ${NETBSDSRCDIR}/crypto
.include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
.if ${HAVE_OPENSSL} != 10
-.PATH: ${OPENSSLSRC}/test
+.PATH: ${OPENSSLSRC}/test ${OPENSSLSRC}/test/testutil
.else
.PATH: ${OPENSSLSRC}/crypto/${HELPER_DIR}
.endif
+PROGDPLIBS+= cryptotest ${OPENSSLSRC}/../lib/libcryptotest
.include
.include
Index: src/tests/crypto/libcrypto/t_ciphers.sh
diff -u src/tests/crypto/libcrypto/t_ciphers.sh:1.5 src/tests/crypto/libcrypto/t_ciphers.sh:1.6
--- src/tests/crypto/libcrypto/t_ciphers.sh:1.5 Sun May 21 10:20:45 2017
+++ src/tests/crypto/libcrypto/t_ciphers.sh Sun Sep 23 09:34:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_ciphers.sh,v 1.5 2017/05/21 14:20:45 riastradh Exp $
+# $NetBSD: t_ciphers.sh,v 1.6 2018/09/23 13:34:57 christos Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -63,7 +63,9 @@ evp_head()
}
evp_body()
{
- atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $(atf_get_srcdir)/evptests.txt
+ for i in $(atf_get_srcdir)/evp*.txt; do
+ atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $i
+ done
}
atf_test_case rc2
Index: src/tests/crypto/libcrypto/evp/Makefile
diff -u src/tests/crypto/libcrypto/evp/Makefile:1.1 src/tests/crypto/libcrypto/evp/Makefile:1.2
--- src/tests/crypto/libcrypto/evp/Makefile:1.1 Thu Jun 9 01:25:17 2011
+++ src/tests/crypto/libcrypto/evp/Makefile Sun Sep 23 09:34:57 2018
@@ -1,8 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2011/06/09 05:25:17 spz Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/23 13:34:57 christos Exp $
HELPER_NAME= evp_test
HELPER_DIR= evp
-FILES= evptests.txt
+FILES= \
+evpcase.txt \
+evpciph.txt \
+evpdigest.txt \
+evpencod.txt \
+evpkdf.txt \
+evpmac.txt \
+evppbe.txt \
+evppkey.txt \
+evppkey_ecc.txt
.include
+.PATH: ${OPENSSLSRC}/test/recipes/30-test_evp_data
Index: src/tests/crypto/libcrypto/idea/Makefile
diff -u src/tests/crypto/libcrypto/idea/Makefile:1.4 src/tests/crypto/libcrypto/idea/Makefile:1.5
--- src/tests/crypto/libcrypto/idea/Makefile:1.4 Sat Jul 14 00:06:17 2012
+++ src/tests/crypto/libcrypto/idea/Makefile Sun Sep 23 09:34:58 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/07/14 04:06:17 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/09/23 13:34:58 christos Exp $
HELPER_NAME= ideatest
HELPER_DIR= idea
.include
-LDADD= -lcrypto
LDADD+= -Wl,--no-fatal-warnings
Index: src/tests/crypto/libcrypto/mdc2/Makefile
diff -u src/tests/crypto/libcrypto/mdc2/Makefile:1.4 src/tests/crypto/libcrypto/mdc2/Makefile:1.5
--- src/tests/crypto/libcrypto/mdc2/Makefile:1.4 Sat Jul 14 00:06:17 2012
+++ src/tests/crypto/libcrypto/mdc2/Makefile Sun Sep 23 09:34:58 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/07/14 04:06:17 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/09/23 13:34:58 christos Exp $
CVS commit: src/crypto/external/bsd/openssl
Module Name:src Committed By: christos Date: Sun Sep 23 13:33:09 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/bin: Makefile src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README e_os.h src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c openssl.c openssl.cnf req.c s_client.c s_server.c s_time.c speed.c src/crypto/external/bsd/openssl/dist/crypto: LPdir_vms.c LPdir_win.c arm_arch.h armcap.c cryptlib.c cversion.c ex_data.c mem.c ppccap.c sparccpuid.S threads_pthread.c uid.c x86_64cpuid.pl src/crypto/external/bsd/openssl/dist/crypto/aes/asm: aes-x86_64.pl aesni-sha1-x86_64.pl aesni-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/asn1: a_d2i_fp.c a_strex.c a_type.c asn_mime.c tasn_dec.c tasn_enc.c src/crypto/external/bsd/openssl/dist/crypto/bio: b_sock.c bio_lib.c bss_file.c bss_log.c src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lcl.h bn_lib.c bn_mont.c bn_nist.c bn_rand.c src/crypto/external/bsd/openssl/dist/crypto/bn/asm: mips.pl x86_64-gcc.c x86_64-gf2m.pl src/crypto/external/bsd/openssl/dist/crypto/buffer: buffer.c src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c src/crypto/external/bsd/openssl/dist/crypto/comp: c_zlib.c src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c src/crypto/external/bsd/openssl/dist/crypto/des: rand_key.c src/crypto/external/bsd/openssl/dist/crypto/dh: dh_lib.c src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c dsa_lib.c src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c src/crypto/external/bsd/openssl/dist/crypto/ec: ec2_smpl.c ec_ameth.c ec_asn1.c ec_key.c ec_lcl.h ec_lib.c ecp_mont.c ecp_nist.c ecp_smpl.c src/crypto/external/bsd/openssl/dist/crypto/engine: eng_all.c eng_lib.c src/crypto/external/bsd/openssl/dist/crypto/err: openssl.ec src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c evp_enc.c m_sha1.c src/crypto/external/bsd/openssl/dist/crypto/hmac: hmac.c src/crypto/external/bsd/openssl/dist/crypto/idea: i_ecb.c i_skey.c idea_lcl.h src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c src/crypto/external/bsd/openssl/dist/crypto/md5: md5_locl.h src/crypto/external/bsd/openssl/dist/crypto/md5/asm: md5-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c src/crypto/external/bsd/openssl/dist/crypto/objects: o_names.c src/crypto/external/bsd/openssl/dist/crypto/perlasm: x86gas.pl src/crypto/external/bsd/openssl/dist/crypto/pkcs7: pk7_doit.c pk7_lib.c src/crypto/external/bsd/openssl/dist/crypto/rand: rand_egd.c rand_unix.c randfile.c src/crypto/external/bsd/openssl/dist/crypto/rc2: rc2_ecb.c src/crypto/external/bsd/openssl/dist/crypto/rc4/asm: rc4-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/ripemd: rmd_locl.h src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_err.c rsa_gen.c rsa_lib.c rsa_oaep.c rsa_pk1.c src/crypto/external/bsd/openssl/dist/crypto/sha: sha256.c sha_locl.h src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/stack: stack.c src/crypto/external/bsd/openssl/dist/crypto/ui: ui_lib.c ui_openssl.c src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c src/crypto/external/bsd/openssl/dist/crypto/x509v3: v3_addr.c src/crypto/external/bsd/openssl/dist/engines: e_padlock.c src/crypto/external/bsd/openssl/dist/include/internal: refcount.h tsan_assist.h src/crypto/external/bsd/openssl/dist/include/openssl: safestack.h src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c d1_srtp.c s3_cbc.c s3_enc.c s3_lib.c ssl_ciph.c ssl_err.c ssl_lib.c ssl_locl.h ssl_sess.c t1_enc.c t1_lib.c tls_srp.c src/crypto/external/bsd/openssl/dist/test: bftest.c bntest.c casttest.c constant_time_test.c destest.c dhtest.c dsatest.c ecdsatest.c ectest.c enginetest.c evp_extra_test.c evp_test.c exptest.c hmactest.c ideatest.c md2test.c mdc2test.c rc2test.c rc4test.c rc5test.c rsa_test.c srptest.c src/crypto/external/bsd/openssl/dist/test/testutil: driver.c format_output.c stanza.c tap_bio.c tests.c src/crypto/external/bsd/openssl/dist/util: mkdef.pl src/crypto/external/bsd/openssl/include: progs.h src/crypto/external/bsd/openssl/include/internal: dso_conf.h src/crypto/external/bsd/openssl/include/openssl: opensslconf.h src/crypto/external/bsd/openssl/lib/libcrypto: Makefile asn1.inc crypto.inc crypto.map
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 11:57:10 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
Log Message:
The kern_proc_32 hook is defined in non-compat code. Don't redefine.
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.11 -r1.116.2.12 src/sys/compat/netbsd32/netbsd32.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/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.11 src/sys/compat/netbsd32/netbsd32.h:1.116.2.12
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.11 Sun Sep 23 11:23:47 2018
+++ src/sys/compat/netbsd32/netbsd32.h Sun Sep 23 11:57:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.11 2018/09/23 11:23:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.12 2018/09/23 11:57:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1181,13 +1181,6 @@ struct netbsd32_modctl_args;
MODULE_HOOK(compat32_80_modctl_hook,
(struct lwp *, const struct netbsd32_modctl_args *, register_t *));
-/*
- * kern_proc compatability for netbsd32
- */
-struct ps_strings;
-MODULE_HOOK2(kern_proc_32_hook, (struct proc *, struct ps_strings *),
-(char **, size_t, vaddr_t *));
-
/*
* Finally, declare emul_netbsd32 as this is needed in lots of
* places when calling syscall_{,dis}establish()
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 11:50:03 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c
src/sys/kern [pgoyette-compat]: kern_proc.c
Log Message:
Use the proper test: _RUMPKERNEL vs _RUMP_KERNEL
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.209.2.5 -r1.209.2.6 src/sys/kern/kern_proc.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/compat/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.2 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.3
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.2 Sun Sep 23 11:35:39 2018
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Sun Sep 23 11:50:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -71,11 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ker
#include "opt_compat_netbsd32.h"
#endif
-#if defined(__HAVE_COMPAT_NETBSD32) && !defined(COMPAT_NETBSD32) \
-&& !defined(_RUMPKERNEL)
-#define COMPAT_NETBSD32
-#endif
-
#include
#include
#include
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209.2.5 src/sys/kern/kern_proc.c:1.209.2.6
--- src/sys/kern/kern_proc.c:1.209.2.5 Sun Sep 23 11:35:39 2018
+++ src/sys/kern/kern_proc.c Sun Sep 23 11:50:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 pgoyette Exp $ */
+/* $NetBSD: kern_proc.c,v 1.209.2.6 2018/09/23 11:50:03 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.6 2018/09/23 11:50:03 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -1856,7 +1856,7 @@ sysctl_doeproc(SYSCTLFN_ARGS)
/*
* compat_netbsd32 hooks
*/
-#if !defined(_RUMP_KERNEL)
+#if !defined(_RUMPKERNEL)
MODULE_CALL_HOOK_DECL(kern_proc_32_hook, f1,
(struct proc *p, struct ps_strings *s), (p, s), enosys());
MODULE_CALL_HOOK(kern_proc_32_hook, f1,
@@ -1872,7 +1872,7 @@ int
copyin_psstrings(struct proc *p, struct ps_strings *arginfo)
{
-#if !defined(_RUMP_KERNEL)
+#if !defined(_RUMPKERNEL)
if (p->p_flag & PK_32)
return kern_proc_32_hook_f1_call(p, arginfo);
#endif /* !defined(_RUMPKERNEL) */
@@ -2085,7 +2085,7 @@ copy_procargs(struct proc *p, int oid, s
i = 0;
}
-#if !defined(_RUMP_KERNEL)
+#if !defined(_RUMPKERNEL)
if (p->p_flag & PK_32)
(void)kern_proc_32_hook_f2_call(argv, i++, );
else
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 11:35:39 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c
src/sys/kern [pgoyette-compat]: kern_proc.c
Log Message:
This hook doesn't exist for _RUMPSERVER
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.209.2.4 -r1.209.2.5 src/sys/kern/kern_proc.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/compat/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.1 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.2
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.1 Sun Sep 23 11:23:47 2018
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Sun Sep 23 11:35:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.1 2018/09/23 11:23:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.1 2018/09/23 11:23:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.2 2018/09/23 11:35:39 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -139,20 +139,26 @@ get_base32(char **argv, size_t i, vaddr_
return 0;
}
+#if !defined(_RUMPSERVER)
MODULE_SET_HOOK2(kern_proc_32_hook, "kern_proc_32",
copyin_psstrings_32, get_base32);
MODULE_UNSET_HOOK2(kern_proc_32_hook);
+#endif
void
kern_proc_32_init(void)
{
+#if !defined(_RUMPSERVER)
kern_proc_32_hook_set();
+#endif
}
void
kern_proc_32_fini(void)
{
+#if !defined(_RUMPSERVER)
kern_proc_32_hook_unset();
+#endif
}
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209.2.4 src/sys/kern/kern_proc.c:1.209.2.5
--- src/sys/kern/kern_proc.c:1.209.2.4 Sun Sep 23 11:23:47 2018
+++ src/sys/kern/kern_proc.c Sun Sep 23 11:35:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.209.2.4 2018/09/23 11:23:47 pgoyette Exp $ */
+/* $NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.4 2018/09/23 11:23:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.209.2.5 2018/09/23 11:35:39 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -1856,6 +1856,7 @@ sysctl_doeproc(SYSCTLFN_ARGS)
/*
* compat_netbsd32 hooks
*/
+#if !defined(_RUMP_KERNEL)
MODULE_CALL_HOOK_DECL(kern_proc_32_hook, f1,
(struct proc *p, struct ps_strings *s), (p, s), enosys());
MODULE_CALL_HOOK(kern_proc_32_hook, f1,
@@ -1865,13 +1866,16 @@ MODULE_CALL_HOOK_DECL(kern_proc_32_hook,
(char **argv, size_t i, vaddr_t *base), (argv, i, base), enosys());
MODULE_CALL_HOOK(kern_proc_32_hook, f2,
(char **argv, size_t i, vaddr_t *base), (argv, i, base), enosys());
+#endif /* !defined(_RUMPKERNEL) */
int
copyin_psstrings(struct proc *p, struct ps_strings *arginfo)
{
+#if !defined(_RUMP_KERNEL)
if (p->p_flag & PK_32)
return kern_proc_32_hook_f1_call(p, arginfo);
+#endif /* !defined(_RUMPKERNEL) */
return copyin_proc(p, (void *)p->p_psstrp, arginfo, sizeof(*arginfo));
}
@@ -2081,9 +2085,11 @@ copy_procargs(struct proc *p, int oid, s
i = 0;
}
+#if !defined(_RUMP_KERNEL)
if (p->p_flag & PK_32)
(void)kern_proc_32_hook_f2_call(argv, i++, );
else
+#endif /* !defined(_RUMPKERNEL) */
base = (vaddr_t)argv[i++];
loaded -= entry_len;
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 11:29:53 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: The kern_proc_32 hook is in the main kernel, so don't make another one here. To generate a diff of this commit: cvs rdiff -u -r1.13.16.14 -r1.13.16.15 src/sys/compat/netbsd32/netbsd32_mod.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/compat/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.14 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.14 Sun Sep 23 11:23:47 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Sep 23 11:29:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1)) struct compat32_80_modctl_hook_t compat32_80_modctl_hook; -struct kern_proc_32_hook_t kern_proc_32_hook; # define DEPS1 "ksem,coredump,compat_util"
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 11:23:47 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: files.netbsd32 netbsd32.h
netbsd32_mod.c
src/sys/kern [pgoyette-compat]: kern_proc.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Added Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c
netbsd32_kern_proc.h
Log Message:
More work on kern_proc_32
To generate a diff of this commit:
cvs rdiff -u -r1.39.14.4 -r1.39.14.5 src/sys/compat/netbsd32/files.netbsd32
cvs rdiff -u -r1.116.2.10 -r1.116.2.11 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/netbsd32/netbsd32_kern_proc.c \
src/sys/compat/netbsd32/netbsd32_kern_proc.h
cvs rdiff -u -r1.13.16.13 -r1.13.16.14 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.209.2.3 -r1.209.2.4 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.1.2.35 -r1.1.2.36 src/sys/sys/compat_stub.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/compat/netbsd32/files.netbsd32
diff -u src/sys/compat/netbsd32/files.netbsd32:1.39.14.4 src/sys/compat/netbsd32/files.netbsd32:1.39.14.5
--- src/sys/compat/netbsd32/files.netbsd32:1.39.14.4 Wed Sep 12 04:35:22 2018
+++ src/sys/compat/netbsd32/files.netbsd32 Sun Sep 23 11:23:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.39.14.4 2018/09/12 04:35:22 pgoyette Exp $
+# $NetBSD: files.netbsd32,v 1.39.14.5 2018/09/23 11:23:47 pgoyette Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -14,6 +14,7 @@ file compat/netbsd32/netbsd32_netbsd.c c
file compat/netbsd32/netbsd32_event.c compat_netbsd32
file compat/netbsd32/netbsd32_execve.c compat_netbsd32
file compat/netbsd32/netbsd32_fs.c compat_netbsd32
+file compat/netbsd32/netbsd32_kern_proc.c compat_netbsd32
file compat/netbsd32/netbsd32_ioctl.c compat_netbsd32
file compat/netbsd32/netbsd32_ipc.c compat_netbsd32
file compat/netbsd32/netbsd32_lwp.c compat_netbsd32
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.10 src/sys/compat/netbsd32/netbsd32.h:1.116.2.11
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.10 Sun Sep 23 09:16:49 2018
+++ src/sys/compat/netbsd32/netbsd32.h Sun Sep 23 11:23:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.10 2018/09/23 09:16:49 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.11 2018/09/23 11:23:47 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1181,6 +1181,13 @@ struct netbsd32_modctl_args;
MODULE_HOOK(compat32_80_modctl_hook,
(struct lwp *, const struct netbsd32_modctl_args *, register_t *));
+/*
+ * kern_proc compatability for netbsd32
+ */
+struct ps_strings;
+MODULE_HOOK2(kern_proc_32_hook, (struct proc *, struct ps_strings *),
+(char **, size_t, vaddr_t *));
+
/*
* Finally, declare emul_netbsd32 as this is needed in lots of
* places when calling syscall_{,dis}establish()
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.13 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.14
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.13 Tue Sep 18 23:03:54 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Sep 23 11:23:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.13 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.13 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -47,12 +47,14 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include
#include
+#include
#include
#define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
struct compat32_80_modctl_hook_t compat32_80_modctl_hook;
+struct kern_proc_32_hook_t kern_proc_32_hook;
# define DEPS1 "ksem,coredump,compat_util"
@@ -111,16 +113,19 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi
if (error == 0) {
netbsd32_sysctl_init();
netbsd32_machdep_md_init();
+ kern_proc_32_init();
}
return error;
case MODULE_CMD_FINI:
netbsd32_machdep_md_fini();
netbsd32_sysctl_fini();
+ kern_proc_32_fini();
error = exec_remove(netbsd32_execsw,
__arraycount(netbsd32_execsw));
if (error) {
+ kern_proc_32_init();
netbsd32_sysctl_init();
netbsd32_machdep_md_init();
}
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.209.2.3 src/sys/kern/kern_proc.c:1.209.2.4
--- src/sys/kern/kern_proc.c:1.209.2.3 Thu Sep 6 06:56:42 2018
+++ src/sys/kern/kern_proc.c Sun
CVS commit: [pgoyette-compat] src/sys/sys
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 10:41:01 UTC 2018
Modified Files:
src/sys/sys [pgoyette-compat]: module_hook.h
Log Message:
Use restricted namespace identifiers for variables within the code
generated by macro expansion.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/sys/module_hook.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/module_hook.h
diff -u src/sys/sys/module_hook.h:1.1.2.2 src/sys/sys/module_hook.h:1.1.2.3
--- src/sys/sys/module_hook.h:1.1.2.2 Wed Sep 19 06:26:13 2018
+++ src/sys/sys/module_hook.h Sun Sep 23 10:41:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.2 2018/09/19 06:26:13 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.3 2018/09/23 10:41:01 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -169,24 +169,24 @@ int\
hook ## _ ## which ## _call decl\
{\
bool hooked; \
- int error, s; \
+ int __hook_error, __hook_s;\
\
- s = pserialize_read_enter();\
+ __hook_s = pserialize_read_enter(); \
hooked = hook.hooked; \
if (hooked) { \
membar_consumer();\
localcount_acquire(); \
} \
- pserialize_read_exit(s);\
+ pserialize_read_exit(__hook_s);\
\
if (hooked) { \
- error = (*hook.which)args; \
+ __hook_error = (*hook.which)args; \
localcount_release(, , \
); \
} else { \
- error = default;\
+ __hook_error = default;\
} \
- return error; \
+ return __hook_error; \
}
#endif /* _SYS_MODULE_HOOK_H */
CVS commit: src
Module Name:src Committed By: maxv Date: Sun Sep 23 09:21:04 UTC 2018 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/etc: MAKEDEV.tmpl src/etc/etc.aarch64: MAKEDEV.conf src/etc/etc.acorn32: MAKEDEV.conf src/etc/etc.algor: MAKEDEV.conf src/etc/etc.alpha: MAKEDEV.conf src/etc/etc.amd64: MAKEDEV.conf src/etc/etc.amiga: MAKEDEV.conf src/etc/etc.amigappc: MAKEDEV.conf src/etc/etc.arc: MAKEDEV.conf src/etc/etc.atari: MAKEDEV.conf src/etc/etc.bebox: MAKEDEV.conf src/etc/etc.cats: MAKEDEV.conf src/etc/etc.cobalt: MAKEDEV.conf src/etc/etc.epoc32: MAKEDEV.conf src/etc/etc.evbarm: MAKEDEV.conf src/etc/etc.evbmips: MAKEDEV.conf src/etc/etc.evbppc: MAKEDEV.conf src/etc/etc.hpcmips: MAKEDEV.conf src/etc/etc.i386: MAKEDEV.conf src/etc/etc.ia64: MAKEDEV.conf src/etc/etc.iyonix: MAKEDEV.conf src/etc/etc.macppc: MAKEDEV.conf src/etc/etc.mvmeppc: MAKEDEV.conf src/etc/etc.netwinder: MAKEDEV.conf src/etc/etc.ofppc: MAKEDEV.conf src/etc/etc.or1k: MAKEDEV.conf src/etc/etc.prep: MAKEDEV.conf src/etc/etc.rs6000: MAKEDEV.conf src/etc/etc.sbmips: MAKEDEV.conf src/etc/etc.sgimips: MAKEDEV.conf src/etc/etc.sparc: MAKEDEV.conf src/etc/etc.sparc64: MAKEDEV.conf src/etc/etc.x68k: MAKEDEV.conf src/etc/etc.zaurus: MAKEDEV.conf src/etc/mtree: NetBSD.dist.base src/share/man/man4: Makefile src/share/man/man5: rc.conf.5 src/share/man/man7: src.7 src/share/man/man9: ioctl.9 src/sys: Makefile src/sys/arch/aarch64/conf: majors.aarch64 src/sys/arch/acorn32/conf: majors.acorn32 src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: ALL majors.amd64 src/sys/arch/amiga/conf: majors.amiga src/sys/arch/amigappc/conf: majors.amigappc src/sys/arch/arc/conf: majors.arc src/sys/arch/arm/conf: majors.arm32 src/sys/arch/atari/conf: majors.atari src/sys/arch/bebox/conf: majors.bebox src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/epoc32/conf: majors.epoc32 src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: majors.hpcmips src/sys/arch/i386/conf: ALL majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/ibmnws/conf: majors.ibmnws src/sys/arch/mvmeppc/conf: majors.mvmeppc src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/prep/conf: majors.prep src/sys/arch/riscv/conf: majors.riscv src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: majors.sparc64 src/sys/arch/x68k/conf: majors.x68k src/sys/arch/zaurus/conf: majors.zaurus src/sys/conf: files src/sys/dev: DEVNAMES src/sys/net: files.net Removed Files: src/share/man/man4: ippp.4 irip.4 isdn.4 isdnbchan.4 isdncapi.4 isdnctl.4 isdntel.4 isdntrc.4 src/sys/netisdn: Makefile files.i4b i4b_capi.h i4b_capi_l4if.c i4b_capi_llif.c i4b_capi_msgs.c i4b_capi_msgs.h i4b_cause.h i4b_ctl.c i4b_debug.h i4b_global.h i4b_i4bdrv.c i4b_iframe.c i4b_ioctl.h i4b_ipr.c i4b_isdnq931.h i4b_isppp.c i4b_isppp.h i4b_l1l2.h i4b_l2.c i4b_l2.h i4b_l2fsm.c i4b_l2fsm.h i4b_l2if.c i4b_l2timer.c i4b_l3.h i4b_l3fsm.c i4b_l3fsm.h i4b_l3l4.h i4b_l3timer.c i4b_l4.c i4b_l4.h i4b_l4if.c i4b_l4mgmt.c i4b_l4timer.c i4b_lme.c i4b_mbuf.c i4b_mbuf.h i4b_q931.c i4b_q931.h i4b_q932fac.c i4b_q932fac.h i4b_rbch.c i4b_rbch_ioctl.h i4b_sframe.c i4b_tei.c i4b_tel.c i4b_tel_ioctl.h i4b_trace.c i4b_trace.h i4b_uframe.c i4b_util.c Log Message: Remove ISDN from the kernel. It has remained unmaintained for a long time, is of poor quality, and is now an obstacle to MP-ification. It was removed ten years ago from FreeBSD for the same reason. This retires a big user of the mbuf API, and will ease maintenance of the kernel. To generate a diff of this commit: cvs rdiff -u -r1.1189 -r1.1190 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.2229 -r1.2230 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1624 -r1.1625 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.193 -r1.194 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.4 -r1.5 src/etc/etc.aarch64/MAKEDEV.conf cvs rdiff -u -r1.10 -r1.11 src/etc/etc.acorn32/MAKEDEV.conf cvs rdiff -u -r1.5 -r1.6 src/etc/etc.algor/MAKEDEV.conf cvs rdiff -u -r1.11 -r1.12 src/etc/etc.alpha/MAKEDEV.conf cvs rdiff -u -r1.23 -r1.24
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 09:16:25 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_50.c
Log Message:
Be selective about including the NTP syscall ntp_gettime
To generate a diff of this commit:
cvs rdiff -u -r1.32.16.8 -r1.32.16.9 \
src/sys/compat/netbsd32/netbsd32_compat_50.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/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.8 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.9
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.8 Tue Sep 11 23:58:46 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Sun Sep 23 09:16:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.8 2018/09/11 23:58:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.9 2018/09/23 09:16:25 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.8 2018/09/11 23:58:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.9 2018/09/23 09:16:25 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -931,6 +931,7 @@ compat_50_netbsd32_quotactl(struct lwp *
return (compat_50_sys_quotactl(l, , retval));
}
+#ifdef NTP
int
compat_50_netbsd32_ntp_gettime(struct lwp *l,
const struct compat_50_netbsd32_ntp_gettime_args *uap, register_t *retval)
@@ -959,7 +960,7 @@ compat_50_netbsd32_ntp_gettime(struct lw
return (error);
}
-
+#endif
static struct syscall_package compat_netbsd32_50_syscalls[] = {
{ NETBSD32_SYS_compat_50_netbsd32_mknod, 0,
@@ -1018,8 +1019,10 @@ static struct syscall_package compat_net
(sy_call_t *)compat_50_netbsd32_getitimer },
{ NETBSD32_SYS_compat_50_netbsd32_quotactl, 0,
(sy_call_t *)compat_50_netbsd32_quotactl },
+#ifdef NTP
{ NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, 0,
(sy_call_t *)compat_50_netbsd32_ntp_gettime },
+#endif
{ 0, 0, NULL }
};
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 09:16:49 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: White space for readability To generate a diff of this commit: cvs rdiff -u -r1.116.2.9 -r1.116.2.10 src/sys/compat/netbsd32/netbsd32.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/compat/netbsd32/netbsd32.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.9 src/sys/compat/netbsd32/netbsd32.h:1.116.2.10 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.9 Tue Sep 18 23:03:54 2018 +++ src/sys/compat/netbsd32/netbsd32.h Sun Sep 23 09:16:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.9 2018/09/18 23:03:54 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.10 2018/09/23 09:16:49 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -47,6 +47,7 @@ #include #include #include + #include #include #include
CVS commit: src/distrib
Module Name:src Committed By: maxv Date: Sun Sep 23 08:26:01 UTC 2018 Modified Files: src/distrib/sets: comments deps descrs src/distrib/syspkg/sets/base: Makefile src/distrib/syspkg/sets/etc: Makefile src/distrib/syspkg/sets/man: Makefile Removed Files: src/distrib/syspkg/sets/base/base-isdn-bin: COMMENT DESCR Makefile src/distrib/syspkg/sets/etc/etc-isdn-rc: COMMENT DESCR Makefile src/distrib/syspkg/sets/man/man-isdn-catman: COMMENT DESCR Makefile src/distrib/syspkg/sets/man/man-isdn-man: COMMENT DESCR Makefile src/distrib/syspkg/sets/misc/misc-isdn-examples: COMMENT DESCR Makefile Log Message: Remove the isdn sets from syspkg, now that they have no user left. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/comments cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/deps cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/descrs cvs rdiff -u -r1.12 -r1.13 src/distrib/syspkg/sets/base/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/distrib/syspkg/sets/base/base-isdn-bin/COMMENT \ src/distrib/syspkg/sets/base/base-isdn-bin/DESCR cvs rdiff -u -r1.2 -r0 src/distrib/syspkg/sets/base/base-isdn-bin/Makefile cvs rdiff -u -r1.3 -r1.4 src/distrib/syspkg/sets/etc/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/distrib/syspkg/sets/etc/etc-isdn-rc/COMMENT \ src/distrib/syspkg/sets/etc/etc-isdn-rc/DESCR cvs rdiff -u -r1.2 -r0 src/distrib/syspkg/sets/etc/etc-isdn-rc/Makefile cvs rdiff -u -r1.7 -r1.8 src/distrib/syspkg/sets/man/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/distrib/syspkg/sets/man/man-isdn-catman/COMMENT \ src/distrib/syspkg/sets/man/man-isdn-catman/DESCR cvs rdiff -u -r1.2 -r0 src/distrib/syspkg/sets/man/man-isdn-catman/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/distrib/syspkg/sets/man/man-isdn-man/COMMENT \ src/distrib/syspkg/sets/man/man-isdn-man/DESCR cvs rdiff -u -r1.2 -r0 src/distrib/syspkg/sets/man/man-isdn-man/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/distrib/syspkg/sets/misc/misc-isdn-examples/COMMENT \ src/distrib/syspkg/sets/misc/misc-isdn-examples/DESCR cvs rdiff -u -r1.2 -r0 \ src/distrib/syspkg/sets/misc/misc-isdn-examples/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/comments diff -u src/distrib/sets/comments:1.19 src/distrib/sets/comments:1.20 --- src/distrib/sets/comments:1.19 Fri Jun 29 12:34:13 2018 +++ src/distrib/sets/comments Sun Sep 23 08:26:00 2018 @@ -38,8 +38,6 @@ base-i18n-root directories for internati base-i18n-shlib shared library modules for internationalisation support base-ipf-bin IPfilter utilities base-ipf-root directories for IPfilter -base-isdn-bin utilities and daemons for ISDN network connectivity -base-isdn-examples directories for the ISDN example files base-kernel-modules loadable kernel modules base-krb5-bin commands and utilities for the Kerberos V network authentication system base-krb5-examples example configuration files for the Kerberos V network authentication system @@ -260,7 +258,6 @@ etc-extsrc-rc startup scripts for extern etc-games-etc configuration file for games etc-games-scores empty score files for games etc-ipf-rc startup scripts for IP filter -etc-isdn-rc startup script for ISDN (Integrated Services Digital Network) network connectivity utilities etc-krb5-rc startup script for the Kerberos V authentication service etc-libsaslc-etc configuration file for the SASL C library etc-libsaslc-postfix configuration file for postfix SASL @@ -357,8 +354,6 @@ man-hesiod-man manual pages source for t man-info-share required file system structure for GNU texinfo documentation man-ipf-catman formatted manual pages for the IPfilter packet filtering software man-ipf-man manual pages source for the IPfilter packet filtering software -man-isdn-catman formatted manual pages for ISDN (Integrated Services Data Networking) support -man-isdn-man manual pages source for ISDN (Integrated Services Data Networking) support man-krb5-catman formatted manual pages for the Kerberos V network authentication system man-krb5-info the GNU texinfo software man-krb5-man manual pages source for the Kerberos V network authentication system @@ -441,7 +436,6 @@ misc-crypto-examples example configurati misc-dhcpd-examples example configuration files for dhcpd(8) misc-fstab-examples example configuration files for file system tables misc-ipf-examples example configuration files for IPfilter -misc-isdn-examples example configuration files for isdn misc-krb5-examples example configuration files for Kerberos5 misc-libsaslc-examples example configuration files for libsaslc misc-netutil-examples example configuration files for network software Index: src/distrib/sets/deps diff -u src/distrib/sets/deps:1.16 src/distrib/sets/deps:1.17 --- src/distrib/sets/deps:1.16 Fri Jun 29 12:34:13 2018 +++ src/distrib/sets/deps Sun Sep 23 08:26:00 2018
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 08:02:50 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c
Log Message:
Revert previous. Instead, don't put an entry for ntp_gettime in the
syscall package if we don't have NTP.
To generate a diff of this commit:
cvs rdiff -u -r1.31.16.9 -r1.31.16.10 \
src/sys/compat/netbsd32/netbsd32_compat_30.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/compat/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.10
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9 Sun Sep 23 08:01:13 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Sun Sep 23 08:02:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -301,10 +301,10 @@ compat_30_netbsd32_fhopen(struct lwp *l,
return (compat_30_sys_fhopen(l, , retval));
}
+#ifdef NTP
int
compat_30_netbsd32_ntp_gettime(struct lwp *l, const struct compat_30_netbsd32_ntp_gettime_args *uap, register_t *retval)
{
-#ifdef NTP
/* {
syscallarg(netbsd32_ntptimevalp_t) ntvp;
} */
@@ -326,11 +326,8 @@ compat_30_netbsd32_ntp_gettime(struct lw
}
return (error);
-#else
-
- return ENOSYS;
-#endif
}
+#endif
static struct syscall_package compat_netbsd32_30_syscalls[] = {
{ NETBSD32_SYS_compat_30_netbsd32_getdents, 0,
@@ -353,8 +350,10 @@ static struct syscall_package compat_net
(sy_call_t *)compat_30_netbsd32___fhstat30 },
{ NETBSD32_SYS_compat_30_netbsd32_fhopen, 0,
(sy_call_t *)compat_30_netbsd32_fhopen },
+#ifdef NTP
{ NETBSD32_SYS_compat_30_netbsd32_ntp_gettime, 0,
(sy_call_t *)compat_30_netbsd32_ntp_gettime },
+#endif
{ 0, 0, NULL }
};
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 08:01:13 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c
Log Message:
Provide a dummy version of netbsd32_ntp_gettime for systems where NTP
isn't defined.
To generate a diff of this commit:
cvs rdiff -u -r1.31.16.8 -r1.31.16.9 \
src/sys/compat/netbsd32/netbsd32_compat_30.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/compat/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.8 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.8 Tue Sep 11 23:58:46 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Sun Sep 23 08:01:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.8 2018/09/11 23:58:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.8 2018/09/11 23:58:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -301,10 +301,10 @@ compat_30_netbsd32_fhopen(struct lwp *l,
return (compat_30_sys_fhopen(l, , retval));
}
-#ifdef NTP
int
compat_30_netbsd32_ntp_gettime(struct lwp *l, const struct compat_30_netbsd32_ntp_gettime_args *uap, register_t *retval)
{
+#ifdef NTP
/* {
syscallarg(netbsd32_ntptimevalp_t) ntvp;
} */
@@ -326,8 +326,11 @@ compat_30_netbsd32_ntp_gettime(struct lw
}
return (error);
-}
+#else
+
+ return ENOSYS;
#endif
+}
static struct syscall_package compat_netbsd32_30_syscalls[] = {
{ NETBSD32_SYS_compat_30_netbsd32_getdents, 0,
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: cherry Date: Sun Sep 23 07:54:42 UTC 2018 Modified Files: src/sys/arch/i386/include: segments.h Log Message: Summary: Remove older and now conflicting type declaration for global variable 'idt'. This should fix the i386 build failure now. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/i386/include/segments.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/arch/i386/include/segments.h diff -u src/sys/arch/i386/include/segments.h:1.65 src/sys/arch/i386/include/segments.h:1.66 --- src/sys/arch/i386/include/segments.h:1.65 Sun Sep 23 00:59:59 2018 +++ src/sys/arch/i386/include/segments.h Sun Sep 23 07:54:42 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: segments.h,v 1.65 2018/09/23 00:59:59 cherry Exp $ */ +/* $NetBSD: segments.h,v 1.66 2018/09/23 07:54:42 cherry Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -198,7 +198,6 @@ typedef struct gate_descriptor idt_descr #endif /* XEN */ extern idt_descriptor_t *idt; extern union descriptor *gdtstore, *ldtstore; -extern struct gate_descriptor *idt; void setgate(struct gate_descriptor *, void *, int, int, int, int); void set_idtgate(idt_descriptor_t *, void *, int, int, int);
CVS commit: [pgoyette-compat] src/sys/kern
Module Name:src Committed By: pgoyette Date: Sun Sep 23 07:44:13 UTC 2018 Modified Files: src/sys/kern [pgoyette-compat]: kern_rndq.c Log Message: Don't bother to include COMPAT_50 related headers, since all the COMPAT_50 code has been relocated. To generate a diff of this commit: cvs rdiff -u -r1.89.16.2 -r1.89.16.3 src/sys/kern/kern_rndq.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/kern_rndq.c diff -u src/sys/kern/kern_rndq.c:1.89.16.2 src/sys/kern/kern_rndq.c:1.89.16.3 --- src/sys/kern/kern_rndq.c:1.89.16.2 Sat Jul 28 04:38:08 2018 +++ src/sys/kern/kern_rndq.c Sun Sep 23 07:44:13 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_rndq.c,v 1.89.16.2 2018/07/28 04:38:08 pgoyette Exp $ */ +/* $NetBSD: kern_rndq.c,v 1.89.16.3 2018/09/23 07:44:13 pgoyette Exp $ */ /*- * Copyright (c) 1997-2013 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.89.16.2 2018/07/28 04:38:08 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.89.16.3 2018/09/23 07:44:13 pgoyette Exp $"); #include #include @@ -56,10 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rndq.c, #include -#ifdef COMPAT_50 -#include -#endif - #if defined(__HAVE_CPU_RNG) && !defined(_RUMPKERNEL) #include #endif
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Sep 23 07:39:43 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: usb_subr_30.c Log Message: Don't try to include usb_verbose.h - it might not exist on platforms that don't have USB! It turns out that nothing uses it any. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/usb_subr_30.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/compat/common/usb_subr_30.c diff -u src/sys/compat/common/usb_subr_30.c:1.1.2.3 src/sys/compat/common/usb_subr_30.c:1.1.2.4 --- src/sys/compat/common/usb_subr_30.c:1.1.2.3 Tue Sep 18 23:03:54 2018 +++ src/sys/compat/common/usb_subr_30.c Sun Sep 23 07:39:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $ */ +/* $NetBSD: usb_subr_30.c,v 1.1.2.4 2018/09/23 07:39:43 pgoyette Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -32,12 +32,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.4 2018/09/23 07:39:43 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" #include "opt_usb.h" -#include "opt_usbverbose.h" #endif #include
CVS commit: [pgoyette-compat] src/sys/dev/usb
Module Name:src Committed By: pgoyette Date: Sun Sep 23 07:37:14 UTC 2018 Modified Files: src/sys/dev/usb [pgoyette-compat]: files.usb Log Message: Revert previous - not appropriate To generate a diff of this commit: cvs rdiff -u -r1.150.2.2 -r1.150.2.3 src/sys/dev/usb/files.usb 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/files.usb diff -u src/sys/dev/usb/files.usb:1.150.2.2 src/sys/dev/usb/files.usb:1.150.2.3 --- src/sys/dev/usb/files.usb:1.150.2.2 Sun Sep 23 07:27:34 2018 +++ src/sys/dev/usb/files.usb Sun Sep 23 07:37:14 2018 @@ -1,10 +1,10 @@ -# $NetBSD: files.usb,v 1.150.2.2 2018/09/23 07:27:34 pgoyette Exp $ +# $NetBSD: files.usb,v 1.150.2.3 2018/09/23 07:37:14 pgoyette Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide # their own "major" declarations for the appropriate devices. -defflag opt_usbverbose.h USBVERBOSE +defflag USBVERBOSE defflag opt_usb.h USB_FRAG_DMA_WORKAROUND # HC controllers
CVS commit: [pgoyette-compat] src/sys/dev/usb
Module Name:src Committed By: pgoyette Date: Sun Sep 23 07:27:34 UTC 2018 Modified Files: src/sys/dev/usb [pgoyette-compat]: files.usb Log Message: Put the USBVERBOSE option into a header file so it can be found by modules. To generate a diff of this commit: cvs rdiff -u -r1.150.2.1 -r1.150.2.2 src/sys/dev/usb/files.usb 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/files.usb diff -u src/sys/dev/usb/files.usb:1.150.2.1 src/sys/dev/usb/files.usb:1.150.2.2 --- src/sys/dev/usb/files.usb:1.150.2.1 Thu Sep 6 06:56:04 2018 +++ src/sys/dev/usb/files.usb Sun Sep 23 07:27:34 2018 @@ -1,10 +1,10 @@ -# $NetBSD: files.usb,v 1.150.2.1 2018/09/06 06:56:04 pgoyette Exp $ +# $NetBSD: files.usb,v 1.150.2.2 2018/09/23 07:27:34 pgoyette Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide # their own "major" declarations for the appropriate devices. -defflag USBVERBOSE +defflag opt_usbverbose.h USBVERBOSE defflag opt_usb.h USB_FRAG_DMA_WORKAROUND # HC controllers
CVS commit: src
Module Name:src Committed By: maxv Date: Sun Sep 23 07:24:21 UTC 2018 Modified Files: src/distrib/sets/lists/base: mi rescue.mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/etc: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/misc: mi src/etc/defaults: rc.conf src/etc/mtree: NetBSD.dist.base special src/etc/rc.d: Makefile ipfs racoon src/rescue: list src/sbin/pppoectl: Makefile pppoectl.8 src/share/examples: Makefile src/share/man/man5: rc.conf.5 src/usr.sbin: Makefile src/usr.sbin/ifwatchd: ifwatchd.8 src/usr.sbin/postinstall: postinstall Removed Files: src/etc/rc.d: isdnd src/share/examples/isdn: Makefile holidays.D.SH isdnd.rates.A isdnd.rates.D isdnd.rates.F isdnd.rates.L isdnd.rates.UK.BT isdnd.rc.sample src/usr.sbin/isdn: Makefile Makefile.inc src/usr.sbin/isdn/dtmfdecode: Makefile dtmfdecode.1 dtmfdecode.c dtmfsounds.al.uue src/usr.sbin/isdn/isdnd: Makefile alias.c config.h controller.c curses.c dial.c exec.c fsm.c holiday.c isdnd.8 isdnd.acct.5 isdnd.h isdnd.rates.5 isdnd.rc.5 log.c main.c monitor.c msghdl.c pathnames.h pcause.c process.c rates.c rc_config.c rc_parse.y rc_scan.l support.c timer.c src/usr.sbin/isdn/isdnmonitor: Makefile Makefile.hpux curses.c isdnmonitor.8 main.c monitor.h monprivate.h src/usr.sbin/isdn/isdntel: Makefile alias.c alias.h defs.h display.c files.c isdntel.8 main.c src/usr.sbin/isdn/isdntelctl: Makefile isdntelctl.8 main.c src/usr.sbin/isdn/isdntrace: 1tr6.c Makefile cable.txt isdntrace.8 pcause_1tr6.c pcause_1tr6.h pcause_q850.c pcause_q850.h q921.c q931.c q931_util.c q932_fac.c q932_fac.h trace.c trace.h unknownl3.c Log Message: Remove the userland part of ISDN. The kernel part is untouched for now. ipppctl was actually an exact copy of pppoectl; there is no functional change in pppoectl in this commit. To generate a diff of this commit: cvs rdiff -u -r1.1188 -r1.1189 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/rescue.mi cvs rdiff -u -r1.266 -r1.267 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.252 -r1.253 src/distrib/sets/lists/etc/mi cvs rdiff -u -r1.1623 -r1.1624 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.144 -r1.145 src/etc/defaults/rc.conf cvs rdiff -u -r1.175 -r1.176 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.163 -r1.164 src/etc/mtree/special cvs rdiff -u -r1.98 -r1.99 src/etc/rc.d/Makefile cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/ipfs cvs rdiff -u -r1.10 -r0 src/etc/rc.d/isdnd cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/racoon cvs rdiff -u -r1.50 -r1.51 src/rescue/list cvs rdiff -u -r1.3 -r1.4 src/sbin/pppoectl/Makefile cvs rdiff -u -r1.30 -r1.31 src/sbin/pppoectl/pppoectl.8 cvs rdiff -u -r1.22 -r1.23 src/share/examples/Makefile cvs rdiff -u -r1.3 -r0 src/share/examples/isdn/Makefile \ src/share/examples/isdn/holidays.D.SH \ src/share/examples/isdn/isdnd.rates.A cvs rdiff -u -r1.2 -r0 src/share/examples/isdn/isdnd.rates.D \ src/share/examples/isdn/isdnd.rates.F \ src/share/examples/isdn/isdnd.rates.L \ src/share/examples/isdn/isdnd.rates.UK.BT cvs rdiff -u -r1.6 -r0 src/share/examples/isdn/isdnd.rc.sample cvs rdiff -u -r1.172 -r1.173 src/share/man/man5/rc.conf.5 cvs rdiff -u -r1.278 -r1.279 src/usr.sbin/Makefile cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/ifwatchd/ifwatchd.8 cvs rdiff -u -r1.4 -r0 src/usr.sbin/isdn/Makefile cvs rdiff -u -r1.2 -r0 src/usr.sbin/isdn/Makefile.inc cvs rdiff -u -r1.3 -r0 src/usr.sbin/isdn/dtmfdecode/Makefile \ src/usr.sbin/isdn/dtmfdecode/dtmfdecode.c cvs rdiff -u -r1.8 -r0 src/usr.sbin/isdn/dtmfdecode/dtmfdecode.1 cvs rdiff -u -r1.1 -r0 src/usr.sbin/isdn/dtmfdecode/dtmfsounds.al.uue cvs rdiff -u -r1.12 -r0 src/usr.sbin/isdn/isdnd/Makefile \ src/usr.sbin/isdn/isdnd/exec.c src/usr.sbin/isdn/isdnd/msghdl.c cvs rdiff -u -r1.5 -r0 src/usr.sbin/isdn/isdnd/alias.c \ src/usr.sbin/isdn/isdnd/dial.c src/usr.sbin/isdn/isdnd/pcause.c \ src/usr.sbin/isdn/isdnd/timer.c cvs rdiff -u -r1.2 -r0 src/usr.sbin/isdn/isdnd/config.h \ src/usr.sbin/isdn/isdnd/pathnames.h cvs rdiff -u -r1.10 -r0 src/usr.sbin/isdn/isdnd/controller.c \ src/usr.sbin/isdn/isdnd/curses.c src/usr.sbin/isdn/isdnd/log.c cvs rdiff -u -r1.8 -r0 src/usr.sbin/isdn/isdnd/fsm.c cvs rdiff -u -r1.4 -r0 src/usr.sbin/isdn/isdnd/holiday.c \ src/usr.sbin/isdn/isdnd/process.c cvs rdiff -u -r1.16 -r0 src/usr.sbin/isdn/isdnd/isdnd.8 \ src/usr.sbin/isdn/isdnd/monitor.c src/usr.sbin/isdn/isdnd/support.c cvs rdiff -u -r1.6 -r0 src/usr.sbin/isdn/isdnd/isdnd.acct.5 \ src/usr.sbin/isdn/isdnd/isdnd.rates.5 cvs rdiff -u -r1.19 -r0 src/usr.sbin/isdn/isdnd/isdnd.h cvs rdiff -u
CVS commit: [pgoyette-compat] src/distrib/sets/lists/modules
Module Name:src Committed By: pgoyette Date: Sun Sep 23 07:16:41 UTC 2018 Modified Files: src/distrib/sets/lists/modules [pgoyette-compat]: ad.arm Log Message: Use a space to separate fields, not _ To generate a diff of this commit: cvs rdiff -u -r1.10.12.6 -r1.10.12.7 src/distrib/sets/lists/modules/ad.arm 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/modules/ad.arm diff -u src/distrib/sets/lists/modules/ad.arm:1.10.12.6 src/distrib/sets/lists/modules/ad.arm:1.10.12.7 --- src/distrib/sets/lists/modules/ad.arm:1.10.12.6 Sat Sep 22 11:41:35 2018 +++ src/distrib/sets/lists/modules/ad.arm Sun Sep 23 07:16:41 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.10.12.6 2018/09/22 11:41:35 pgoyette Exp $ +# $NetBSD: ad.arm,v 1.10.12.7 2018/09/23 07:16:41 pgoyette Exp $ ./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete @@ -9,11 +9,11 @@ ./@MODULEDIR@/compat_netbsd32_12 base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_12/compat_netbsd32_12.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_13 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_13/compat_netbsd32_13.kmod_base-kernel-modules kmod +./@MODULEDIR@/compat_netbsd32_13/compat_netbsd32_13.kmod base-kernel-modules kmod #./@MODULEDIR@/compat_netbsd32_14 base-kernel-modules kmod #./@MODULEDIR@/compat_netbsd32_14/compat_netbsd32_14.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_16 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_16/compat_netbsd32_16.kmod_base-kernel-modules kmod +./@MODULEDIR@/compat_netbsd32_16/compat_netbsd32_16.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_20 base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_20/compat_netbsd32_20.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_30 base-kernel-modules kmod
CVS commit: [pgoyette-compat] src/sys/arch/acorn32/acorn32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 07:16:01 UTC 2018 Modified Files: src/sys/arch/acorn32/acorn32 [pgoyette-compat]: netbsd32_machdep_16.c Log Message: Include header to get prototypes for the empty xxx_init() and xxx_fini() To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \ src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.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/acorn32/acorn32/netbsd32_machdep_16.c diff -u src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c:1.1.2.1 src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c:1.1.2.2 --- src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c:1.1.2.1 Sat Sep 22 22:36:37 2018 +++ src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c Sun Sep 23 07:16:01 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/22 22:36:37 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/09/23 07:16:01 pgoyette Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,45 +36,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/22 22:36:37 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/09/23 07:16:01 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" -#include "opt_coredump.h" -#include "opt_execfmt.h" #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include -#include - -#include -#include void netbsd32_machdep_md_16_init(void)
CVS commit: src/etc/etc.amiga
Module Name:src Committed By: rin Date: Sun Sep 23 06:39:23 UTC 2018 Modified Files: src/etc/etc.amiga: Makefile.inc Log Message: Remove ISDN. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/etc.amiga/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.amiga/Makefile.inc diff -u src/etc/etc.amiga/Makefile.inc:1.27 src/etc/etc.amiga/Makefile.inc:1.28 --- src/etc/etc.amiga/Makefile.inc:1.27 Mon Jul 9 18:12:11 2012 +++ src/etc/etc.amiga/Makefile.inc Sun Sep 23 06:39:23 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.27 2012/07/09 18:12:11 rkujawa Exp $ +# $NetBSD: Makefile.inc,v 1.28 2018/09/23 06:39:23 rin Exp $ # # etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets # @@ -8,7 +8,7 @@ KERNEL_SETS= GENERIC -EXTRA_KERNELS= INSTALL ISDN WSCONS +EXTRA_KERNELS= INSTALL WSCONS INSTALLATION_DIRS+= installation/miniroot \ installation/misc
