CVS commit: src/doc
Module Name:src Committed By: jnemeth Date: Tue Jun 25 05:04:35 UTC 2019 Modified Files: src/doc: CHANGES Log Message: note new gpt(8) uuid subcommand To generate a diff of this commit: cvs rdiff -u -r1.2548 -r1.2549 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.2548 src/doc/CHANGES:1.2549 --- src/doc/CHANGES:1.2548 Sun Jun 9 18:44:05 2019 +++ src/doc/CHANGES Tue Jun 25 05:04:35 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2548 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2549 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -393,3 +393,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: evbarm: Add support for the Banana Pi BPI-P2 Zero. [thorpej 20190604] mac68k: Switch page size to 8KB. [jklos 20190606] OpenSSL: Imported 1.1.1c. [christos 20190609] + gpt(8): added uuid subcommand to generate new UUIDS. + [jnemeth 20190624]
CVS commit: src/doc
Module Name:src Committed By: jnemeth Date: Tue Jun 25 05:04:35 UTC 2019 Modified Files: src/doc: CHANGES Log Message: note new gpt(8) uuid subcommand To generate a diff of this commit: cvs rdiff -u -r1.2548 -r1.2549 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Jun 25 04:53:41 UTC 2019
Modified Files:
src/sbin/gpt: Makefile gpt.8 main.c
Added Files:
src/sbin/gpt: uuid.c
Log Message:
Add an "uuid" command to generate a new UUID for a portion. The
primary intention is for use for after cloning disks to prevent
collisions.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/gpt/Makefile
cvs rdiff -u -r1.68 -r1.69 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.12 -r1.13 src/sbin/gpt/main.c
cvs rdiff -u -r0 -r1.1 src/sbin/gpt/uuid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/Makefile
diff -u src/sbin/gpt/Makefile:1.18 src/sbin/gpt/Makefile:1.19
--- src/sbin/gpt/Makefile:1.18 Thu Dec 3 02:02:43 2015
+++ src/sbin/gpt/Makefile Tue Jun 25 04:53:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/12/03 02:02:43 christos Exp $
+# $NetBSD: Makefile,v 1.19 2019/06/25 04:53:40 jnemeth Exp $
# $FreeBSD: src/sbin/gpt/Makefile,v 1.7 2005/09/01 02:49:20 marcel Exp $
.include
@@ -7,7 +7,7 @@ WARNS=6
PROG= gpt
SRCS= add.c biosboot.c create.c destroy.c gpt.c header.c label.c map.c \
main.c migrate.c recover.c remove.c resize.c resizedisk.c \
- set.c show.c type.c unset.c gpt_uuid.c
+ set.c show.c type.c unset.c gpt_uuid.c uuid.c
MAN= gpt.8
#LINKS= ${BINDIR}/gpt ${BINDIR}/gptlabel
Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.68 src/sbin/gpt/gpt.8:1.69
--- src/sbin/gpt/gpt.8:1.68 Thu Apr 4 13:55:40 2019
+++ src/sbin/gpt/gpt.8 Tue Jun 25 04:53:40 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpt.8,v 1.68 2019/04/04 13:55:40 martin Exp $
+.\" $NetBSD: gpt.8,v 1.69 2019/06/25 04:53:40 jnemeth Exp $
.\"
.\" Copyright (c) 2002 Marcel Moolenaar
.\" All rights reserved.
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
.\"
-.Dd April 4, 2019
+.Dd June 22, 2019
.Dt GPT 8
.Os
.Sh NAME
@@ -693,6 +693,25 @@ code.
They may be used by
.Nx
code in the future.
+.\" uuid
+.It Nm Ic uuid Oo Fl a Oc
+.It Nm Ic uuid Oo Fl b Ar blocknr Oc Oo Fl i Ar index Oc \
+Oo Fl L Ar label Oc Oo Fl s Ar sectors Oc Oo Fl t Ar type Oc
+The
+.Ic uuid
+command allows the user to change the UUID of any and all partitions
+that match the selection.
+It uses the same selection options as the
+.Ic label
+command.
+See above for a description of these options.
+If
+.Fl a
+is used, then the header UUID is changed as well.
+.Pp
+The primary purpose of this command is for use after cloning a disk to
+prevent collisions when both disks are used in the same system.
+.\" end of commands
.El
.Sh EXIT STATUS
The
Index: src/sbin/gpt/main.c
diff -u src/sbin/gpt/main.c:1.12 src/sbin/gpt/main.c:1.13
--- src/sbin/gpt/main.c:1.12 Mon Aug 27 15:50:39 2018
+++ src/sbin/gpt/main.c Tue Jun 25 04:53:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.12 2018/08/27 15:50:39 sevan Exp $ */
+/* $NetBSD: main.c,v 1.13 2019/06/25 04:53:40 jnemeth Exp $ */
/*-
* Copyright (c) 2002 Marcel Moolenaar
@@ -34,7 +34,7 @@
#include
#ifdef __RCSID
-__RCSID("$NetBSD: main.c,v 1.12 2018/08/27 15:50:39 sevan Exp $");
+__RCSID("$NetBSD: main.c,v 1.13 2019/06/25 04:53:40 jnemeth Exp $");
#endif
#include
@@ -73,7 +73,8 @@ extern const struct gpt_cmd
c_set,
c_show,
c_type,
- c_unset;
+ c_unset,
+ c_uuid;
static const struct gpt_cmd *cmdsw[] = {
_add,
@@ -97,6 +98,7 @@ static const struct gpt_cmd *cmdsw[] = {
_show,
_type,
_unset,
+ _uuid,
_null,
};
Added files:
Index: src/sbin/gpt/uuid.c
diff -u /dev/null src/sbin/gpt/uuid.c:1.1
--- /dev/null Tue Jun 25 04:53:41 2019
+++ src/sbin/gpt/uuid.c Tue Jun 25 04:53:40 2019
@@ -0,0 +1,114 @@
+/*-
+ * Copyright (c) 2004 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Tue Jun 25 04:53:41 UTC 2019 Modified Files: src/sbin/gpt: Makefile gpt.8 main.c Added Files: src/sbin/gpt: uuid.c Log Message: Add an "uuid" command to generate a new UUID for a portion. The primary intention is for use for after cloning disks to prevent collisions. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sbin/gpt/Makefile cvs rdiff -u -r1.68 -r1.69 src/sbin/gpt/gpt.8 cvs rdiff -u -r1.12 -r1.13 src/sbin/gpt/main.c cvs rdiff -u -r0 -r1.1 src/sbin/gpt/uuid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Jun 25 04:25:12 UTC 2019
Modified Files:
src/sbin/gpt: gpt_uuid.c
Log Message:
adjust gpt_uuid_generate() to accept gpt==NULL
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sbin/gpt/gpt_uuid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.17 src/sbin/gpt/gpt_uuid.c:1.18
--- src/sbin/gpt/gpt_uuid.c:1.17 Thu Dec 20 14:58:10 2018
+++ src/sbin/gpt/gpt_uuid.c Tue Jun 25 04:25:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.17 2018/12/20 14:58:10 martin Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.18 2019/06/25 04:25:11 jnemeth Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
#ifdef __RCSID
-__RCSID("$NetBSD: gpt_uuid.c,v 1.17 2018/12/20 14:58:10 martin Exp $");
+__RCSID("$NetBSD: gpt_uuid.c,v 1.18 2019/06/25 04:25:11 jnemeth Exp $");
#endif
#include
@@ -321,7 +321,7 @@ gpt_uuid_generate(gpt_t gpt, gpt_uuid_t
{
int rv;
struct dce_uuid u;
- if (gpt->flags & GPT_TIMESTAMP)
+ if (gpt && (gpt->flags & GPT_TIMESTAMP))
rv = gpt_uuid_tstamp(gpt, , sizeof(u));
else
rv = gpt_uuid_random(gpt, , sizeof(u));
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Tue Jun 25 04:25:12 UTC 2019 Modified Files: src/sbin/gpt: gpt_uuid.c Log Message: adjust gpt_uuid_generate() to accept gpt==NULL To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sbin/gpt/gpt_uuid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sbin/gpt
On Jun 25, 3:42am, "John Nemeth" wrote: } } Module Name: src } Committed By: jnemeth } Date: Tue Jun 25 03:42:46 UTC 2019 } } Modified Files: } src/sbin/gpt: gpt.h } } Log Message: } gpt.c ARGH! Message should have read: Add gpt_change_hdr() similar to gpt_change_ent() for changing arbitrary header fields. Updated in repository. }-- End of excerpt from "John Nemeth"
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Tue Jun 25 03:50:18 UTC 2019 Modified Files: src/sbin/gpt: gpt.c Log Message: Add gpt_change_hdr() similar to gpt_change_ent() for changing arbitrary header fields. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sbin/gpt/gpt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Jun 25 03:50:18 UTC 2019
Modified Files:
src/sbin/gpt: gpt.c
Log Message:
Add gpt_change_hdr() similar to gpt_change_ent() for changing
arbitrary header fields.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.79 src/sbin/gpt/gpt.c:1.80
--- src/sbin/gpt/gpt.c:1.79 Fri Jun 21 02:14:59 2019
+++ src/sbin/gpt/gpt.c Tue Jun 25 03:50:18 2019
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.79 2019/06/21 02:14:59 jnemeth Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.80 2019/06/25 03:50:18 jnemeth Exp $");
#endif
#include
@@ -1076,6 +1076,33 @@ gpt_change_ent(gpt_t gpt, const struct g
}
int
+gpt_change_hdr(gpt_t gpt, const struct gpt_find *find,
+void (*cfn)(struct gpt_hdr *, void *, int), void *v)
+{
+ struct gpt_hdr *hdr;
+
+ if ((hdr = gpt_hdr(gpt)) == NULL)
+ return -1;
+
+ /* Change the primary header. */
+ (*cfn)(hdr, v, 0);
+
+ if (gpt_write_primary(gpt) == -1)
+ return -1;
+
+ hdr = gpt->tpg->map_data;
+ /* Change the secondary header. */
+ (*cfn)(hdr, v, 1);
+
+ if (gpt_write_backup(gpt) == -1)
+ return -1;
+
+ gpt_msg(gpt, "Header %s", find->msg);
+
+ return 0;
+}
+
+int
gpt_add_ais(gpt_t gpt, off_t *alignment, u_int *entry, off_t *size, int ch)
{
switch (ch) {
CVS commit: src/sbin/gpt
Module Name:src Committed By: jnemeth Date: Tue Jun 25 03:42:46 UTC 2019 Modified Files: src/sbin/gpt: gpt.h Log Message: gpt.c To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sbin/gpt/gpt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src
Committed By: jnemeth
Date: Tue Jun 25 03:42:46 UTC 2019
Modified Files:
src/sbin/gpt: gpt.h
Log Message:
gpt.c
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sbin/gpt/gpt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.h
diff -u src/sbin/gpt/gpt.h:1.39 src/sbin/gpt/gpt.h:1.40
--- src/sbin/gpt/gpt.h:1.39 Fri Jun 21 02:14:59 2019
+++ src/sbin/gpt/gpt.h Tue Jun 25 03:42:45 2019
@@ -116,6 +116,8 @@ struct gpt_find {
};
int gpt_change_ent(gpt_t, const struct gpt_find *,
void (*)(struct gpt_ent *, void *, int), void *);
+int gpt_change_hdr(gpt_t, const struct gpt_find *,
+void (*)(struct gpt_hdr *, void *, int), void *);
int gpt_add_find(gpt_t, struct gpt_find *, int);
#define GPT_AIS "a:i:s:"
CVS commit: src/sys/sys
Module Name:src Committed By: pgoyette Date: Tue Jun 25 03:41:05 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Belated bump to account for splitting the ufs stuff out of the ffs module, and making ext2fs and ffs depend on ufs. Welcome to 8.99.48 To generate a diff of this commit: cvs rdiff -u -r1.595 -r1.596 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: pgoyette Date: Tue Jun 25 03:41:05 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Belated bump to account for splitting the ufs stuff out of the ffs module, and making ext2fs and ffs depend on ufs. Welcome to 8.99.48 To generate a diff of this commit: cvs rdiff -u -r1.595 -r1.596 src/sys/sys/param.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/param.h diff -u src/sys/sys/param.h:1.595 src/sys/sys/param.h:1.596 --- src/sys/sys/param.h:1.595 Thu Jun 20 03:34:38 2019 +++ src/sys/sys/param.h Tue Jun 25 03:41:05 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.595 2019/06/20 03:34:38 kamil Exp $ */ +/* $NetBSD: param.h,v 1.596 2019/06/25 03:41:05 pgoyette Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899004700 /* NetBSD 8.99.47 */ +#define __NetBSD_Version__ 899004800 /* NetBSD 8.99.48 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Mon Jun 24 20:29:41 UTC 2019 Modified Files: src/sys/kern: sys_ptrace_common.c Log Message: the tracer, not the tracee determine if we are going to convert the ptrace data from 64 to 32. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Mon Jun 24 20:29:41 UTC 2019
Modified Files:
src/sys/kern: sys_ptrace_common.c
Log Message:
the tracer, not the tracee determine if we are going to convert the ptrace
data from 64 to 32.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/sys_ptrace_common.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/sys_ptrace_common.c
diff -u src/sys/kern/sys_ptrace_common.c:1.55 src/sys/kern/sys_ptrace_common.c:1.56
--- src/sys/kern/sys_ptrace_common.c:1.55 Tue Jun 11 19:18:55 2019
+++ src/sys/kern/sys_ptrace_common.c Mon Jun 24 16:29:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_ptrace_common.c,v 1.55 2019/06/11 23:18:55 kamil Exp $ */
+/* $NetBSD: sys_ptrace_common.c,v 1.56 2019/06/24 20:29:41 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.55 2019/06/11 23:18:55 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.56 2019/06/24 20:29:41 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
@@ -1483,9 +1483,13 @@ process_doregs(struct lwp *curl /*tracer
regwfunc_t w;
#ifdef COMPAT_NETBSD32
- const bool pk32 = (l->l_proc->p_flag & PK_32) != 0;
+ const bool pk32 = (curl->l_proc->p_flag & PK_32) != 0;
if (__predict_false(pk32)) {
+ if ((l->l_proc->p_flag & PK_32) == 0) {
+ // 32 bit tracer can't trace 64 bit process
+ return EINVAL;
+ }
s = sizeof(process_reg32);
r = (regrfunc_t)process_read_regs32;
w = (regwfunc_t)process_write_regs32;
@@ -1524,9 +1528,13 @@ process_dofpregs(struct lwp *curl /*trac
regwfunc_t w;
#ifdef COMPAT_NETBSD32
- const bool pk32 = (l->l_proc->p_flag & PK_32) != 0;
+ const bool pk32 = (curl->l_proc->p_flag & PK_32) != 0;
if (__predict_false(pk32)) {
+ if ((l->l_proc->p_flag & PK_32) == 0) {
+ // 32 bit tracer can't trace 64 bit process
+ return EINVAL;
+ }
s = sizeof(process_fpreg32);
r = (regrfunc_t)process_read_fpregs32;
w = (regwfunc_t)process_write_fpregs32;
@@ -1565,9 +1573,13 @@ process_dodbregs(struct lwp *curl /*trac
regwfunc_t w;
#ifdef COMPAT_NETBSD32
- const bool pk32 = (l->l_proc->p_flag & PK_32) != 0;
+ const bool pk32 = (curl->l_proc->p_flag & PK_32) != 0;
if (__predict_false(pk32)) {
+ if ((l->l_proc->p_flag & PK_32) == 0) {
+ // 32 bit tracer can't trace 64 bit process
+ return EINVAL;
+ }
s = sizeof(process_dbreg32);
r = (regrfunc_t)process_read_dbregs32;
w = (regwfunc_t)process_write_dbregs32;
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Mon Jun 24 18:48:08 UTC 2019
Modified Files:
src/usr.sbin/sysinst: upgrade.c
Log Message:
If low on ram, mount the proper swap partition before doing the main
upgrade work.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/upgrade.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/upgrade.c
diff -u src/usr.sbin/sysinst/upgrade.c:1.8 src/usr.sbin/sysinst/upgrade.c:1.9
--- src/usr.sbin/sysinst/upgrade.c:1.8 Thu Jun 20 00:43:55 2019
+++ src/usr.sbin/sysinst/upgrade.c Mon Jun 24 18:48:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: upgrade.c,v 1.8 2019/06/20 00:43:55 christos Exp $ */
+/* $NetBSD: upgrade.c,v 1.9 2019/06/24 18:48:08 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -67,11 +67,6 @@ do_upgrade(void)
if (find_disks(msg_string(MSG_upgrade)) < 0)
return;
- /* XXX - build install_partition_desc from existing partitions
- * and pass that here and below instead of NULL */
- if (set_swap_if_low_ram(NULL) < 0)
- return;
-
if (pm->parts->pscheme->pre_update_verify) {
if (pm->parts->pscheme->pre_update_verify(pm->parts))
pm->parts->pscheme->write_to_disk(pm->parts);
@@ -79,6 +74,9 @@ do_upgrade(void)
install_desc_from_parts(, pm->parts);
+ if (set_swap_if_low_ram() < 0)
+ return;
+
if (md_pre_update() < 0)
goto free_install;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Mon Jun 24 18:48:08 UTC 2019 Modified Files: src/usr.sbin/sysinst: upgrade.c Log Message: If low on ram, mount the proper swap partition before doing the main upgrade work. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/upgrade.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Mon Jun 24 13:57:31 UTC 2019 Modified Files: src/sys/dev/pci: if_wpi.c Log Message: Put back correct recieve ring allocation size which was lost just over five years ago mae culpa. Found by msaitoh@ Should fix PR kern/54320 once pulled up. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pci/if_wpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Mon Jun 24 13:57:31 UTC 2019 Modified Files: src/sys/dev/pci: if_wpi.c Log Message: Put back correct recieve ring allocation size which was lost just over five years ago mae culpa. Found by msaitoh@ Should fix PR kern/54320 once pulled up. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pci/if_wpi.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_wpi.c diff -u src/sys/dev/pci/if_wpi.c:1.85 src/sys/dev/pci/if_wpi.c:1.86 --- src/sys/dev/pci/if_wpi.c:1.85 Sat Dec 22 14:07:53 2018 +++ src/sys/dev/pci/if_wpi.c Mon Jun 24 13:57:30 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.85 2018/12/22 14:07:53 maxv Exp $ */ +/* $NetBSD: if_wpi.c,v 1.86 2019/06/24 13:57:30 jakllsch Exp $ */ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.85 2018/12/22 14:07:53 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.86 2019/06/24 13:57:30 jakllsch Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -671,7 +671,7 @@ wpi_alloc_rx_ring(struct wpi_softc *sc, ring->cur = 0; - size = WPI_RX_RING_COUNT * sizeof (uint32_t); + size = WPI_RX_RING_COUNT * sizeof (struct wpi_rx_desc); error = wpi_dma_contig_alloc(sc->sc_dmat, >desc_dma, (void **)>desc, size, WPI_RING_DMA_ALIGN, BUS_DMA_NOWAIT);
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src
Committed By: wiz
Date: Mon Jun 24 13:36:07 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/nouveau: files.nouveau
Log Message:
nouveau uses firmload, add dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/nouveau/files.nouveau
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/nouveau/files.nouveau
diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.26 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.27
--- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.26 Mon Feb 4 08:18:08 2019
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau Mon Jun 24 13:36:07 2019
@@ -1,9 +1,9 @@
-# $NetBSD: files.nouveau,v 1.26 2019/02/04 08:18:08 mrg Exp $
+# $NetBSD: files.nouveau,v 1.27 2019/06/24 13:36:07 wiz Exp $
version 20180827
define nouveaufbbus { }
-device nouveau: drmkms, drmkms_ttm, nouveaufbbus
+device nouveau: drmkms, drmkms_ttm, nouveaufbbus, firmload
attach nouveau at pci with nouveau_pci: drmkms_pci
file external/bsd/drm2/nouveau/nouveau_pci.c nouveau_pci
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src Committed By: wiz Date: Mon Jun 24 13:36:07 UTC 2019 Modified Files: src/sys/external/bsd/drm2/nouveau: files.nouveau Log Message: nouveau uses firmload, add dependency. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/nouveau/files.nouveau Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/usb
On Mon, Jun 24, 2019 at 9:39 AM Ryota Ozaki wrote: > > On Mon, Jun 24, 2019 at 6:27 PM matthew green wrote: > > > > > Only KERNEL_LOCK (and some splsoftnet) is required for the network stack > > > now. Remaining splnets are for network drivers. (softnet_lock is also > > > required > > > in some cases but it's another story...) > > > > great! i studied the code and i couldn't find any issues > > in any of the relevant paths, so i'm glad to hear it's > > supposed to be like this. > > > > for one particular case (ether_ioctl) how is this diff: > > > > - * Common ioctls for Ethernet interfaces. Note, we must be > > - * called at splnet(). > > + * Common ioctls for Ethernet interfaces. > > + * > > + * Non IFEF_MPSAFE drivers must call this function at at least called > > + * at splsoftnet(). > > > > or should they also be with kernel lock? > > Yes. > > Also I think splnet is still needed for ether_ioctl for sure because > it has to care not only the network stack but also network drivers. > > ozaki-r Thank you all for detailed explanations. I hope the source would be -DNET_MPSAFE by default. Thanks,
Re: CVS commit: src/sys/dev/usb
On Mon, Jun 24, 2019 at 6:27 PM matthew green wrote: > > > Only KERNEL_LOCK (and some splsoftnet) is required for the network stack > > now. Remaining splnets are for network drivers. (softnet_lock is also > > required > > in some cases but it's another story...) > > great! i studied the code and i couldn't find any issues > in any of the relevant paths, so i'm glad to hear it's > supposed to be like this. > > for one particular case (ether_ioctl) how is this diff: > > - * Common ioctls for Ethernet interfaces. Note, we must be > - * called at splnet(). > + * Common ioctls for Ethernet interfaces. > + * > + * Non IFEF_MPSAFE drivers must call this function at at least called > + * at splsoftnet(). > > or should they also be with kernel lock? Yes. Also I think splnet is still needed for ether_ioctl for sure because it has to care not only the network stack but also network drivers. ozaki-r
re: CVS commit: src/sys/dev/usb
> Only KERNEL_LOCK (and some splsoftnet) is required for the network stack > now. Remaining splnets are for network drivers. (softnet_lock is also > required > in some cases but it's another story...) great! i studied the code and i couldn't find any issues in any of the relevant paths, so i'm glad to hear it's supposed to be like this. for one particular case (ether_ioctl) how is this diff: - * Common ioctls for Ethernet interfaces. Note, we must be - * called at splnet(). + * Common ioctls for Ethernet interfaces. + * + * Non IFEF_MPSAFE drivers must call this function at at least called + * at splsoftnet(). or should they also be with kernel lock? thanks.
Re: CVS commit: src/sys/dev/usb
On Mon, Jun 24, 2019 at 5:26 PM Manuel Bouyer wrote: > > On Mon, Jun 24, 2019 at 08:39:08AM +0100, Nick Hudson wrote: > > > > > > On 24/06/2019 04:30, matthew green wrote: > > > > > splnet is obsolete in modern USB network drivers. > > > > > all the code runs at softipl. > > > > > > > > > > removing spl was done entirely on purpose. > > > > > > > > I saw the comment of ether_ioctl in sys/net/if_ethersubr.c > > > > > Note, we must be called at splnet(). > > > > so I asked. > > > > > > that comment is true for old style drivers, but looking at other > > > drivers they also only skip this for NET_MPSAFE kernel builds. > > > > > > Nick, do we need to make these go back to non-mpsafe stuff for > > > networking if !NET_MPSAFE? > > > > I'm really not sure. > > > > splnet is to prevent IPL_NET interrupt handlers (common for most > > drivers) from running. USB ethernet devices don't have these, however. > > All handling of device to host communications is done via USB callbacks > > which run at splsoftserial (aka splusb). > > Actually, I think splnet() ( + KERNEL_LOCK) is used to protect the network > stack when NET_MPSAFE is not defined. Only KERNEL_LOCK (and some splsoftnet) is required for the network stack now. Remaining splnets are for network drivers. (softnet_lock is also required in some cases but it's another story...) > > For example pppoe(4) uses it when NET_MPSAFE is not defined. Because there was a driver, lmc(4), that calls pppoe from hardware interrupt handler, but now it's removed, so splnet is not required anymore and splsoftnet is enough now (as per knakahara@). ozaki-r
CVS commit: src
Module Name:src Committed By: hannken Date: Mon Jun 24 08:27:21 UTC 2019 Modified Files: src/usr.sbin/fstyp: Makefile Added Files: src/external/cddl/osnet/dist: OPENSOLARIS.LICENSE src/external/cddl/osnet/dist/cmd/zdb: zdb.8 src/external/cddl/osnet/dist/cmd/zfs: zfs.8 src/external/cddl/osnet/dist/cmd/zpool: zpool-features.7 zpool.8 src/external/cddl/osnet/dist/head: libintl.h stdio_ext.h thread.h src/external/cddl/osnet/dist/uts/common/os: callb.c fm.c src/external/cddl/osnet/dist/uts/common/sys: extdirent.h isa_defs.h procset.h sysmacros.h Removed Files: src/external/cddl/osnet: OPENSOLARIS.LICENSE src/external/cddl/osnet/include: libintl.h stdio_ext.h thread.h src/external/cddl/osnet/sbin/zfs: zfs.8 src/external/cddl/osnet/sbin/zpool: zpool-features.7 zpool.8 src/external/cddl/osnet/sys/kern: callb.c fm.c src/external/cddl/osnet/sys/sys: extdirent.h isa_defs.h procset.h sysmacros.h src/external/cddl/osnet/usr.sbin/zdb: zdb.8 Log Message: Sync with upstream r315983. Move files originating from upstream below "dist/": OPENSOLARIS.LICENSE -> dist/OPENSOLARIS.LICENSE usr.sbin/zdb/zdb.8 -> dist/cmd/zdb/zdb.8 sbin/zfs/zfs.8 -> dist/cmd/zfs/zfs.8 sbin/zpool/zpool-features.7 -> dist/cmd/zpool/zpool-features.7 sbin/zpool/zpool.8 -> dist/cmd/zpool/zpool.8 include/libintl.h -> dist/head/libintl.h include/stdio_ext.h -> dist/head/stdio_ext.h include/thread.h -> dist/head/thread.h sys/kern/callb.c -> dist/uts/common/os/callb.c sys/kern/fm.c -> dist/uts/common/os/fm.c sys/sys/extdirent.h -> dist/uts/common/sys/extdirent.h sys/sys/isa_defs.h -> dist/uts/common/sys/isa_defs.h sys/sys/procset.h -> dist/uts/common/sys/procset.h sys/sys/sysmacros.h -> dist/uts/common/sys/sysmacros.h Adapt "usr.sbin/fstyp/Makefile". To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/external/cddl/osnet/OPENSOLARIS.LICENSE cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/OPENSOLARIS.LICENSE cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/cmd/zdb/zdb.8 cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/cmd/zfs/zfs.8 cvs rdiff -u -r0 -r1.1 \ src/external/cddl/osnet/dist/cmd/zpool/zpool-features.7 \ src/external/cddl/osnet/dist/cmd/zpool/zpool.8 cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/head/libintl.h \ src/external/cddl/osnet/dist/head/stdio_ext.h \ src/external/cddl/osnet/dist/head/thread.h cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/dist/uts/common/os/callb.c \ src/external/cddl/osnet/dist/uts/common/os/fm.c cvs rdiff -u -r0 -r1.1 \ src/external/cddl/osnet/dist/uts/common/sys/extdirent.h \ src/external/cddl/osnet/dist/uts/common/sys/isa_defs.h \ src/external/cddl/osnet/dist/uts/common/sys/procset.h \ src/external/cddl/osnet/dist/uts/common/sys/sysmacros.h cvs rdiff -u -r1.4 -r0 src/external/cddl/osnet/include/libintl.h cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/include/stdio_ext.h cvs rdiff -u -r1.5 -r0 src/external/cddl/osnet/include/thread.h cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sbin/zfs/zfs.8 cvs rdiff -u -r1.1 -r0 src/external/cddl/osnet/sbin/zpool/zpool-features.7 cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sbin/zpool/zpool.8 cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sys/kern/callb.c cvs rdiff -u -r1.3 -r0 src/external/cddl/osnet/sys/kern/fm.c cvs rdiff -u -r1.1 -r0 src/external/cddl/osnet/sys/sys/extdirent.h cvs rdiff -u -r1.4 -r0 src/external/cddl/osnet/sys/sys/isa_defs.h cvs rdiff -u -r1.3 -r0 src/external/cddl/osnet/sys/sys/procset.h cvs rdiff -u -r1.10 -r0 src/external/cddl/osnet/sys/sys/sysmacros.h cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/usr.sbin/zdb/zdb.8 cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fstyp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/usb
On Mon, Jun 24, 2019 at 08:39:08AM +0100, Nick Hudson wrote: > > > On 24/06/2019 04:30, matthew green wrote: > > > > splnet is obsolete in modern USB network drivers. > > > > all the code runs at softipl. > > > > > > > > removing spl was done entirely on purpose. > > > > > > I saw the comment of ether_ioctl in sys/net/if_ethersubr.c > > > > Note, we must be called at splnet(). > > > so I asked. > > > > that comment is true for old style drivers, but looking at other > > drivers they also only skip this for NET_MPSAFE kernel builds. > > > > Nick, do we need to make these go back to non-mpsafe stuff for > > networking if !NET_MPSAFE? > > I'm really not sure. > > splnet is to prevent IPL_NET interrupt handlers (common for most > drivers) from running. USB ethernet devices don't have these, however. > All handling of device to host communications is done via USB callbacks > which run at splsoftserial (aka splusb). Actually, I think splnet() ( + KERNEL_LOCK) is used to protect the network stack when NET_MPSAFE is not defined. For example pppoe(4) uses it when NET_MPSAFE is not defined. -- Manuel Bouyer NetBSD: 26 ans d'experience feront toujours la difference --
Re: CVS commit: src/sys/dev/usb
On 24/06/2019 04:30, matthew green wrote: splnet is obsolete in modern USB network drivers. all the code runs at softipl. removing spl was done entirely on purpose. I saw the comment of ether_ioctl in sys/net/if_ethersubr.c Note, we must be called at splnet(). so I asked. that comment is true for old style drivers, but looking at other drivers they also only skip this for NET_MPSAFE kernel builds. Nick, do we need to make these go back to non-mpsafe stuff for networking if !NET_MPSAFE? I'm really not sure. splnet is to prevent IPL_NET interrupt handlers (common for most drivers) from running. USB ethernet devices don't have these, however. All handling of device to host communications is done via USB callbacks which run at splsoftserial (aka splusb). Perhaps splusb is required, but then it's unclear to me what is actually being protected which isn't already protected by mutex(es). eg, look what wm(4) idoes with WM_MPSAFE usage. are we getting ahead of ourselves in usb? :) Maybe, but I don't think so. Nick
Re: Stateful commits, "revert previous"
On 23/06/2019 18:23, John Nemeth wrote: If github can't easily show you what that is, then that is its problem. You see the same thing on cvsweb. The issue is purely with the content of the commit message. Roy
Re: CVS commit: src/sys/dev/usb
On Mon, Jun 24, 2019 at 01:30:09PM +1000, matthew green wrote: > > > splnet is obsolete in modern USB network drivers. > > > all the code runs at softipl. > > > > > > removing spl was done entirely on purpose. > > > > I saw the comment of ether_ioctl in sys/net/if_ethersubr.c > > > Note, we must be called at splnet(). > > so I asked. > > that comment is true for old style drivers, but looking at other > drivers they also only skip this for NET_MPSAFE kernel builds. > > Nick, do we need to make these go back to non-mpsafe stuff for > networking if !NET_MPSAFE? > > eg, look what wm(4) idoes with WM_MPSAFE usage. are we getting > ahead of ourselves in usb? :) I think so. It NET_MPSAFE is not defined, AFAIK the network layers still need to be called at splnet(). -- Manuel Bouyer NetBSD: 26 ans d'experience feront toujours la difference --
CVS commit: src/tests/net/can
Module Name:src
Committed By: skrll
Date: Mon Jun 24 06:26:30 UTC 2019
Modified Files:
src/tests/net/can: t_can.c
Log Message:
Another spello of 'unknown'
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/can/t_can.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/can/t_can.c
diff -u src/tests/net/can/t_can.c:1.6 src/tests/net/can/t_can.c:1.7
--- src/tests/net/can/t_can.c:1.6 Fri Jun 9 08:23:45 2017
+++ src/tests/net/can/t_can.c Mon Jun 24 06:26:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_can.c,v 1.6 2017/06/09 08:23:45 bouyer Exp $ */
+/* $NetBSD: t_can.c,v 1.7 2019/06/24 06:26:29 skrll Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: t_can.c,v 1.6 2017/06/09 08:23:45 bouyer Exp $");
+__RCSID("$NetBSD: t_can.c,v 1.7 2019/06/24 06:26:29 skrll Exp $");
#endif /* not lint */
#include
@@ -721,7 +721,7 @@ ATF_TC(canbindunknown);
ATF_TC_HEAD(canbindunknown, tc)
{
- atf_tc_set_md_var(tc, "descr", "check that bind to unkown interface fails");
+ atf_tc_set_md_var(tc, "descr", "check that bind to unknown interface fails");
atf_tc_set_md_var(tc, "timeout", "5");
}
CVS commit: src/tests/net/can
Module Name:src Committed By: skrll Date: Mon Jun 24 06:26:30 UTC 2019 Modified Files: src/tests/net/can: t_can.c Log Message: Another spello of 'unknown' To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/net/can/t_can.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Mon Jun 24 06:24:33 UTC 2019
Modified Files:
src/sys/dev/fdt: panel_fdt.c
src/sys/kern: kern_cctr.c
src/sys/net: if.h
Log Message:
Fix 'unknown' spellos
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/panel_fdt.c
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/kern_cctr.c
cvs rdiff -u -r1.272 -r1.273 src/sys/net/if.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/fdt/panel_fdt.c
diff -u src/sys/dev/fdt/panel_fdt.c:1.1 src/sys/dev/fdt/panel_fdt.c:1.2
--- src/sys/dev/fdt/panel_fdt.c:1.1 Tue Apr 3 12:40:20 2018
+++ src/sys/dev/fdt/panel_fdt.c Mon Jun 24 06:24:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: panel_fdt.c,v 1.1 2018/04/03 12:40:20 bouyer Exp $ */
+/* $NetBSD: panel_fdt.c,v 1.2 2019/06/24 06:24:33 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: panel_fdt.c,v 1.1 2018/04/03 12:40:20 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: panel_fdt.c,v 1.2 2019/06/24 06:24:33 skrll Exp $");
#include
#include
@@ -136,7 +136,7 @@ fdt_panel_attach(device_t parent, device
else if (strcmp(val, "vesa-24") == 0)
sc->sc_panel.panel_lvds_format = LVDS_VESA_24;
else {
- aprint_error(": unkown data-mapping \"%s\"\n", val);
+ aprint_error(": unknown data-mapping \"%s\"\n", val);
return;
}
break;
Index: src/sys/kern/kern_cctr.c
diff -u src/sys/kern/kern_cctr.c:1.9 src/sys/kern/kern_cctr.c:1.10
--- src/sys/kern/kern_cctr.c:1.9 Sat Jan 3 03:31:23 2009
+++ src/sys/kern/kern_cctr.c Mon Jun 24 06:24:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cctr.c,v 1.9 2009/01/03 03:31:23 yamt Exp $ */
+/* $NetBSD: kern_cctr.c,v 1.10 2019/06/24 06:24:33 skrll Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
#include
/* __FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.204 2003/10/21 18:28:34 silby Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_cctr.c,v 1.9 2009/01/03 03:31:23 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cctr.c,v 1.10 2019/06/24 06:24:33 skrll Exp $");
#include
#include
@@ -100,7 +100,7 @@ static struct timecounter cc_timecounter
.tc_poll_pps = cc_calibrate,
.tc_counter_mask = ~0u,
.tc_frequency = 0,
- .tc_name = "unkown cycle counter",
+ .tc_name = "unknown cycle counter",
/*
* don't pick cycle counter automatically
* if frequency changes might affect cycle counter
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.272 src/sys/net/if.h:1.273
--- src/sys/net/if.h:1.272 Fri May 10 06:53:42 2019
+++ src/sys/net/if.h Mon Jun 24 06:24:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.272 2019/05/10 06:53:42 msaitoh Exp $ */
+/* $NetBSD: if.h,v 1.273 2019/06/24 06:24:33 skrll Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -244,7 +244,7 @@ typedef unsigned short if_index_t;
* a: if_afdata_lock
* 6: in6_multilock (global lock)
* :: unlocked, stable
- * ?: unkown, maybe unsafe
+ * ?: unknown, maybe unsafe
*
* Lock order: IFNET_LOCK => in6_multilock => if_afdata_lock => ifq_lock
* Note that currently if_afdata_lock and ifq_lock aren't held
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Mon Jun 24 06:24:33 UTC 2019 Modified Files: src/sys/dev/fdt: panel_fdt.c src/sys/kern: kern_cctr.c src/sys/net: if.h Log Message: Fix 'unknown' spellos To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/panel_fdt.c cvs rdiff -u -r1.9 -r1.10 src/sys/kern/kern_cctr.c cvs rdiff -u -r1.272 -r1.273 src/sys/net/if.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
