CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sun Dec 8 04:41:02 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_ioctl.c dm_target_error.c dm_target_linear.c
dm_target_mirror.c dm_target_snapshot.c dm_target_stripe.c
dm_target_zero.c
Log Message:
dm: Refactor target's ->init() i/f
Take dm_table_entry_t* instead of void**.
Remove dm_dev_t* unneeded by target code.
No functional change, but for future changes.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/dm/dm_target_zero.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/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.34 src/sys/dev/dm/dm.h:1.35
--- src/sys/dev/dm/dm.h:1.34 Sat Dec 7 15:28:39 2019
+++ src/sys/dev/dm/dm.h Sun Dec 8 04:41:02 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm.h,v 1.34 2019/12/07 15:28:39 tkusumi Exp $ */
+/*$NetBSD: dm.h,v 1.35 2019/12/08 04:41:02 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -213,7 +213,7 @@ typedef struct target_snapshot_origin_co
typedef struct dm_target {
char name[DM_MAX_TYPE_NAME];
/* Initialize target_config area */
- int (*init)(dm_dev_t *, void **, char *);
+ int (*init)(dm_table_entry_t *, char *);
/* Destroy target_config area */
int (*destroy)(dm_table_entry_t *);
@@ -275,7 +275,7 @@ int dm_target_init(void);
#define DM_MAX_PARAMS_SIZE 1024
/* dm_target_linear.c */
-int dm_target_linear_init(dm_dev_t *, void**, char *);
+int dm_target_linear_init(dm_table_entry_t *, char *);
char *dm_target_linear_status(void *);
int dm_target_linear_strategy(dm_table_entry_t *, struct buf *);
int dm_target_linear_sync(dm_table_entry_t *);
@@ -288,7 +288,7 @@ int dm_target_linear_secsize(dm_table_en
uint64_t atoi(const char *);
/* dm_target_stripe.c */
-int dm_target_stripe_init(dm_dev_t *, void**, char *);
+int dm_target_stripe_init(dm_table_entry_t *, char *);
char *dm_target_stripe_status(void *);
int dm_target_stripe_strategy(dm_table_entry_t *, struct buf *);
int dm_target_stripe_sync(dm_table_entry_t *);
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.39 src/sys/dev/dm/dm_ioctl.c:1.40
--- src/sys/dev/dm/dm_ioctl.c:1.39 Fri Dec 6 16:33:47 2019
+++ src/sys/dev/dm/dm_ioctl.c Sun Dec 8 04:41:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.39 2019/12/06 16:33:47 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.40 2019/12/08 04:41:02 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.39 2019/12/06 16:33:47 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.40 2019/12/08 04:41:02 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -780,8 +780,7 @@ dm_table_load_ioctl(prop_dictionary_t dm
* routine and parse parameters there.
*/
- if ((ret = target->init(dmv, _en->target_config,
- str)) != 0) {
+ if ((ret = target->init(table_en, str)) != 0) {
dm_table_release(>table_head, DM_TABLE_INACTIVE);
dm_table_destroy(>table_head, DM_TABLE_INACTIVE);
free(str, M_TEMP);
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.16 src/sys/dev/dm/dm_target_error.c:1.17
--- src/sys/dev/dm/dm_target_error.c:1.16 Sat Dec 7 15:28:39 2019
+++ src/sys/dev/dm/dm_target_error.c Sun Dec 8 04:41:02 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_error.c,v 1.16 2019/12/07 15:28:39 tkusumi Exp $ */
+/*$NetBSD: dm_target_error.c,v 1.17 2019/12/08 04:41:02 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.16 2019/12/07 15:28:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.17 2019/12/08 04:41:02 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_er
#include "dm.h"
/* dm_target_error.c */
-int dm_target_error_init(dm_dev_t *, void**, char *);
+int dm_target_error_init(dm_table_entry_t*, char *);
char *dm_target_error_status(void *);
int dm_target_error_strategy(dm_table_entry_t *, struct buf *);
int dm_target_error_sync(dm_table_entry_t *);
@@ -110,12 +110,12 @@ dm_target_error_modcmd(modcmd_t cmd, voi
/* Init
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Sun Dec 8 02:57:52 UTC 2019 Modified Files: src/share/man/man4: audio.4 Log Message: Replace mention of azalia with hdaudio To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/share/man/man4/audio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/audio.4 diff -u src/share/man/man4/audio.4:1.93 src/share/man/man4/audio.4:1.94 --- src/share/man/man4/audio.4:1.93 Wed Nov 13 07:52:25 2019 +++ src/share/man/man4/audio.4 Sun Dec 8 02:57:52 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.4,v 1.93 2019/11/13 07:52:25 isaki Exp $ +.\" $NetBSD: audio.4,v 1.94 2019/12/08 02:57:52 nia Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -769,7 +769,6 @@ string values. .\" .Xr ausoc 4 , .Xr autri 4 , .Xr auvia 4 , -.Xr azalia 4 , .Xr bba 4 , .Xr btsco 4 , .Xr clcs 4 , @@ -787,6 +786,7 @@ string values. .\" .Xr evbarm/pxaacu 4 , .\" .Xr evbarm/udassio 4 , .Xr fms 4 , +.Xr hdaudio 4 , .Xr gcscaudio 4 , .Xr gus 4 , .Xr guspnp 4 ,
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Sun Dec 8 02:54:54 UTC 2019 Modified Files: src/share/man/man4: pci.4 Log Message: Add hdaudio To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/share/man/man4/pci.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/pci.4 diff -u src/share/man/man4/pci.4:1.100 src/share/man/man4/pci.4:1.101 --- src/share/man/man4/pci.4:1.100 Wed Dec 12 08:12:18 2018 +++ src/share/man/man4/pci.4 Sun Dec 8 02:54:54 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: pci.4,v 1.100 2018/12/12 08:12:18 wiz Exp $ +.\" $NetBSD: pci.4,v 1.101 2019/12/08 02:54:54 nia Exp $ .\" .\" Copyright (c) 1997 Jason R. Thorpe. All rights reserved. .\" Copyright (c) 1997 Jonathan Stone @@ -369,6 +369,8 @@ ESS Maestro-1/2/2e PCI AC'97 Audio Accel ESS Solo-1 PCI AudioDrive audio device. .It fms Forte Media FM801 audio device. +.It hdaudio +High Definition Audio Specification 1.0 device. .It neo NeoMagic MagicMedia 256 audio device. .It sv
CVS commit: src/include
Module Name:src Committed By: kre Date: Sun Dec 8 02:15:02 UTC 2019 Modified Files: src/include: monetary.h Log Message: PR lib/54744 (br...@haible.de) Add missing __END_DECLS for C++ compiles. XXX pullup -9 XXX pullup -8 (bug not present in -7). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/include/monetary.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/monetary.h diff -u src/include/monetary.h:1.3 src/include/monetary.h:1.4 --- src/include/monetary.h:1.3 Wed Aug 16 13:53:20 2017 +++ src/include/monetary.h Sun Dec 8 02:15:02 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: monetary.h,v 1.3 2017/08/16 13:53:20 joerg Exp $ */ +/* $NetBSD: monetary.h,v 1.4 2019/12/08 02:15:02 kre Exp $ */ /*- * Copyright (c) 2001 Alexey Zelkin @@ -52,6 +52,7 @@ typedef struct _locale *locale_t; __BEGIN_DECLS ssize_t strfmon_l(char * __restrict, size_t, locale_t, const char * __restrict, ...) __attribute__((__format__(__strfmon__, 4, 5))); +__END_DECLS #endif __BEGIN_DECLS
CVS commit: src/etc/rc.d
Module Name:src
Committed By: sevan
Date: Sun Dec 8 00:58:16 UTC 2019
Modified Files:
src/etc/rc.d: zfs
Log Message:
We don't need to require the presence of /etc/zfs/zpool.cache to unmount &
unload the module, just like for the start target.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/zfs
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.d/zfs
diff -u src/etc/rc.d/zfs:1.3 src/etc/rc.d/zfs:1.4
--- src/etc/rc.d/zfs:1.3 Wed Dec 4 16:46:50 2019
+++ src/etc/rc.d/zfs Sun Dec 8 00:58:16 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: zfs,v 1.3 2019/12/04 16:46:50 jmcneill Exp $
+# $NetBSD: zfs,v 1.4 2019/12/08 00:58:16 sevan Exp $
#
# PROVIDE: zfs
@@ -28,7 +28,7 @@ zfs_start()
zfs_stop()
{
- if [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then
+ if [ -x /sbin/zfs ]; then
zfs unmount -a
modunload zfs
fi
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: jmcneill
Date: Sun Dec 8 00:12:20 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sun50i_a64_ccu.c
Log Message:
Add crypto engine clock
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sun50i_a64_ccu.c
diff -u src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.20 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.21
--- src/sys/arch/arm/sunxi/sun50i_a64_ccu.c:1.20 Sun Nov 24 10:27:37 2019
+++ src/sys/arch/arm/sunxi/sun50i_a64_ccu.c Sun Dec 8 00:12:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i_a64_ccu.c,v 1.20 2019/11/24 10:27:37 jmcneill Exp $ */
+/* $NetBSD: sun50i_a64_ccu.c,v 1.21 2019/12/08 00:12:20 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: sun50i_a64_ccu.c,v 1.20 2019/11/24 10:27:37 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun50i_a64_ccu.c,v 1.21 2019/12/08 00:12:20 jmcneill Exp $");
#include
#include
@@ -60,6 +60,7 @@ __KERNEL_RCSID(1, "$NetBSD: sun50i_a64_c
#define SDMMC0_CLK_REG 0x088
#define SDMMC1_CLK_REG 0x08c
#define SDMMC2_CLK_REG 0x090
+#define CE_CLK_REG 0x09c
#define SPI0_CLK_REG 0x0a0
#define SPI1_CLK_REG 0x0a4
#define I2SPCM0_CLK_REG 0x0b0
@@ -156,6 +157,7 @@ static const char *ahb1_parents[] = { "l
static const char *ahb2_parents[] = { "ahb1", "pll_periph0" };
static const char *apb1_parents[] = { "ahb1" };
static const char *apb2_parents[] = { "losc", "hosc", "pll_periph0" };
+static const char *ce_parents[] = { "hosc", "pll_periph0", "pll_periph1", NULL };
static const char *mmc_parents[] = { "hosc", "pll_periph0_2x", "pll_periph1_2x" };
static const char *ths_parents[] = { "hosc", NULL, NULL, NULL };
static const char *de_parents[] = { "pll_periph0_2x", "pll_de" };
@@ -397,6 +399,14 @@ static struct sunxi_ccu_clk sun50i_a64_c
__BIT(31), /* enable */
SUNXI_CCU_NM_POWER_OF_TWO|SUNXI_CCU_NM_ROUND_DOWN|SUNXI_CCU_NM_DIVIDE_BY_TWO),
+ SUNXI_CCU_NM(A64_CLK_CE, "ce", ce_parents,
+ CE_CLK_REG, /* reg */
+ __BITS(17,16), /* n */
+ __BITS(3,0), /* m */
+ __BITS(25,24), /* sel */
+ __BIT(31), /* enable */
+ SUNXI_CCU_NM_POWER_OF_TWO),
+
SUNXI_CCU_DIV_GATE(A64_CLK_THS, "ths", ths_parents,
THS_CLK_REG, /* reg */
__BITS(1,0), /* div */
CVS commit: src/share/man/man9
Module Name:src Committed By: uwe Date: Sun Dec 8 00:00:59 UTC 2019 Modified Files: src/share/man/man9: atomic_loadstore.9 Log Message: Simplify markup for inline code to plain .Li in most places. Use backslashes to protetect embedded spaces in inline code to prevent filling from stretching them. Use .Fn and .Fa to refer only to things this manual page documents, they are not to be used for "a function" or "a function argument" in general. In code examples drop the empty line at the beginning of a function (mandated by the KNF when there are no variables) - it doesn't help readability here. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/atomic_loadstore.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/atomic_loadstore.9 diff -u src/share/man/man9/atomic_loadstore.9:1.4 src/share/man/man9/atomic_loadstore.9:1.5 --- src/share/man/man9/atomic_loadstore.9:1.4 Sat Dec 7 12:22:19 2019 +++ src/share/man/man9/atomic_loadstore.9 Sun Dec 8 00:00:59 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: atomic_loadstore.9,v 1.4 2019/12/07 12:22:19 wiz Exp $ +.\" $NetBSD: atomic_loadstore.9,v 1.5 2019/12/08 00:00:59 uwe Exp $ .\" .\" Copyright (c) 2019 The NetBSD Foundation .\" All rights reserved. @@ -77,7 +77,7 @@ or is combining multiple memory operations on a single object into one memory operation, such as replacing .Bd -literal -compact -*p = v; + *p = v; x = *p; .Ed by @@ -86,11 +86,11 @@ by x = v; .Ed since the compiler can prove that -.Li * Ns Fa p +.Li \&*p will yield -.Fa v +.Li v after -.Li * Ns Fa p Li = Fa v . +.Li \&*p\ =\ v . For .Em atomic memory operations, the implementation @@ -142,13 +142,17 @@ Thus, as far as any interrupt, other thr atomic memory operation is issued either all at once or not at all. .Pp For example, if a 32-bit word -.Fa w +.Va w is written with -.Li atomic_store_relaxed ( & Ns Fa w , 0x00010002 ) , +.Pp +.Dl atomic_store_relaxed(,\ 0x00010002); +.Pp then an interrupt, other thread, or other CPU reading it with -.Li atomic_load_relaxed ( & Ns Fa w ) +.Li atomic_load_relaxed() will never witness it partially written, whereas -.Fa w Li = 0x00010002 +.Pp +.Dl w\ =\ 0x00010002; +.Pp might be compiled into a pair of separate 16-bit store instructions instead of one single word-sized store instruction, in which case other threads may see the intermediate state with only one of the halves @@ -178,9 +182,9 @@ No ordering relative to memory operation guaranteed. Relaxed ordering is the default for ordinary non-atomic memory operations like -.Li * Ns Fa p +.Li "*p" and -.Li * Ns Fa p Li = Fa v . +.Li "*p = v" . .Pp Atomic operations with relaxed ordering are cheap: they are not read/modify/write atomic operations, and they do not involve any kind @@ -403,7 +407,7 @@ between the memory operations in steps\~ In fact, without .Em both release and acquire/consume, even the assignment -.Li m->z = m->x + m->y +.Li m->z\ =\ m->x\ +\ m->y in step\~1 might read values of .Li m->x and @@ -527,9 +531,13 @@ usually implies an expensive memory barr The pointer .Fa p must be aligned \(em that is, if the object it points to is -.No 2^ Ns Fa n +.\" +2\c +.ie t \s-2\v'-0.4m'n\v'+0.4m'\s+2 +.el ^n +.\" bytes long, then the low-order -.Fa n +.Ar n bits of .Fa p must be zero. @@ -583,9 +591,9 @@ must be conditional on These macros are meant to follow .Tn C11 semantics, in terms of -.Fn atomic_load_explicit +.Li atomic_load_explicit() and -.Fn atomic_store_explicit +.Li atomic_store_explicit() with the appropriate memory order specifiers, and are meant to make future adoption of the .Tn C11 @@ -596,28 +604,28 @@ Eventually it may be mandatory to use th type qualifier or equivalent for the operands. .Sh LINUX ANALOGUES The Linux kernel provides two macros -.Fn READ_ONCE x +.Li READ_ONCE(x) and -.Fn WRITE_ONCE x v +.Li WRITE_ONCE(x,\ v) which are similar to -.Li atomic_load_consume ( & Ns Fa x ) +.Li atomic_load_consume() and -.Li atomic_store_relaxed ( & Ns Fa x , Fa v ) , +.Li atomic_store_relaxed(,\ v) , respectively. However, while Linux's -.Fn READ_ONCE +.Li READ_ONCE and -.Fn WRITE_ONCE +.Li WRITE_ONCE prevent fusing, they may in some cases be torn \(em and therefore fail to guarantee atomicity \(em because: .Bl -bullet .It They do not require the address -.Li & Ns Fa x +.Li "" to be aligned. .It They do not require -.Li sizeof ( Fa x ) +.Li sizeof(x) to be at most the largest size of available atomic loads and stores on the host architecture. .El @@ -633,9 +641,9 @@ the purposes of pairing with and .Fn atomic_load_acquire or -.Fn atomic_load_consume : +.Fn atomic_load_consume . If -.Fn atomic_r/m/w +.Li atomic_r/m/w() is an atomic read/modify/write operation in .Xr atomic_ops 3 , then @@ -645,7 +653,7 @@ then .Ed .Pp functions like a release operation on -.Fa
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Sat Dec 7 21:14:36 UTC 2019
Modified Files:
src/sys/kern: kern_synch.c
Log Message:
mi_switch: move an over eager KASSERT defeated by kernel preemption.
Discovered during automated test.
To generate a diff of this commit:
cvs rdiff -u -r1.330 -r1.331 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.330 src/sys/kern/kern_synch.c:1.331
--- src/sys/kern/kern_synch.c:1.330 Sat Dec 7 17:36:33 2019
+++ src/sys/kern/kern_synch.c Sat Dec 7 21:14:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.330 2019/12/07 17:36:33 ad Exp $ */
+/* $NetBSD: kern_synch.c,v 1.331 2019/12/07 21:14:36 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.330 2019/12/07 17:36:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.331 2019/12/07 21:14:36 ad Exp $");
#include "opt_kstack.h"
#include "opt_dtrace.h"
@@ -753,6 +753,7 @@ mi_switch(lwp_t *l)
* Note that, unless the caller disabled preemption, we can
* be preempted at any time after this splx().
*/
+ KASSERT(l->l_cpu == ci);
splx(oldspl);
} else {
/* Nothing to do - just unlock and return. */
@@ -763,9 +764,7 @@ mi_switch(lwp_t *l)
lwp_unlock(l);
}
- /* Only now is it safe to consider l_cpu again. */
KASSERT(l == curlwp);
- KASSERT(l->l_cpu == ci);
KASSERT(l->l_stat == LSONPROC);
SYSCALL_TIME_WAKEUP(l);
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Sat Dec 7 19:50:34 UTC 2019
Modified Files:
src/sys/kern: subr_kcov.c
Log Message:
Revert the in_interrupt() change to use again the x86 specific code
This is prerequisite for kMSan and upcoming kernel changes.
Discussed with
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/subr_kcov.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/subr_kcov.c
diff -u src/sys/kern/subr_kcov.c:1.10 src/sys/kern/subr_kcov.c:1.11
--- src/sys/kern/subr_kcov.c:1.10 Sun Dec 1 17:41:11 2019
+++ src/sys/kern/subr_kcov.c Sat Dec 7 19:50:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kcov.c,v 1.10 2019/12/01 17:41:11 kamil Exp $ */
+/* $NetBSD: subr_kcov.c,v 1.11 2019/12/07 19:50:33 kamil Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -38,7 +38,6 @@
#include
#include
-#include
#include
#include
#include
@@ -343,7 +342,7 @@ out:
static inline bool __nomsan
in_interrupt(void)
{
- return cpu_intr_p();
+ return curcpu()->ci_idepth >= 0;
}
void __sanitizer_cov_trace_pc(void);
CVS commit: src/external/bsd/libproc/dist
Module Name:src
Committed By: kamil
Date: Sat Dec 7 19:38:29 UTC 2019
Modified Files:
src/external/bsd/libproc/dist: proc_util.c
Log Message:
Switch proc_getlwpstatus from PT_LWPINFO to PT_GET_SIGINFO for NetBSD
PT_LWPINFO from FreeBSD is almost never intended to be expressed with
PT_LWPINFO in NetBSD. PT_GET_SIGINFO reads siginfo_t with the signal
information about the event, on FreeBSD siginfo_t is merged into
ptrace_lwpinfo and returns the thread that received the event (not the
first one in a list like on NetBSD).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libproc/dist/proc_util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libproc/dist/proc_util.c
diff -u src/external/bsd/libproc/dist/proc_util.c:1.6 src/external/bsd/libproc/dist/proc_util.c:1.7
--- src/external/bsd/libproc/dist/proc_util.c:1.6 Fri Jun 9 01:17:25 2017
+++ src/external/bsd/libproc/dist/proc_util.c Sat Dec 7 19:38:29 2019
@@ -224,42 +224,50 @@ proc_read(struct proc_handle *phdl, void
const lwpstatus_t *
proc_getlwpstatus(struct proc_handle *phdl)
{
- struct ptrace_lwpinfo lwpinfo;
lwpstatus_t *psp = >lwps;
siginfo_t *siginfo;
+
+#ifdef PT_GET_SIGINFO
+ struct ptrace_siginfo si;
+
+ if (ptrace(PT_GET_SIGINFO, phdl->pid, (void *),
+ sizeof(si)) < 0)
+ return (NULL);
+
+ siginfo = _siginfo;
+ if (siginfo->si_signo == SIGTRAP &&
+ (siginfo->si_code == TRAP_BRKPT ||
+ siginfo->si_code == TRAP_TRACE)) {
+ psp->pr_why = PR_FAULTED;
+ psp->pr_what = FLTBPT;
+ } else if (siginfo->si_signo == SIGTRAP &&
+ (siginfo->si_code == TRAP_SCE)) {
+ psp->pr_why = PR_SYSENTRY;
+ } else if (siginfo->si_signo == SIGTRAP &&
+ (siginfo->si_code == TRAP_SCX)) {
+ psp->pr_why = PR_SYSEXIT;
+ } else {
+ psp->pr_why = PR_SIGNALLED;
+ psp->pr_what = siginfo->si_signo;
+ }
+#else
+ struct ptrace_lwpinfo lwpinfo;
bool have_siginfo, sysentry, sysexit;
if (phdl == NULL)
return (NULL);
+
lwpinfo.pl_lwpid = 0;
if (ptrace(PT_LWPINFO, phdl->pid, (void *),
sizeof(lwpinfo)) < 0)
return (NULL);
-#ifdef PL_FLAG_SI
have_siginfo = (lwpinfo.pl_flags & PL_FLAG_SI) != 0;
sysentry = (lwpinfo.pl_flags & PL_FLAG_SCE) != 0;
sysexit = (lwpinfo.pl_flags & PL_FLAG_SCX) != 0;
-#endif
-#ifdef PT_GET_SIGINFO
- have_siginfo = 1;
- sysentry = 0;
- sysexit = 0;
-#endif
if (lwpinfo.pl_event == PL_EVENT_SIGNAL && have_siginfo) {
-#ifdef PL_FLAG_SI
siginfo = _siginfo;
-#endif
-#ifdef PT_GET_SIGINFO
- struct ptrace_siginfo si;
-
- if (ptrace(PT_GET_SIGINFO, phdl->pid, (void *),
- sizeof(si)) < 0)
- return (NULL);
-
- siginfo = _siginfo;
-#endif
if (siginfo->si_signo == SIGTRAP &&
(siginfo->si_code == TRAP_BRKPT ||
siginfo->si_code == TRAP_TRACE)) {
@@ -274,5 +282,6 @@ proc_getlwpstatus(struct proc_handle *ph
} else if (sysexit) {
psp->pr_why = PR_SYSEXIT;
}
+#endif
return (psp);
}
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: jmcneill
Date: Sat Dec 7 17:56:08 UTC 2019
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
sys/atomic.h for membar_*
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/uvm/pmap/pmap_pvt.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/uvm/pmap/pmap_pvt.c
diff -u src/sys/uvm/pmap/pmap_pvt.c:1.3 src/sys/uvm/pmap/pmap_pvt.c:1.4
--- src/sys/uvm/pmap/pmap_pvt.c:1.3 Sun Feb 7 18:41:25 2016
+++ src/sys/uvm/pmap/pmap_pvt.c Sat Dec 7 17:56:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_pvt.c,v 1.3 2016/02/07 18:41:25 riastradh Exp $ */
+/* $NetBSD: pmap_pvt.c,v 1.4 2019/12/07 17:56:08 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
*/
#include
-__RCSID("$NetBSD: pmap_pvt.c,v 1.3 2016/02/07 18:41:25 riastradh Exp $");
+__RCSID("$NetBSD: pmap_pvt.c,v 1.4 2019/12/07 17:56:08 jmcneill Exp $");
#include
#include
+#include
#include
#include
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Sat Dec 7 17:36:33 UTC 2019 Modified Files: src/sys/kern: kern_synch.c Log Message: mi_switch: move LOCKDEBUG_BARRIER later to accomodate holding two locks on entry. To generate a diff of this commit: cvs rdiff -u -r1.329 -r1.330 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.329 src/sys/kern/kern_synch.c:1.330 --- src/sys/kern/kern_synch.c:1.329 Fri Dec 6 21:36:10 2019 +++ src/sys/kern/kern_synch.c Sat Dec 7 17:36:33 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_synch.c,v 1.329 2019/12/06 21:36:10 ad Exp $ */ +/* $NetBSD: kern_synch.c,v 1.330 2019/12/07 17:36:33 ad Exp $ */ /*- * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019 @@ -69,7 +69,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.329 2019/12/06 21:36:10 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.330 2019/12/07 17:36:33 ad Exp $"); #include "opt_kstack.h" #include "opt_dtrace.h" @@ -525,7 +525,6 @@ mi_switch(lwp_t *l) KASSERT(lwp_locked(l, NULL)); KASSERT(kpreempt_disabled()); KASSERT(mutex_owned(curcpu()->ci_schedstate.spc_mutex)); - LOCKDEBUG_BARRIER(l->l_mutex, 1); kstack_check_magic(l); @@ -647,6 +646,9 @@ mi_switch(lwp_t *l) mutex_spin_exit(spc->spc_mutex); } + /* We're down to only one lock, so do debug checks. */ + LOCKDEBUG_BARRIER(l->l_mutex, 1); + /* * Mark that context switch is going to be performed * for this LWP, to protect it from being switched @@ -756,6 +758,8 @@ mi_switch(lwp_t *l) /* Nothing to do - just unlock and return. */ mutex_spin_exit(spc->spc_mutex); l->l_pflag &= ~LP_PREEMPTING; + /* We're down to only one lock, so do debug checks. */ + LOCKDEBUG_BARRIER(l->l_mutex, 1); lwp_unlock(l); }
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Sat Dec 7 16:38:42 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: monitor.c
Log Message:
need pfilter.h
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/monitor.c
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/openssh/dist/monitor.c
diff -u src/crypto/external/bsd/openssh/dist/monitor.c:1.31 src/crypto/external/bsd/openssh/dist/monitor.c:1.32
--- src/crypto/external/bsd/openssh/dist/monitor.c:1.31 Sat Dec 7 11:32:22 2019
+++ src/crypto/external/bsd/openssh/dist/monitor.c Sat Dec 7 11:38:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: monitor.c,v 1.31 2019/12/07 16:32:22 christos Exp $ */
+/* $NetBSD: monitor.c,v 1.32 2019/12/07 16:38:42 christos Exp $ */
/* $OpenBSD: monitor.c,v 1.199 2019/10/07 23:10:38 djm Exp $ */
/*
* Copyright 2002 Niels Provos
@@ -27,7 +27,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: monitor.c,v 1.31 2019/12/07 16:32:22 christos Exp $");
+__RCSID("$NetBSD: monitor.c,v 1.32 2019/12/07 16:38:42 christos Exp $");
#include
#include
#include
@@ -85,6 +85,8 @@ __RCSID("$NetBSD: monitor.c,v 1.31 2019/
#include "match.h"
#include "ssherr.h"
+#include "pfilter.h"
+
#ifdef GSSAPI
static Gssctxt *gsscontext = NULL;
#endif
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Sat Dec 7 16:32:22 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: auth2.c monitor.c
Log Message:
Add some more pfilter_notify() calls where authentication attempts fail.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/auth2.c
cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/monitor.c
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/openssh/dist/auth2.c
diff -u src/crypto/external/bsd/openssh/dist/auth2.c:1.20 src/crypto/external/bsd/openssh/dist/auth2.c:1.21
--- src/crypto/external/bsd/openssh/dist/auth2.c:1.20 Sat Oct 12 14:32:22 2019
+++ src/crypto/external/bsd/openssh/dist/auth2.c Sat Dec 7 11:32:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: auth2.c,v 1.20 2019/10/12 18:32:22 christos Exp $ */
+/* $NetBSD: auth2.c,v 1.21 2019/12/07 16:32:22 christos Exp $ */
/* $OpenBSD: auth2.c,v 1.157 2019/09/06 04:53:27 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth2.c,v 1.20 2019/10/12 18:32:22 christos Exp $");
+__RCSID("$NetBSD: auth2.c,v 1.21 2019/12/07 16:32:22 christos Exp $");
#include
#include
@@ -440,8 +440,10 @@ userauth_finish(struct ssh *ssh, int aut
} else {
/* Allow initial try of "none" auth without failure penalty */
if (!partial && !authctxt->server_caused_failure &&
- (authctxt->attempt > 1 || strcmp(method, "none") != 0))
+ (authctxt->attempt > 1 || strcmp(method, "none") != 0)) {
authctxt->failures++;
+ pfilter_notify(1);
+ }
if (authctxt->failures >= options.max_authtries)
auth_maxtries_exceeded(ssh);
methods = authmethods_get(authctxt);
Index: src/crypto/external/bsd/openssh/dist/monitor.c
diff -u src/crypto/external/bsd/openssh/dist/monitor.c:1.30 src/crypto/external/bsd/openssh/dist/monitor.c:1.31
--- src/crypto/external/bsd/openssh/dist/monitor.c:1.30 Sat Oct 12 14:32:22 2019
+++ src/crypto/external/bsd/openssh/dist/monitor.c Sat Dec 7 11:32:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: monitor.c,v 1.30 2019/10/12 18:32:22 christos Exp $ */
+/* $NetBSD: monitor.c,v 1.31 2019/12/07 16:32:22 christos Exp $ */
/* $OpenBSD: monitor.c,v 1.199 2019/10/07 23:10:38 djm Exp $ */
/*
* Copyright 2002 Niels Provos
@@ -27,7 +27,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: monitor.c,v 1.30 2019/10/12 18:32:22 christos Exp $");
+__RCSID("$NetBSD: monitor.c,v 1.31 2019/12/07 16:32:22 christos Exp $");
#include
#include
#include
@@ -320,8 +320,10 @@ monitor_child_preauth(struct ssh *ssh, s
if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) {
auth_log(ssh, authenticated, partial,
auth_method, auth_submethod);
- if (!partial && !authenticated)
+ if (!partial && !authenticated) {
+pfilter_notify(1);
authctxt->failures++;
+ }
if (authenticated || partial) {
auth2_update_session_info(authctxt,
auth_method, auth_submethod);
@@ -1223,6 +1225,7 @@ mm_answer_keyallowed(struct ssh *ssh, in
} else {
/* Log failed attempt */
auth_log(ssh, 0, 0, auth_method, NULL);
+ pfilter_notify(1);
free(cuser);
free(chost);
}
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Sat Dec 7 16:25:36 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: auth.c
Log Message:
don't call pfilter_notify() from authz_log(). Logging should not have side
effects (kim@)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/auth.c
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/openssh/dist/auth.c
diff -u src/crypto/external/bsd/openssh/dist/auth.c:1.25 src/crypto/external/bsd/openssh/dist/auth.c:1.26
--- src/crypto/external/bsd/openssh/dist/auth.c:1.25 Sat Oct 12 14:32:22 2019
+++ src/crypto/external/bsd/openssh/dist/auth.c Sat Dec 7 11:25:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: auth.c,v 1.25 2019/10/12 18:32:22 christos Exp $ */
+/* $NetBSD: auth.c,v 1.26 2019/12/07 16:25:36 christos Exp $ */
/* $OpenBSD: auth.c,v 1.141 2019/10/02 00:42:30 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.25 2019/10/12 18:32:22 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.26 2019/12/07 16:25:36 christos Exp $");
#include
#include
#include
@@ -408,8 +408,6 @@ auth_log(struct ssh *ssh, int authentica
extra != NULL ? extra : "");
free(extra);
- if (!authctxt->postponed)
- pfilter_notify(!authenticated);
}
void
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Sat Dec 7 16:25:05 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: sshd.c
Log Message:
don't call pfilter_notify() twice in grace_alarm_handler(). (kim@)
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/sshd.c
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/openssh/dist/sshd.c
diff -u src/crypto/external/bsd/openssh/dist/sshd.c:1.36 src/crypto/external/bsd/openssh/dist/sshd.c:1.37
--- src/crypto/external/bsd/openssh/dist/sshd.c:1.36 Sat Oct 12 14:32:22 2019
+++ src/crypto/external/bsd/openssh/dist/sshd.c Sat Dec 7 11:25:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sshd.c,v 1.36 2019/10/12 18:32:22 christos Exp $ */
+/* $NetBSD: sshd.c,v 1.37 2019/12/07 16:25:05 christos Exp $ */
/* $OpenBSD: sshd.c,v 1.537 2019/06/28 13:35:04 deraadt Exp $ */
/*
* Author: Tatu Ylonen
@@ -44,7 +44,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshd.c,v 1.36 2019/10/12 18:32:22 christos Exp $");
+__RCSID("$NetBSD: sshd.c,v 1.37 2019/12/07 16:25:05 christos Exp $");
#include
#include
#include
@@ -370,7 +370,6 @@ grace_alarm_handler(int sig)
/* XXX pre-format ipaddr/port so we don't need to access active_state */
/* Log error and exit. */
- pfilter_notify(1);
sigdie("Timeout before authentication for %s port %d",
ssh_remote_ipaddr(the_active_state),
ssh_remote_port(the_active_state));
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sat Dec 7 16:13:39 UTC 2019
Modified Files:
src/sys/dev/dm: device-mapper.c
Log Message:
dm: Fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/dm/device-mapper.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/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.46 src/sys/dev/dm/device-mapper.c:1.47
--- src/sys/dev/dm/device-mapper.c:1.46 Fri Dec 6 16:33:47 2019
+++ src/sys/dev/dm/device-mapper.c Sat Dec 7 16:13:39 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: device-mapper.c,v 1.46 2019/12/06 16:33:47 tkusumi Exp $ */
+/*$NetBSD: device-mapper.c,v 1.47 2019/12/07 16:13:39 tkusumi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@ static const struct cmd_function {
{ .cmd = "reload", .fn = dm_table_load_ioctl,.allowed = 0 },
{ .cmd = "status", .fn = dm_table_status_ioctl, .allowed = 1 },
{ .cmd = "table", .fn = dm_table_status_ioctl, .allowed = 1 },
- { .cmd = NULL, .fn = NULL, .allowed = 0 }
+ { .cmd = NULL, .fn = NULL, .allowed = 0 },
};
#ifdef _MODULE
@@ -431,18 +431,17 @@ dm_ioctl_switch(u_long cmd)
aprint_debug("dm NETBSD_DM_IOCTL called\n");
break;
default:
- aprint_debug("dm unknown ioctl called\n");
- return ENOTTY;
- break; /* NOT REACHED */
+ aprint_debug("dm unknown ioctl called\n");
+ return ENOTTY;
+ break; /* NOT REACHED */
}
- return 0;
+ return 0;
}
- /*
- * Check for disk specific ioctls.
- */
-
+/*
+ * Check for disk specific ioctls.
+ */
static int
disk_ioctl_switch(dev_t dev, u_long cmd, void *data)
{
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sat Dec 7 16:00:36 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip: rk3399_pcie.c
Log Message:
Use bus_space_{peek,poke}_4 for pci conf reg access.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/rockchip/rk3399_pcie.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk3399_pcie.c
diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.7 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.8
--- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.7 Fri Nov 29 00:36:22 2019
+++ src/sys/arch/arm/rockchip/rk3399_pcie.c Sat Dec 7 16:00:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.7 2019/11/29 00:36:22 jmcneill Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.8 2019/12/07 16:00:36 jmcneill Exp $ */
/*
* Copyright (c) 2018 Mark Kettenis
*
@@ -17,7 +17,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.7 2019/11/29 00:36:22 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.8 2019/12/07 16:00:36 jmcneill Exp $");
#include
#include
@@ -121,10 +121,10 @@ __KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.
bus_space_read_4((sc)->sc_iot, (sc)->sc_ioh, (reg))
#define HWRITE4(sc, reg, val) \
bus_space_write_4((sc)->sc_iot, (sc)->sc_ioh, (reg), (val))
-#define AXIREAD4(sc, reg) \
- bus_space_read_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg))
-#define AXIWRITE4(sc, reg, val) \
- bus_space_write_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg), (val))
+#define AXIPEEK4(sc, reg, valp) \
+ bus_space_peek_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg), (valp))
+#define AXIPOKE4(sc, reg, val) \
+ bus_space_poke_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg), (val))
struct rkpcie_softc {
struct pcihost_softc sc_phsc;
@@ -540,8 +540,12 @@ rkpcie_conf_read(void *v, pcitag_t tag,
if (bus == phsc->sc_bus_min)
return HREAD4(sc, PCIE_RC_NORMAL_BASE + reg);
- else
- return AXIREAD4(sc, reg);
+ else {
+ uint32_t val;
+ if (AXIPEEK4(sc, reg, ) != 0)
+ return 0x;
+ return val;
+ }
}
void
@@ -563,7 +567,7 @@ rkpcie_conf_write(void *v, pcitag_t tag,
if (bus == phsc->sc_bus_min)
HWRITE4(sc, PCIE_RC_NORMAL_BASE + reg, data);
else
- AXIWRITE4(sc, reg, data);
+ AXIPOKE4(sc, reg, data);
}
static int
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Dec 7 16:00:09 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: std.generic64 Log Message: Define __BUS_SPACE_HAS_PROBING_METHODS To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/std.generic64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/std.generic64 diff -u src/sys/arch/evbarm/conf/std.generic64:1.11 src/sys/arch/evbarm/conf/std.generic64:1.12 --- src/sys/arch/evbarm/conf/std.generic64:1.11 Fri Sep 6 21:09:11 2019 +++ src/sys/arch/evbarm/conf/std.generic64 Sat Dec 7 16:00:09 2019 @@ -1,4 +1,4 @@ -# $NetBSD: std.generic64,v 1.11 2019/09/06 21:09:11 jmcneill Exp $ +# $NetBSD: std.generic64,v 1.12 2019/12/07 16:00:09 jmcneill Exp $ # # generic NetBSD/evbarm64 with FDT support @@ -23,6 +23,7 @@ options _ARM32_NEED_BUS_DMA_BOUNCE options __HAVE_GENERIC_CPU_INITCLOCKS options __HAVE_PCI_CONF_HOOK options __HAVE_PCI_MSI_MSIX +options __BUS_SPACE_HAS_PROBING_METHODS # XXXNH not yet #options __HAVE_CPU_UAREA_ALLOC_IDLELWP
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sat Dec 7 15:28:39 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_dev.c dm_pdev.c dm_table.c dm_target.c
dm_target_error.c dm_target_linear.c dm_target_mirror.c
dm_target_snapshot.c dm_target_stripe.c dm_target_zero.c
src/sys/dev/dm/doc: locking.txt
Log Message:
dm: Fix strange pointer declarations
Should be "type *name" or "type* name", but not "type * name".
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dm/dm_dev.c \
src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dm/dm_pdev.c \
src/sys/dev/dm/dm_target_zero.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dm/dm_target.c \
src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dm/doc/locking.txt
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/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.33 src/sys/dev/dm/dm.h:1.34
--- src/sys/dev/dm/dm.h:1.33 Thu Dec 5 15:52:39 2019
+++ src/sys/dev/dm/dm.h Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm.h,v 1.33 2019/12/05 15:52:39 tkusumi Exp $ */
+/*$NetBSD: dm.h,v 1.34 2019/12/07 15:28:39 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -276,7 +276,7 @@ int dm_target_init(void);
/* dm_target_linear.c */
int dm_target_linear_init(dm_dev_t *, void**, char *);
-char * dm_target_linear_status(void *);
+char *dm_target_linear_status(void *);
int dm_target_linear_strategy(dm_table_entry_t *, struct buf *);
int dm_target_linear_sync(dm_table_entry_t *);
int dm_target_linear_deps(dm_table_entry_t *, prop_array_t);
@@ -289,7 +289,7 @@ uint64_t atoi(const char *);
/* dm_target_stripe.c */
int dm_target_stripe_init(dm_dev_t *, void**, char *);
-char * dm_target_stripe_status(void *);
+char *dm_target_stripe_status(void *);
int dm_target_stripe_strategy(dm_table_entry_t *, struct buf *);
int dm_target_stripe_sync(dm_table_entry_t *);
int dm_target_stripe_deps(dm_table_entry_t *, prop_array_t);
@@ -305,7 +305,7 @@ int dm_table_destroy(dm_table_head_t *,
uint64_t dm_table_size(dm_table_head_t *);
uint64_t dm_inactive_table_size(dm_table_head_t *);
void dm_table_disksize(dm_table_head_t *, uint64_t *, unsigned *);
-dm_table_t * dm_table_get_entry(dm_table_head_t *, uint8_t);
+dm_table_t *dm_table_get_entry(dm_table_head_t *, uint8_t);
int dm_table_get_target_count(dm_table_head_t *, uint8_t);
void dm_table_release(dm_table_head_t *, uint8_t s);
void dm_table_switch_tables(dm_table_head_t *);
Index: src/sys/dev/dm/dm_dev.c
diff -u src/sys/dev/dm/dm_dev.c:1.13 src/sys/dev/dm/dm_dev.c:1.14
--- src/sys/dev/dm/dm_dev.c:1.13 Wed Dec 4 15:31:12 2019
+++ src/sys/dev/dm/dm_dev.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_dev.c,v 1.13 2019/12/04 15:31:12 tkusumi Exp $ */
+/*$NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.13 2019/12/04 15:31:12 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $");
#include
#include
@@ -54,7 +54,7 @@ static kmutex_t dm_dev_mutex;
/* dm_dev_mutex must be holdby caller before using disable_dev. */
__inline static void
-disable_dev(dm_dev_t * dmv)
+disable_dev(dm_dev_t *dmv)
{
TAILQ_REMOVE(_dev_list, dmv, next_devlist);
mutex_enter(>dev_mtx);
@@ -175,7 +175,7 @@ dm_dev_lookup_uuid(const char *dm_dev_uu
* Insert new device to the global list of devices.
*/
int
-dm_dev_insert(dm_dev_t * dev)
+dm_dev_insert(dm_dev_t *dev)
{
dm_dev_t *dmv;
int r;
@@ -331,7 +331,7 @@ dm_dev_alloc(void)
* Freed device entry.
*/
int
-dm_dev_free(dm_dev_t * dmv)
+dm_dev_free(dm_dev_t *dmv)
{
KASSERT(dmv != NULL);
@@ -348,7 +348,7 @@ dm_dev_free(dm_dev_t * dmv)
}
void
-dm_dev_busy(dm_dev_t * dmv)
+dm_dev_busy(dm_dev_t *dmv)
{
mutex_enter(>dev_mtx);
dmv->ref_cnt++;
@@ -356,7 +356,7 @@ dm_dev_busy(dm_dev_t * dmv)
}
void
-dm_dev_unbusy(dm_dev_t * dmv)
+dm_dev_unbusy(dm_dev_t *dmv)
{
KASSERT(dmv->ref_cnt != 0);
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.13 src/sys/dev/dm/dm_target_mirror.c:1.14
--- src/sys/dev/dm/dm_target_mirror.c:1.13 Fri Dec 6 16:11:59 2019
+++ src/sys/dev/dm/dm_target_mirror.c Sat Dec 7 15:28:39 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.13 2019/12/06 16:11:59 tkusumi Exp $*/
+/*$NetBSD:
CVS commit: src
Module Name:src Committed By: riastradh Date: Sat Dec 7 15:14:00 UTC 2019 Modified Files: src/distrib/sets/lists/comp: mi src/lib/libc/atomic: Makefile.inc Log Message: Add missing MLINK for membar_datadep_consumer(3). Detected by the indefatigable wizd. To generate a diff of this commit: cvs rdiff -u -r1.2295 -r1.2296 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.3 -r1.4 src/lib/libc/atomic/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/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2295 src/distrib/sets/lists/comp/mi:1.2296 --- src/distrib/sets/lists/comp/mi:1.2295 Sat Nov 30 00:02:15 2019 +++ src/distrib/sets/lists/comp/mi Sat Dec 7 15:13:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2295 2019/11/30 00:02:15 riastradh Exp $ +# $NetBSD: mi,v 1.2296 2019/12/07 15:13:59 riastradh Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -8430,6 +8430,7 @@ ./usr/share/man/cat3/mdc2.0 comp-obsolete obsolete ./usr/share/man/cat3/mdoc.0 comp-obsolete obsolete ./usr/share/man/cat3/membar_consumer.0 comp-c-catman .cat +./usr/share/man/cat3/membar_datadep_consumer.0 comp-c-catman .cat ./usr/share/man/cat3/membar_enter.0 comp-c-catman .cat ./usr/share/man/cat3/membar_exit.0 comp-c-catman .cat ./usr/share/man/cat3/membar_ops.0 comp-c-catman .cat @@ -16423,6 +16424,7 @@ ./usr/share/man/html3/md5.html comp-c-htmlman html ./usr/share/man/html3/mdoc.html comp-obsolete obsolete ./usr/share/man/html3/membar_consumer.html comp-c-htmlman html +./usr/share/man/html3/membar_datadep_consumer.html comp-c-htmlman html ./usr/share/man/html3/membar_enter.html comp-c-htmlman html ./usr/share/man/html3/membar_exit.html comp-c-htmlman html ./usr/share/man/html3/membar_ops.html comp-c-htmlman html @@ -24423,6 +24425,7 @@ ./usr/share/man/man3/mdc2.3 comp-obsolete obsolete ./usr/share/man/man3/mdoc.3 comp-obsolete obsolete ./usr/share/man/man3/membar_consumer.3 comp-c-man .man +./usr/share/man/man3/membar_datadep_consumer.3 comp-c-man .man ./usr/share/man/man3/membar_enter.3 comp-c-man .man ./usr/share/man/man3/membar_exit.3 comp-c-man .man ./usr/share/man/man3/membar_ops.3 comp-c-man .man Index: src/lib/libc/atomic/Makefile.inc diff -u src/lib/libc/atomic/Makefile.inc:1.3 src/lib/libc/atomic/Makefile.inc:1.4 --- src/lib/libc/atomic/Makefile.inc:1.3 Sat Aug 27 08:03:13 2016 +++ src/lib/libc/atomic/Makefile.inc Sat Dec 7 15:13:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2016/08/27 08:03:13 dholland Exp $ +# $NetBSD: Makefile.inc,v 1.4 2019/12/07 15:13:59 riastradh Exp $ # from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 # gen sources @@ -79,4 +79,5 @@ MLINKS+=atomic_add.3 atomic_add_32.3 \ membar_ops.3 membar_exit.3 \ membar_ops.3 membar_producer.3 \ membar_ops.3 membar_consumer.3 \ + membar_ops.3 membar_datadep_consumer.3 \ membar_ops.3 membar_sync.3
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: riastradh Date: Sat Dec 7 14:55:58 UTC 2019 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: Restore call to pserialize_init. We need it after all for psz_lock on the event counter. To generate a diff of this commit: cvs rdiff -u -r1.336 -r1.337 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.336 src/sys/rump/librump/rumpkern/rump.c:1.337 --- src/sys/rump/librump/rumpkern/rump.c:1.336 Tue Dec 3 05:07:49 2019 +++ src/sys/rump/librump/rumpkern/rump.c Sat Dec 7 14:55:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.336 2019/12/03 05:07:49 riastradh Exp $ */ +/* $NetBSD: rump.c,v 1.337 2019/12/07 14:55:58 riastradh Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.336 2019/12/03 05:07:49 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.337 2019/12/07 14:55:58 riastradh Exp $"); #include #define ELFSIZE ARCH_ELFSIZE @@ -73,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.3 #include #include #include +#include #include #include @@ -305,6 +306,7 @@ rump_init(void) kprintf_init(); percpu_init(); + pserialize_init(); kauth_init();
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sat Dec 7 13:33:45 UTC 2019
Modified Files:
src/usr.sbin/sysinst: disklabel.c
Log Message:
Relax restrictions on packnames, as disklabel(8) does not do full decoding
for the tag field.
Fix quoting of command args.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/sysinst/disklabel.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/disklabel.c
diff -u src/usr.sbin/sysinst/disklabel.c:1.16 src/usr.sbin/sysinst/disklabel.c:1.17
--- src/usr.sbin/sysinst/disklabel.c:1.16 Fri Dec 6 19:36:22 2019
+++ src/usr.sbin/sysinst/disklabel.c Sat Dec 7 13:33:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.16 2019/12/06 19:36:22 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.17 2019/12/07 13:33:45 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -262,13 +262,32 @@ disklabel_parts_read(const char *disk, d
return >dp;
}
+/*
+ * Escape a string for usage as a tag name in a capfile(5),
+ * we really know there is enough space in the destination buffer...
+ */
+static void
+escape_capfile(char *dest, const char *src, size_t len)
+{
+ while (*src && len > 0) {
+ if (*src == ':')
+ *dest++ = ' ';
+ else
+ *dest++ = *src;
+ src++;
+ len--;
+ }
+ *dest = 0;
+}
+
static bool
disklabel_write_to_disk(struct disk_partitions *arg)
{
struct disklabel_disk_partitions *parts =
(struct disklabel_disk_partitions*)arg;
FILE *f;
- char fname[PATH_MAX], packname[sizeof(parts->l.d_packname)+1];
+ char fname[PATH_MAX], packname[sizeof(parts->l.d_packname)+1],
+ disktype[sizeof(parts->l.d_typename)+1];
int i, rv = 0;
const char *disk = parts->dp.disk, *s;
const struct partition *lp;
@@ -295,19 +314,14 @@ disklabel_write_to_disk(struct disk_part
*d = *s;
}
}
- parts->l.d_typename[sizeof(parts->l.d_typename)-1] = 0;
- for (d = parts->l.d_typename; *d; d++) {
- if (isalnum((unsigned char)*d) || *d == '-')
- continue;
- *d = 0;
- break;
- }
/* we need a valid disk type name, so enforce an arbitrary if
* above did not yield a usable one */
if (strlen(parts->l.d_typename) == 0)
strncpy(parts->l.d_typename, "SCSI",
sizeof(parts->l.d_typename));
+ escape_capfile(disktype, parts->l.d_typename,
+ sizeof(parts->l.d_typename));
sprintf(fname, "/tmp/disklabel.%u", getpid());
f = fopen(fname, "w");
@@ -317,7 +331,7 @@ disklabel_write_to_disk(struct disk_part
lp = parts->l.d_partitions;
scripting_fprintf(NULL, "cat <%s\n", fname);
scripting_fprintf(f, "%s|NetBSD installation generated:\\\n",
- parts->l.d_typename);
+ disktype);
scripting_fprintf(f, "\t:nc#%d:nt#%d:ns#%d:\\\n",
parts->l.d_ncylinders, parts->l.d_ntracks, parts->l.d_nsectors);
scripting_fprintf(f, "\t:sc#%d:su#%" PRIu32 ":\\\n",
@@ -359,8 +373,8 @@ disklabel_write_to_disk(struct disk_part
*/
#ifdef DISKLABEL_CMD
/* disklabel the disk */
- rv = run_program(RUN_DISPLAY, "%s -f %s %s %s %s",
- DISKLABEL_CMD, fname, disk, parts->l.d_typename, packname);
+ rv = run_program(RUN_DISPLAY, "%s -f %s %s '%s' '%s'",
+ DISKLABEL_CMD, fname, disk, disktype, packname);
#endif
unlink(fname);
CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif
Module Name:src Committed By: jmcneill Date: Sat Dec 7 13:31:41 UTC 2019 Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif: os.h Log Message: Fix build for ports without __BUS_SPACE_HAS_STREAM_METHODS defined To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.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/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.5 --- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h:1.4 Mon Aug 27 07:35:13 2018 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvif/os.h Sat Dec 7 13:31:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: os.h,v 1.4 2018/08/27 07:35:13 riastradh Exp $ */ +/* $NetBSD: os.h,v 1.5 2019/12/07 13:31:41 jmcneill Exp $ */ #ifndef __NOUVEAU_OS_H__ #define __NOUVEAU_OS_H__ @@ -74,4 +74,14 @@ #endif /* !ioread32_native */ #endif +#ifdef __NetBSD__ +#include +#ifndef __BUS_SPACE_HAS_STREAM_METHODS +#define bus_space_read_stream_2 bus_space_read_2 +#define bus_space_read_stream_4 bus_space_read_4 +#define bus_space_write_stream_2 bus_space_write_2 +#define bus_space_write_stream_4 bus_space_write_4 +#endif +#endif + #endif
CVS commit: src/lib/libutil
Module Name:src Committed By: wiz Date: Sat Dec 7 12:47:07 UTC 2019 Modified Files: src/lib/libutil: snprintb.3 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libutil/snprintb.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/snprintb.3 diff -u src/lib/libutil/snprintb.3:1.22 src/lib/libutil/snprintb.3:1.23 --- src/lib/libutil/snprintb.3:1.22 Fri Dec 6 19:31:52 2019 +++ src/lib/libutil/snprintb.3 Sat Dec 7 12:47:07 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: snprintb.3,v 1.22 2019/12/06 19:31:52 christos Exp $ +.\" $NetBSD: snprintb.3,v 1.23 2019/12/07 12:47:07 wiz Exp $ .\" .\" Copyright (c) 1998 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -191,7 +191,7 @@ or have not matched. .Ar FMT may contain a -.Ft uintmax_t +.Ft uintmax_t format specification that prints the value that did not match, since the field can be more than 32 bits wide. .El
CVS commit: src/external/bsd/mdocml/dist
Module Name:src Committed By: wiz Date: Sat Dec 7 12:45:11 UTC 2019 Modified Files: src/external/bsd/mdocml/dist: mdoc_argv.c Log Message: Reduce diff to upstream. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/bsd/mdocml/dist/mdoc_argv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/mdocml/dist/mdoc_argv.c diff -u src/external/bsd/mdocml/dist/mdoc_argv.c:1.11 src/external/bsd/mdocml/dist/mdoc_argv.c:1.12 --- src/external/bsd/mdocml/dist/mdoc_argv.c:1.11 Mon Mar 11 00:15:38 2019 +++ src/external/bsd/mdocml/dist/mdoc_argv.c Sat Dec 7 12:45:11 2019 @@ -27,9 +27,9 @@ #include "mandoc_aux.h" #include "mandoc.h" #include "roff.h" -#include "roff_int.h" #include "mdoc.h" #include "libmandoc.h" +#include "roff_int.h" #include "libmdoc.h" #define MULTI_STEP 5 /* pre-allocate argument values */
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: wiz
Date: Sat Dec 7 12:45:28 UTC 2019
Modified Files:
src/external/bsd/mdocml/dist: st.c
Log Message:
Really add -isoC-2018 (not just the docs).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/mdocml/dist/st.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/st.c
diff -u src/external/bsd/mdocml/dist/st.c:1.1.1.11 src/external/bsd/mdocml/dist/st.c:1.2
--- src/external/bsd/mdocml/dist/st.c:1.1.1.11 Sun Mar 10 22:29:00 2019
+++ src/external/bsd/mdocml/dist/st.c Sat Dec 7 12:45:28 2019
@@ -53,6 +53,7 @@ LINE("-isoC-tcor1", "ISO/IEC 9899/TCOR1:
LINE("-isoC-tcor2", "ISO/IEC 9899/TCOR2:1995 (\\(lqISO\\~C90, Technical Corrigendum 2\\(rq)")
LINE("-isoC-99", "ISO/IEC 9899:1999 (\\(lqISO\\~C99\\(rq)")
LINE("-isoC-2011", "ISO/IEC 9899:2011 (\\(lqISO\\~C11\\(rq)")
+LINE("-isoC-2018", "ISO/IEC 9899:2018 (\\(lqISO\\~C18\\(rq)")
LINE("-iso9945-1-90", "ISO/IEC 9945-1:1990 (\\(lqPOSIX.1\\(rq)")
LINE("-iso9945-1-96", "ISO/IEC 9945-1:1996 (\\(lqPOSIX.1\\(rq)")
LINE("-iso9945-2-93", "ISO/IEC 9945-2:1993 (\\(lqPOSIX.2\\(rq)")
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: wiz
Date: Sat Dec 7 12:43:19 UTC 2019
Modified Files:
src/external/bsd/mdocml/dist: mdoc.c
Log Message:
Reduce diff to upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/dist/mdoc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/mdoc.c
diff -u src/external/bsd/mdocml/dist/mdoc.c:1.2 src/external/bsd/mdocml/dist/mdoc.c:1.3
--- src/external/bsd/mdocml/dist/mdoc.c:1.2 Mon Mar 11 17:59:28 2019
+++ src/external/bsd/mdocml/dist/mdoc.c Sat Dec 7 12:43:19 2019
@@ -30,9 +30,9 @@
#include "mandoc_aux.h"
#include "mandoc.h"
#include "roff.h"
-#include "roff_int.h"
#include "mdoc.h"
#include "libmandoc.h"
+#include "roff_int.h"
#include "libmdoc.h"
const char *const __mdoc_argnames[MDOC_ARG_MAX] = {
CVS commit: src/sbin/modstat
Module Name:src Committed By: wiz Date: Sat Dec 7 12:35:27 UTC 2019 Modified Files: src/sbin/modstat: modstat.8 Log Message: Remove superfluous Pp. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sbin/modstat/modstat.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/modstat/modstat.8 diff -u src/sbin/modstat/modstat.8:1.25 src/sbin/modstat/modstat.8:1.26 --- src/sbin/modstat/modstat.8:1.25 Fri Dec 6 21:45:14 2019 +++ src/sbin/modstat/modstat.8 Sat Dec 7 12:35:27 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: modstat.8,v 1.25 2019/12/06 21:45:14 pgoyette Exp $ +.\" $NetBSD: modstat.8,v 1.26 2019/12/07 12:35:27 wiz Exp $ .\" .\" Copyright (c) 1993 Christopher G. Demetriou .\" All rights reserved. @@ -76,7 +76,6 @@ In addition to listing the currently loa the information reported by .Nm includes: -.Pp .Bl -tag -width Loadaddr .It Li CLASS Module class, such as
CVS commit: src/usr.bin/mkubootimage
Module Name:src
Committed By: wiz
Date: Sat Dec 7 12:34:17 UTC 2019
Modified Files:
src/usr.bin/mkubootimage: mkubootimage.1 mkubootimage.c
Log Message:
Sync usage with man page, merge single letter options.
Limit program usage line length.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/mkubootimage/mkubootimage.1
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/mkubootimage/mkubootimage.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/mkubootimage/mkubootimage.1
diff -u src/usr.bin/mkubootimage/mkubootimage.1:1.13 src/usr.bin/mkubootimage/mkubootimage.1:1.14
--- src/usr.bin/mkubootimage/mkubootimage.1:1.13 Wed Dec 4 11:21:34 2019
+++ src/usr.bin/mkubootimage/mkubootimage.1 Sat Dec 7 12:34:17 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkubootimage.1,v 1.13 2019/12/04 11:21:34 jmcneill Exp $
+.\" $NetBSD: mkubootimage.1,v 1.14 2019/12/07 12:34:17 wiz Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -35,7 +35,7 @@
.Nd create U-Boot loader image
.Sh SYNOPSIS
.Nm
-.Op Fl h
+.Op Fl hu
.Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc Ns | Ns sh )
.Fl a Ar address
.Op Fl C Po bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none Pc
@@ -45,8 +45,7 @@
.Op Fl m Ar magic
.Fl n Ar image
.Op Fl O Po freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd Pc
-.Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns standalone )
-.Op Fl u
+.Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
.Ar source destination
.\"
.Sh DESCRIPTION
@@ -59,7 +58,7 @@ The arguments are as follows:
.Bl -tag -width indent
.It Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc Ns | Ns sh )
Defines the architecture.
-This is required for
+This is required for
.Qq uimg
format images.
.It Fl a Ar address
@@ -120,7 +119,7 @@ This is required.
Defines the operating system type.
The default OS name is
.Qq netbsd .
-.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns standalone Ns | Ns script )
+.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
Defines the image type.
This is required for
.Qq uimg
Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.26 src/usr.bin/mkubootimage/mkubootimage.c:1.27
--- src/usr.bin/mkubootimage/mkubootimage.c:1.26 Wed Dec 4 14:09:47 2019
+++ src/usr.bin/mkubootimage/mkubootimage.c Sat Dec 7 12:34:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.26 2019/12/04 14:09:47 jmcneill Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill
@@ -30,7 +30,7 @@
#endif
#include
-__RCSID("$NetBSD: mkubootimage.c,v 1.26 2019/12/04 14:09:47 jmcneill Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $");
#include
#include
@@ -264,14 +264,12 @@ get_comp_name(enum uboot_image_comp comp
__dead static void
usage(void)
{
- fprintf(stderr, "usage: mkubootimage -A "
- "");
- fprintf(stderr, " -C ");
- fprintf(stderr, " -O ");
- fprintf(stderr, " -T ");
- fprintf(stderr, " -a [-e ] [-m ] -n ");
- fprintf(stderr, " [-f ] [-u]");
- fprintf(stderr, " \n");
+ fprintf(stderr, "usage: mkubootimage [-hu] -A "
+ " -a address\n");
+ fprintf(stderr, "\t-C [-E address] [-e address]\n");
+ fprintf(stderr, "\t[-f ] [-m magic] -n image -O \n");
+ fprintf(stderr, "\t-T \n");
+ fprintf(stderr, "\tsource destination\n");
exit(EXIT_FAILURE);
}
CVS commit: src/share/man/man9
Module Name:src
Committed By: wiz
Date: Sat Dec 7 12:26:05 UTC 2019
Modified Files:
src/share/man/man9: rnd.9
Log Message:
Simplify macro usage.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/share/man/man9/rnd.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/rnd.9
diff -u src/share/man/man9/rnd.9:1.26 src/share/man/man9/rnd.9:1.27
--- src/share/man/man9/rnd.9:1.26 Wed Dec 4 03:04:43 2019
+++ src/share/man/man9/rnd.9 Sat Dec 7 12:26:05 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: rnd.9,v 1.26 2019/12/04 03:04:43 riastradh Exp $
+.\" $NetBSD: rnd.9,v 1.27 2019/12/07 12:26:05 wiz Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -78,7 +78,6 @@ to each
.Fa rnd_source ,
for example with
.Xr mutex 9 .
-.Pp
.Bl -tag -width 8n
.It Fn rndsource_setcb "krndsource_t *rnd_source" "void (*callback)(size_t, void *)" "void *cookie"
This function sets a callback to be invoked when the kernel entropy
@@ -92,7 +91,7 @@ to
.Fn rnd_attach_source
in order for the callback to be used.
The callback is invoked as
-.Fa callback Ns Li "(" Ns Fa nbytes Ns Li "," Fa cookie Ns Li ")" ,
+.Fa callback ( Fa nbytes , Fa cookie ) ,
where
.Fa nbytes
is the number of bytes requested for the entropy pool, and
@@ -167,7 +166,7 @@ the pool estimate)
towards the pool estimate)
.Dv RND_FLAG_HASCB
(caller specified a callback with
-.Fn rndsource_setcb Ns ).
+.Fn rndsource_setcb ) .
For many devices,
.Dv RND_FLAG_DEFAULT
.Dv ( RND_FLAG_COLLECT_VALUE | RND_FLAG_COLLECT_TIME | RND_FLAG_ESTIMATE_TIME )
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Dec 7 12:22:19 UTC 2019 Modified Files: src/share/man/man9: atomic_loadstore.9 Log Message: Simplify macro usage. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/atomic_loadstore.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/atomic_loadstore.9 diff -u src/share/man/man9/atomic_loadstore.9:1.3 src/share/man/man9/atomic_loadstore.9:1.4 --- src/share/man/man9/atomic_loadstore.9:1.3 Sat Nov 30 02:47:14 2019 +++ src/share/man/man9/atomic_loadstore.9 Sat Dec 7 12:22:19 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: atomic_loadstore.9,v 1.3 2019/11/30 02:47:14 riastradh Exp $ +.\" $NetBSD: atomic_loadstore.9,v 1.4 2019/12/07 12:22:19 wiz Exp $ .\" .\" Copyright (c) 2019 The NetBSD Foundation .\" All rights reserved. @@ -144,9 +144,9 @@ atomic memory operation is issued either For example, if a 32-bit word .Fa w is written with -.Li atomic_store_relaxed(& Ns Fa w Ns Li "," 0x00010002) , +.Li atomic_store_relaxed ( & Ns Fa w , 0x00010002 ) , then an interrupt, other thread, or other CPU reading it with -.Li atomic_load_relaxed(& Ns Fa w Ns Li ")" +.Li atomic_load_relaxed ( & Ns Fa w ) will never witness it partially written, whereas .Fa w Li = 0x00010002 might be compiled into a pair of separate 16-bit store instructions @@ -600,9 +600,9 @@ The Linux kernel provides two macros and .Fn WRITE_ONCE x v which are similar to -.Li atomic_load_consume(& Ns Fa x Ns Li ")" +.Li atomic_load_consume ( & Ns Fa x ) and -.Li atomic_store_relaxed(& Ns Fa x Ns Li "," Fa v Ns Li ")" , +.Li atomic_store_relaxed ( & Ns Fa x , Fa v ) , respectively. However, while Linux's .Fn READ_ONCE @@ -617,7 +617,7 @@ They do not require the address to be aligned. .It They do not require -.Li sizeof( Ns Fa x Ns Li ")" +.Li sizeof ( Fa x ) to be at most the largest size of available atomic loads and stores on the host architecture. .El @@ -766,7 +766,7 @@ C11 formally specifies that all subexpre operands of the .Li "&&" , "||" , "?:" , and -.Li "," +.Li \&, operators and the .Fn kill_dependency macro, carry dependencies for which
CVS commit: src/sys
Module Name:src
Committed By: nonaka
Date: Sat Dec 7 11:45:45 UTC 2019
Modified Files:
src/sys/arch/x86/x86: cpu.c hyperv.c hypervvar.h
src/sys/dev/hyperv: hyperv_common.c hypervvar.h vmbus.c vmbusvar.h
Log Message:
Get a Hyper-V virtual processor id in cpu_hatch().
Currently, it is got in config_interrupts context.
However, since it is required when attaching a device,
it is got earlier than now.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/x86/hyperv.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/x86/hypervvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/hyperv/hyperv_common.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hyperv/hypervvar.h \
src/sys/dev/hyperv/vmbusvar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/hyperv/vmbus.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/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.177 src/sys/arch/x86/x86/cpu.c:1.178
--- src/sys/arch/x86/x86/cpu.c:1.177 Wed Nov 27 06:24:33 2019
+++ src/sys/arch/x86/x86/cpu.c Sat Dec 7 11:45:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.177 2019/11/27 06:24:33 maxv Exp $ */
+/* $NetBSD: cpu.c,v 1.178 2019/12/07 11:45:45 nonaka Exp $ */
/*
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.177 2019/11/27 06:24:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.178 2019/12/07 11:45:45 nonaka Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -118,6 +118,13 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.17
#include "tsc.h"
+#ifndef XEN
+#include "hyperv.h"
+#if NHYPERV > 0
+#include
+#endif
+#endif
+
static int cpu_match(device_t, cfdata_t, void *);
static void cpu_attach(device_t, device_t, void *);
static void cpu_defer(device_t);
@@ -863,6 +870,9 @@ cpu_hatch(void *v)
cpu_init_msrs(ci, true);
cpu_probe(ci);
cpu_speculation_init(ci);
+#if NHYPERV > 0
+ hyperv_init_cpu(ci);
+#endif
ci->ci_data.cpu_cc_freq = cpu_info_primary.ci_data.cpu_cc_freq;
/* cpu_get_tsc_freq(ci); */
Index: src/sys/arch/x86/x86/hyperv.c
diff -u src/sys/arch/x86/x86/hyperv.c:1.5 src/sys/arch/x86/x86/hyperv.c:1.6
--- src/sys/arch/x86/x86/hyperv.c:1.5 Sat Nov 30 05:28:28 2019
+++ src/sys/arch/x86/x86/hyperv.c Sat Dec 7 11:45:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperv.c,v 1.5 2019/11/30 05:28:28 nonaka Exp $ */
+/* $NetBSD: hyperv.c,v 1.6 2019/12/07 11:45:45 nonaka Exp $ */
/*-
* Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
@@ -33,7 +33,7 @@
*/
#include
#ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.5 2019/11/30 05:28:28 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.6 2019/12/07 11:45:45 nonaka Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/sys/dev/hyperv/vmbus/hyperv.c 331757 2018-03-30 02:25:12Z emaste $");
@@ -113,6 +113,8 @@ static char hyperv_features3_str[256];
static int hyperv_idtvec;
+uint32_t hyperv_vcpuid[MAXCPUS];
+
static struct timecounter hyperv_timecounter = {
.tc_get_timecount = hyperv_get_timecount,
.tc_counter_mask = 0x,
@@ -495,12 +497,45 @@ hyperv_early_init(void)
{
u_int features, pm_features, features3;
u_int maxleaf;
+ int i;
if (!hyperv_probe(, , _features, ))
return;
if (features & CPUID_HV_MSR_TIME_REFCNT)
x86_delay = delay_func = delay_msr;
+
+ if (features & CPUID_HV_MSR_VP_INDEX) {
+ /* Save virtual processor id. */
+ hyperv_vcpuid[0] = rdmsr(MSR_HV_VP_INDEX);
+ } else {
+ /* Set virtual processor id to 0 for compatibility. */
+ hyperv_vcpuid[0] = 0;
+ }
+ for (i = 1; i < MAXCPUS; i++)
+ hyperv_vcpuid[i] = hyperv_vcpuid[0];
+}
+
+void
+hyperv_init_cpu(struct cpu_info *ci)
+{
+ u_int features, pm_features, features3;
+ u_int maxleaf;
+
+ if (!hyperv_probe(, , _features, ))
+ return;
+
+ if (features & CPUID_HV_MSR_VP_INDEX)
+ hyperv_vcpuid[ci->ci_index] = rdmsr(MSR_HV_VP_INDEX);
+}
+
+uint32_t
+hyperv_get_vcpuid(cpuid_t cpu)
+{
+
+ if (cpu < MAXCPUS)
+ return hyperv_vcpuid[cpu];
+ return 0;
}
static bool
@@ -798,14 +833,6 @@ vmbus_init_synic_md(struct vmbus_softc *
pd = >sc_percpu[cpu];
- if (hyperv_features & CPUID_HV_MSR_VP_INDEX) {
- /* Save virtual processor id. */
- pd->vcpuid = rdmsr(MSR_HV_VP_INDEX);
- } else {
- /* Set virtual processor id to 0 for compatibility. */
- pd->vcpuid = 0;
- }
-
/*
* Setup the SynIC message.
*/
Index: src/sys/arch/x86/x86/hypervvar.h
diff -u src/sys/arch/x86/x86/hypervvar.h:1.1 src/sys/arch/x86/x86/hypervvar.h:1.2
--- src/sys/arch/x86/x86/hypervvar.h:1.1 Fri May 24 14:28:48 2019
+++ src/sys/arch/x86/x86/hypervvar.h Sat Dec 7 11:45:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervvar.h,v 1.1 2019/05/24 14:28:48 nonaka Exp $ */
+/* $NetBSD: hypervvar.h,v 1.2 2019/12/07 11:45:45 nonaka Exp $ */
/*-
* Copyright (c) 2009-2012,2016 Microsoft
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: maxv Date: Sat Dec 7 10:19:35 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: amd64_trap.S Log Message: Panic instead of printf, same as syscall. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/amd64/amd64_trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/amd64_trap.S diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.50 src/sys/arch/amd64/amd64/amd64_trap.S:1.51 --- src/sys/arch/amd64/amd64/amd64_trap.S:1.50 Thu Nov 14 16:23:52 2019 +++ src/sys/arch/amd64/amd64/amd64_trap.S Sat Dec 7 10:19:35 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: amd64_trap.S,v 1.50 2019/11/14 16:23:52 maxv Exp $ */ +/* $NetBSD: amd64_trap.S,v 1.51 2019/12/07 10:19:35 maxv Exp $ */ /* * Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc. @@ -694,13 +694,8 @@ calltrap: STI(si) movabsq $4f,%rdi movl CPUVAR(ILEVEL),%esi - movl %ebx,%edx - xorq %rax,%rax - call _C_LABEL(printf) - movl %ebx,%edi - call _C_LABEL(spllower) - jmp .Lalltraps_checkast -4: .asciz "WARNING: SPL NOT LOWERED ON TRAP EXIT %x %x\n" + call _C_LABEL(panic) +4: .asciz "spl not lowered on trap exit, ilevel=%x" #endif END(alltraps)
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Dec 7 08:47:39 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Amend ticket 1465 To generate a diff of this commit: cvs rdiff -u -r1.1.2.75 -r1.1.2.76 src/doc/CHANGES-8.2 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.2 diff -u src/doc/CHANGES-8.2:1.1.2.75 src/doc/CHANGES-8.2:1.1.2.76 --- src/doc/CHANGES-8.2:1.1.2.75 Thu Dec 5 17:00:36 2019 +++ src/doc/CHANGES-8.2 Sat Dec 7 08:47:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.75 2019/12/05 17:00:36 bouyer Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.76 2019/12/07 08:47:39 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1748,7 +1748,7 @@ sys/dev/pci/if_cas.c - Whitespace fixes. [msaitoh, ticket #1464] -sys/arch/powerpc/oea/ofw_autoconf.c 1.24 +sys/arch/powerpc/oea/ofw_autoconf.c 1.24 (adapted) Add a hack for qemu/macppc. OF_finddevice calls will crash depending on the boot loader and kernel being used. This patch allows using
CVS commit: [netbsd-8] src/sys/arch/powerpc/oea
Module Name:src
Committed By: martin
Date: Sat Dec 7 08:46:48 UTC 2019
Modified Files:
src/sys/arch/powerpc/oea [netbsd-8]: ofw_autoconf.c
Log Message:
Build fix for ticket #1465
To generate a diff of this commit:
cvs rdiff -u -r1.20.22.1 -r1.20.22.2 src/sys/arch/powerpc/oea/ofw_autoconf.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/powerpc/oea/ofw_autoconf.c
diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.20.22.1 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.20.22.2
--- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.20.22.1 Thu Dec 5 16:53:06 2019
+++ src/sys/arch/powerpc/oea/ofw_autoconf.c Sat Dec 7 08:46:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_autoconf.c,v 1.20.22.1 2019/12/05 16:53:06 bouyer Exp $ */
+/* $NetBSD: ofw_autoconf.c,v 1.20.22.2 2019/12/07 08:46:48 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.20.22.1 2019/12/05 16:53:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.20.22.2 2019/12/07 08:46:48 martin Exp $");
#ifdef ofppc
#include "gtpci.h"
@@ -90,7 +90,7 @@ canonicalize_bootpath(void)
{
int node;
char *p, *lastp;
- char last[32];
+ char last[32], type[32];
/*
* If the bootpath doesn't start with a / then it isn't
