CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: maxv Date: Sun Jul 14 05:58:44 UTC 2019 Modified Files: src/sys/fs/tmpfs: tmpfs_rename.c Log Message: Fix uninitialized variable: if 'tvp' is NULL, '*tdep' is not initialized. This could have caused the KASSERT to wrongfully fire. ok riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/fs/tmpfs/tmpfs_rename.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: maxv Date: Sun Jul 14 05:58:44 UTC 2019 Modified Files: src/sys/fs/tmpfs: tmpfs_rename.c Log Message: Fix uninitialized variable: if 'tvp' is NULL, '*tdep' is not initialized. This could have caused the KASSERT to wrongfully fire. ok riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/fs/tmpfs/tmpfs_rename.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/fs/tmpfs/tmpfs_rename.c diff -u src/sys/fs/tmpfs/tmpfs_rename.c:1.8 src/sys/fs/tmpfs/tmpfs_rename.c:1.9 --- src/sys/fs/tmpfs/tmpfs_rename.c:1.8 Mon Jul 6 10:24:59 2015 +++ src/sys/fs/tmpfs/tmpfs_rename.c Sun Jul 14 05:58:44 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_rename.c,v 1.8 2015/07/06 10:24:59 wiz Exp $ */ +/* $NetBSD: tmpfs_rename.c,v 1.9 2019/07/14 05:58:44 maxv Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.8 2015/07/06 10:24:59 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.9 2019/07/14 05:58:44 maxv Exp $"); #include #include @@ -282,7 +282,7 @@ tmpfs_gro_rename(struct mount *mp, kauth KASSERT(tcnp != NULL); KASSERT(tdep != NULL); KASSERT(fdep != tdep); - KASSERT((*fdep) != (*tdep)); + KASSERT((tvp == NULL) || (*fdep) != (*tdep)); KASSERT((*fdep) != NULL); KASSERT((*fdep)->td_node == VP_TO_TMPFS_NODE(fvp)); KASSERT((tvp == NULL) || ((*tdep) != NULL));
CVS commit: xsrc/external/mit/libepoxy/src
Module Name:xsrc Committed By: christos Date: Sat Jul 13 22:09:14 UTC 2019 Modified Files: xsrc/external/mit/libepoxy/src: egl_generated_dispatch.c gl_generated_dispatch.c glx_generated_dispatch.c Log Message: Fix lint build. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libepoxy/src
Module Name:xsrc Committed By: christos Date: Sat Jul 13 22:09:14 UTC 2019 Modified Files: xsrc/external/mit/libepoxy/src: egl_generated_dispatch.c gl_generated_dispatch.c glx_generated_dispatch.c Log Message: Fix lint build. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.3 xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.4 --- xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.3 Tue Jul 9 18:12:26 2019 +++ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c Sat Jul 13 18:09:14 2019 @@ -11,8 +11,8 @@ #include "dispatch_common.h" #include "epoxy/egl.h" -#ifdef __GNUC__ -#define EPOXY_NOINLINE __attribute__((noinline)) +#if defined(__GNUC__) || defined(__lint__) +#define EPOXY_NOINLINE __attribute__((__noinline__)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) #endif Index: xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.4 xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.5 --- xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.4 Tue Jul 9 18:12:26 2019 +++ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c Sat Jul 13 18:09:14 2019 @@ -33,8 +33,8 @@ #include "dispatch_common.h" #include "epoxy/gl.h" -#ifdef __GNUC__ -#define EPOXY_NOINLINE __attribute__((noinline)) +#if defined(__GNUC__) || defined(__lint__) +#define EPOXY_NOINLINE __attribute__((__noinline__)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) #endif Index: xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.4 xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.5 --- xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.4 Tue Jul 9 18:12:26 2019 +++ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Sat Jul 13 18:09:14 2019 @@ -11,8 +11,8 @@ #include "dispatch_common.h" #include "epoxy/glx.h" -#ifdef __GNUC__ -#define EPOXY_NOINLINE __attribute__((noinline)) +#if defined(__GNUC__) || defined(__lint__) +#define EPOXY_NOINLINE __attribute__((__noinline__)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) #endif
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Sat Jul 13 21:55:52 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: aarch64-nbsd-tdep.c alpha-nbsd-tdep.c
sh-nbsd-tdep.c
Log Message:
Use ULONGEST_MAX instead of (ULONGEST)-1
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.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/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c:1.5 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c:1.6
--- src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c:1.5 Thu May 30 09:43:03 2019
+++ src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c Sat Jul 13 17:55:52 2019
@@ -118,11 +118,11 @@ static const struct tramp_frame aarch64_
SIGTRAMP_FRAME,
4,
{
-{0x910003e0, (ULONGEST)-1}, /* mov x0, sp */
-{0x91014000, (ULONGEST)-1}, /* add x0, x0, #SF_UC */
-{0xd2803428, (ULONGEST)-1}, /* mov x8, #SYS_sigreturn */
-{0xd401, (ULONGEST)-1}, /* svc 0x0 */
-{(ULONGEST)TRAMP_SENTINEL_INSN, (ULONGEST)-1}
+{0x910003e0, ULONGEST_MAX}, /* mov x0, sp */
+{0x91014000, ULONGEST_MAX}, /* add x0, x0, #SF_UC */
+{0xd2803428, ULONGEST_MAX}, /* mov x8, #SYS_sigreturn */
+{0xd401, ULONGEST_MAX}, /* svc 0x0 */
+{(ULONGEST)TRAMP_SENTINEL_INSN, ULONGEST_MAX}
},
aarch64_nbsd_sigframe_init
};
Index: src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.6 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.7
--- src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.6 Sat Jul 13 17:53:48 2019
+++ src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c Sat Jul 13 17:55:52 2019
@@ -192,7 +192,7 @@ static const struct tramp_frame alphanbs
{ 0x23de0010, 0x }, /* lda sp, 16(sp) */
{ 0x201f0127, 0x }, /* lda v0, 295 */
{ 0x0083, 0x }, /* call_pal callsys */
-{ TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
+{ TRAMP_SENTINEL_INSN, ULONGEST_MAX }
},
alphanbsd_sigtramp_cache_init
};
@@ -203,13 +203,13 @@ static const struct tramp_frame alphanbs
SIGTRAMP_FRAME,
4,
{
-{ 0x221e0080, (ULONGEST)-1 }, /* lda a0,128(sp) */
-{ 0x201f0134, (ULONGEST)-1 }, /* lda v0,308 */
-{ 0x0083, (ULONGEST)-1 }, /* callsys */
-{ 0x47e00410, (ULONGEST)-1 }, /* mov v0,a0 */
-{ 0x201f0001, (ULONGEST)-1 }, /* lda v0,1 */
-{ 0x0083, (ULONGEST)-1 }, /* callsys */
-{ TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
+{ 0x221e0080, ULONGEST_MAX }, /* lda a0,128(sp) */
+{ 0x201f0134, ULONGEST_MAX }, /* lda v0,308 */
+{ 0x0083, ULONGEST_MAX }, /* callsys */
+{ 0x47e00410, ULONGEST_MAX }, /* mov v0,a0 */
+{ 0x201f0001, ULONGEST_MAX }, /* lda v0,1 */
+{ 0x0083, ULONGEST_MAX }, /* callsys */
+{ TRAMP_SENTINEL_INSN, ULONGEST_MAX }
},
alphanbsd_sigtramp_cache_init
};
@@ -221,13 +221,13 @@ static const struct tramp_frame alphanbs
{
{ 0x27ba, 0x },
{ 0x23bd, 0x }, /* ldgp gp,0(ra) */
-{ 0x221e0080, (ULONGEST)-1 }, /* lda a0,128(sp) */
-{ 0x201f0134, (ULONGEST)-1 }, /* lda v0,308 */
-{ 0x0083, (ULONGEST)-1 }, /* callsys */
-{ 0x221f, (ULONGEST)-1 }, /* lda a0,-1 */
-{ 0x201f0001, (ULONGEST)-1 }, /* lda v0,1 */
-{ 0x0083, (ULONGEST)-1 }, /* callsys */
-{ TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
+{ 0x221e0080, ULONGEST_MAX }, /* lda a0,128(sp) */
+{ 0x201f0134, ULONGEST_MAX }, /* lda v0,308 */
+{ 0x0083, ULONGEST_MAX }, /* callsys */
+{ 0x221f, ULONGEST_MAX }, /* lda a0,-1 */
+{ 0x201f0001, ULONGEST_MAX }, /* lda v0,1 */
+{ 0x0083, ULONGEST_MAX }, /* callsys */
+{ TRAMP_SENTINEL_INSN, ULONGEST_MAX }
},
alphanbsd_sigtramp_cache_init
};
Index: src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c:1.7 src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c:1.8
--- src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c:1.7 Fri Jun 21 15:20:18 2019
+++ src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c Sat Jul 13 17:55:52 2019
@@ -141,25 +141,25 @@ static const struct tramp_frame shnbsd_s
SIGTRAMP_FRAME,
2,
{
-{ 0x64f3, (ULONGEST)-1 }, /* mov r15,r4 */
-{ 0xd002, (ULONGEST)-1 }, /* mov.l .LSYS_setcontext */
-{ 0xc380, (ULONGEST)-1 }, /* trapa #-128 */
-{ 0xa003, (ULONGEST)-1 }, /* bra .Lskip1 */
-{ 0x0009, (ULONGEST)-1 }, /* nop */
-{ 0x0009, (ULONGEST)-1 }, /* nop */
+{ 0x64f3, ULONGEST_MAX }, /* mov r15,r4 */
+{ 0xd002, ULONGEST_MAX }, /* mov.l .LSYS_setcontext */
+{ 0xc380, ULONGEST_MAX
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: thorpej Date: Sat Jul 13 21:56:23 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_emac.c Log Message: Make failure-to-attach errors a little more informative. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/sunxi/sunxi_emac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: thorpej
Date: Sat Jul 13 21:56:23 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_emac.c
Log Message:
Make failure-to-attach errors a little more informative.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/sunxi/sunxi_emac.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/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.27 src/sys/arch/arm/sunxi/sunxi_emac.c:1.28
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.27 Thu May 23 10:40:39 2019
+++ src/sys/arch/arm/sunxi/sunxi_emac.c Sat Jul 13 21:56:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.27 2019/05/23 10:40:39 msaitoh Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.28 2019/07/13 21:56:23 thorpej Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.27 2019/05/23 10:40:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.28 2019/07/13 21:56:23 thorpej Exp $");
#include
#include
@@ -1280,23 +1280,33 @@ sunxi_emac_get_resources(struct sunxi_em
bus_addr_t addr, size;
/* Map EMAC registers */
- if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0)
+ if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+ aprint_error_dev(sc->dev, "unable to get registers\n");
return ENXIO;
- if (bus_space_map(sc->bst, addr, size, 0, &sc->bsh) != 0)
+ }
+ if (bus_space_map(sc->bst, addr, size, 0, &sc->bsh) != 0) {
+ aprint_error_dev(sc->dev, "unable to map registers\n");
return ENXIO;
+ }
/* Get SYSCON registers */
sc->syscon = fdtbus_syscon_acquire(phandle, "syscon");
- if (sc->syscon == NULL)
+ if (sc->syscon == NULL) {
+ aprint_error_dev(sc->dev, "unable to acquire syscon\n");
return ENXIO;
+ }
/* The "ahb"/"stmmaceth" clock and reset is required */
if ((sc->clk_ahb = fdtbus_clock_get(phandle, "ahb")) == NULL &&
- (sc->clk_ahb = fdtbus_clock_get(phandle, "stmmaceth")) == NULL)
+ (sc->clk_ahb = fdtbus_clock_get(phandle, "stmmaceth")) == NULL) {
+ aprint_error_dev(sc->dev, "unable to get clock\n");
return ENXIO;
+ }
if ((sc->rst_ahb = fdtbus_reset_get(phandle, "ahb")) == NULL &&
- (sc->rst_ahb = fdtbus_reset_get(phandle, "stmmaceth")) == NULL)
+ (sc->rst_ahb = fdtbus_reset_get(phandle, "stmmaceth")) == NULL) {
+ aprint_error_dev(sc->dev, "unable to get reset\n");
return ENXIO;
+ }
/* Internal PHY clock and reset are optional properties. */
sc->clk_ephy = fdtbus_clock_get(phandle, "ephy");
@@ -1366,12 +1376,16 @@ sunxi_emac_attach(device_t parent, devic
sc->type = of_search_compatible(phandle, compat_data)->data;
sc->phy_id = sunxi_emac_get_phyid(sc);
+ aprint_naive("\n");
+ aprint_normal(": EMAC\n");
+
if (sunxi_emac_get_resources(sc) != 0) {
- aprint_error(": cannot allocate resources for device\n");
+ aprint_error_dev(self,
+ "cannot allocate resources for device\n");
return;
}
if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
- aprint_error(": cannot decode interrupt\n");
+ aprint_error_dev(self, "cannot decode interrupt\n");
return;
}
@@ -1379,9 +1393,6 @@ sunxi_emac_attach(device_t parent, devic
callout_init(&sc->stat_ch, CALLOUT_FLAGS);
callout_setfunc(&sc->stat_ch, sunxi_emac_tick, sc);
- aprint_naive("\n");
- aprint_normal(": EMAC\n");
-
/* Setup clocks and regulators */
if (sunxi_emac_setup_resources(sc) != 0)
return;
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Sat Jul 13 21:55:52 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: aarch64-nbsd-tdep.c alpha-nbsd-tdep.c sh-nbsd-tdep.c Log Message: Use ULONGEST_MAX instead of (ULONGEST)-1 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Sat Jul 13 21:53:48 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: alpha-nbsd-tdep.c
Log Message:
Add (ULONGEST) to prevent narrowing warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.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/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.5 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.6
--- src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.5 Thu May 30 09:54:20 2019
+++ src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c Sat Jul 13 17:53:48 2019
@@ -192,7 +192,7 @@ static const struct tramp_frame alphanbs
{ 0x23de0010, 0x }, /* lda sp, 16(sp) */
{ 0x201f0127, 0x }, /* lda v0, 295 */
{ 0x0083, 0x }, /* call_pal callsys */
-{ TRAMP_SENTINEL_INSN, -1 }
+{ TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
},
alphanbsd_sigtramp_cache_init
};
@@ -203,13 +203,13 @@ static const struct tramp_frame alphanbs
SIGTRAMP_FRAME,
4,
{
-{ 0x221e0080, -1 }, /* lda a0,128(sp) */
-{ 0x201f0134, -1 }, /* lda v0,308 */
-{ 0x0083, -1 }, /* callsys */
-{ 0x47e00410, -1 }, /* mov v0,a0 */
-{ 0x201f0001, -1 }, /* lda v0,1 */
-{ 0x0083, -1 }, /* callsys */
-{ TRAMP_SENTINEL_INSN, -1 }
+{ 0x221e0080, (ULONGEST)-1 }, /* lda a0,128(sp) */
+{ 0x201f0134, (ULONGEST)-1 }, /* lda v0,308 */
+{ 0x0083, (ULONGEST)-1 }, /* callsys */
+{ 0x47e00410, (ULONGEST)-1 }, /* mov v0,a0 */
+{ 0x201f0001, (ULONGEST)-1 }, /* lda v0,1 */
+{ 0x0083, (ULONGEST)-1 }, /* callsys */
+{ TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
},
alphanbsd_sigtramp_cache_init
};
@@ -220,14 +220,14 @@ static const struct tramp_frame alphanbs
4,
{
{ 0x27ba, 0x },
-{ 0x23bd, 0x }, /* ldgp gp,0(ra) */
-{ 0x221e0080, -1 }, /* lda a0,128(sp) */
-{ 0x201f0134, -1 }, /* lda v0,308 */
-{ 0x0083, -1 }, /* callsys */
-{ 0x221f, -1 }, /* lda a0,-1 */
-{ 0x201f0001, -1 }, /* lda v0,1 */
-{ 0x0083, -1 }, /* callsys */
-{ TRAMP_SENTINEL_INSN, -1 }
+{ 0x23bd, 0x }, /* ldgp gp,0(ra) */
+{ 0x221e0080, (ULONGEST)-1 }, /* lda a0,128(sp) */
+{ 0x201f0134, (ULONGEST)-1 }, /* lda v0,308 */
+{ 0x0083, (ULONGEST)-1 }, /* callsys */
+{ 0x221f, (ULONGEST)-1 }, /* lda a0,-1 */
+{ 0x201f0001, (ULONGEST)-1 }, /* lda v0,1 */
+{ 0x0083, (ULONGEST)-1 }, /* callsys */
+{ TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
},
alphanbsd_sigtramp_cache_init
};
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Sat Jul 13 21:53:48 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: alpha-nbsd-tdep.c Log Message: Add (ULONGEST) to prevent narrowing warnings. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jul 13 17:13:40 UTC 2019 Modified Files: src/usr.sbin/sysinst: defs.h disks.c partman.c src/usr.sbin/sysinst/arch/acorn32: md.c src/usr.sbin/sysinst/arch/alpha: md.c src/usr.sbin/sysinst/arch/amiga: md.c src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/atari: md.c src/usr.sbin/sysinst/arch/bebox: md.c src/usr.sbin/sysinst/arch/cats: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/dummy: md.c src/usr.sbin/sysinst/arch/emips: md.c src/usr.sbin/sysinst/arch/evbarm: md.c src/usr.sbin/sysinst/arch/evbmips: md.c src/usr.sbin/sysinst/arch/evbppc: md.c src/usr.sbin/sysinst/arch/evbsh3: md.c src/usr.sbin/sysinst/arch/ews4800mips: md.c src/usr.sbin/sysinst/arch/hp300: md.c src/usr.sbin/sysinst/arch/hpcarm: md.c src/usr.sbin/sysinst/arch/hpcmips: md.c src/usr.sbin/sysinst/arch/hpcsh: md.c src/usr.sbin/sysinst/arch/hppa: md.c src/usr.sbin/sysinst/arch/i386: md.c src/usr.sbin/sysinst/arch/landisk: md.c src/usr.sbin/sysinst/arch/luna68k: md.c src/usr.sbin/sysinst/arch/mac68k: md.c src/usr.sbin/sysinst/arch/macppc: md.c src/usr.sbin/sysinst/arch/mipsco: md.c src/usr.sbin/sysinst/arch/mvme68k: md.c src/usr.sbin/sysinst/arch/news68k: md.c src/usr.sbin/sysinst/arch/newsmips: md.c src/usr.sbin/sysinst/arch/ofppc: md.c src/usr.sbin/sysinst/arch/playstation2: md.c src/usr.sbin/sysinst/arch/pmax: md.c src/usr.sbin/sysinst/arch/prep: md.c src/usr.sbin/sysinst/arch/sandpoint: md.c src/usr.sbin/sysinst/arch/sgimips: md.c src/usr.sbin/sysinst/arch/shark: md.c src/usr.sbin/sysinst/arch/sparc: md.c src/usr.sbin/sysinst/arch/sparc64: md.c src/usr.sbin/sysinst/arch/vax: md.c src/usr.sbin/sysinst/arch/x68k: md.c src/usr.sbin/sysinst/arch/zaurus: md.c Log Message: We may call md_pre_mount() multiple times for the same install set, so pass an additional index argument so MD code knows which part of the install will be mounted next. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/partman.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/acorn32/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/alpha/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/amiga/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/arc/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/atari/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/bebox/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/cats/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/dummy/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/emips/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbarm/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbmips/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbppc/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbsh3/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/ews4800mips/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/hp300/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcarm/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcmips/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/hpcsh/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/hppa/md.c cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/arch/i386/md.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/landisk/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/luna68k/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/mac68k/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/macppc/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/mipsco/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/mvme68k/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/news68k/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/newsmips/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/ofppc/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/playstation2/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/pmax/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/prep/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sandpoint/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/sgimips/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/shark/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sparc/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sparc64/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/vax/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/x68k/md.c cvs rdi
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Jul 13 17:13:40 UTC 2019 Modified Files: src/usr.sbin/sysinst: defs.h disks.c partman.c src/usr.sbin/sysinst/arch/acorn32: md.c src/usr.sbin/sysinst/arch/alpha: md.c src/usr.sbin/sysinst/arch/amiga: md.c src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/atari: md.c src/usr.sbin/sysinst/arch/bebox: md.c src/usr.sbin/sysinst/arch/cats: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/dummy: md.c src/usr.sbin/sysinst/arch/emips: md.c src/usr.sbin/sysinst/arch/evbarm: md.c src/usr.sbin/sysinst/arch/evbmips: md.c src/usr.sbin/sysinst/arch/evbppc: md.c src/usr.sbin/sysinst/arch/evbsh3: md.c src/usr.sbin/sysinst/arch/ews4800mips: md.c src/usr.sbin/sysinst/arch/hp300: md.c src/usr.sbin/sysinst/arch/hpcarm: md.c src/usr.sbin/sysinst/arch/hpcmips: md.c src/usr.sbin/sysinst/arch/hpcsh: md.c src/usr.sbin/sysinst/arch/hppa: md.c src/usr.sbin/sysinst/arch/i386: md.c src/usr.sbin/sysinst/arch/landisk: md.c src/usr.sbin/sysinst/arch/luna68k: md.c src/usr.sbin/sysinst/arch/mac68k: md.c src/usr.sbin/sysinst/arch/macppc: md.c src/usr.sbin/sysinst/arch/mipsco: md.c src/usr.sbin/sysinst/arch/mvme68k: md.c src/usr.sbin/sysinst/arch/news68k: md.c src/usr.sbin/sysinst/arch/newsmips: md.c src/usr.sbin/sysinst/arch/ofppc: md.c src/usr.sbin/sysinst/arch/playstation2: md.c src/usr.sbin/sysinst/arch/pmax: md.c src/usr.sbin/sysinst/arch/prep: md.c src/usr.sbin/sysinst/arch/sandpoint: md.c src/usr.sbin/sysinst/arch/sgimips: md.c src/usr.sbin/sysinst/arch/shark: md.c src/usr.sbin/sysinst/arch/sparc: md.c src/usr.sbin/sysinst/arch/sparc64: md.c src/usr.sbin/sysinst/arch/vax: md.c src/usr.sbin/sysinst/arch/x68k: md.c src/usr.sbin/sysinst/arch/zaurus: md.c Log Message: We may call md_pre_mount() multiple times for the same install set, so pass an additional index argument so MD code knows which part of the install will be mounted next. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/partman.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/acorn32/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/alpha/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/amiga/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/arc/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/atari/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/bebox/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/cats/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/dummy/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/emips/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/evbarm/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbmips/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbppc/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/evbsh3/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/ews4800mips/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/hp300/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcarm/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcmips/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/hpcsh/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/hppa/md.c cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/arch/i386/md.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/landisk/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/luna68k/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/mac68k/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/macppc/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/mipsco/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/mvme68k/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/news68k/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/newsmips/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/ofppc/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/playstation2/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/pmax/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/prep/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sandpoint/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/sgimips/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/shark/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sparc/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sparc64/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/vax/md.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/x68k/md.c cvs rdi
CVS commit: src/sys/dev/iscsi
Module Name:src Committed By: mlelstv Date: Sat Jul 13 17:06:00 UTC 2019 Modified Files: src/sys/dev/iscsi: iscsi_main.c Log Message: register with pmf to allow suspend. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/iscsi/iscsi_main.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/iscsi
Module Name:src
Committed By: mlelstv
Date: Sat Jul 13 17:06:00 UTC 2019
Modified Files:
src/sys/dev/iscsi: iscsi_main.c
Log Message:
register with pmf to allow suspend.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/iscsi/iscsi_main.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/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.29 src/sys/dev/iscsi/iscsi_main.c:1.30
--- src/sys/dev/iscsi/iscsi_main.c:1.29 Sun Apr 21 11:26:46 2019
+++ src/sys/dev/iscsi/iscsi_main.c Sat Jul 13 17:06:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_main.c,v 1.29 2019/04/21 11:26:46 mlelstv Exp $ */
+/* $NetBSD: iscsi_main.c,v 1.30 2019/07/13 17:06:00 mlelstv Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -252,6 +252,9 @@ iscsi_attach(device_t parent, device_t s
iscsi_detaching = false;
iscsi_init_cleanup();
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
+
aprint_normal("%s: attached. major = %d\n", iscsi_cd.cd_name,
cdevsw_lookup_major(&iscsi_cdevsw));
}
@@ -285,6 +288,8 @@ iscsi_detach(device_t self, int flags)
if (error)
return error;
+ pmf_device_deregister(sc->dev);
+
mutex_destroy(&sc->lock);
return 0;
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: mlelstv Date: Sat Jul 13 17:04:21 UTC 2019 Modified Files: src/sys/arch/i386/i386: trap.c Log Message: Use common code for SMEP/SMAP panic to print more information and allow debugging. To generate a diff of this commit: cvs rdiff -u -r1.301 -r1.302 src/sys/arch/i386/i386/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: mlelstv
Date: Sat Jul 13 17:04:21 UTC 2019
Modified Files:
src/sys/arch/i386/i386: trap.c
Log Message:
Use common code for SMEP/SMAP panic to print more information and
allow debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/arch/i386/i386/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.301 src/sys/arch/i386/i386/trap.c:1.302
--- src/sys/arch/i386/i386/trap.c:1.301 Wed May 29 14:28:37 2019
+++ src/sys/arch/i386/i386/trap.c Sat Jul 13 17:04:21 2019
@@ -1,5 +1,5 @@
-/* $NetBSD: trap.c,v 1.301 2019/05/29 14:28:37 msaitoh Exp $ */
+/* $NetBSD: trap.c,v 1.302 2019/07/13 17:04:21 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.301 2019/05/29 14:28:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.302 2019/07/13 17:04:21 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -582,17 +582,20 @@ kernelfault:
if (frame->tf_err & PGEX_X) {
/* SMEP might have brought us here */
- if (cr2 > VM_MIN_ADDRESS && cr2 <= VM_MAXUSER_ADDRESS)
-panic("prevented execution of %p (SMEP)",
+ if (cr2 > VM_MIN_ADDRESS && cr2 <= VM_MAXUSER_ADDRESS) {
+printf("prevented execution of %p (SMEP)\n",
(void *)cr2);
+goto we_re_toast;
+ }
}
if ((frame->tf_err & PGEX_P) &&
cr2 < VM_MAXUSER_ADDRESS) {
/* SMAP might have brought us here */
if (onfault_handler(pcb, frame) == NULL) {
-panic("prevented access to %p (SMAP)",
+printf("prevented access to %p (SMAP)\n",
(void *)cr2);
+goto we_re_toast;
}
}
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: mlelstv Date: Sat Jul 13 17:03:01 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: trap.c Log Message: Use common code for SMEP/SMAP panic to print more information and allow debugging. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/sys/arch/amd64/amd64/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/amd64
Module Name:src
Committed By: mlelstv
Date: Sat Jul 13 17:03:01 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: trap.c
Log Message:
Use common code for SMEP/SMAP panic to print more information and
allow debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/amd64/amd64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.120 src/sys/arch/amd64/amd64/trap.c:1.121
--- src/sys/arch/amd64/amd64/trap.c:1.120 Wed May 15 13:49:10 2019
+++ src/sys/arch/amd64/amd64/trap.c Sat Jul 13 17:03:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.120 2019/05/15 13:49:10 christos Exp $ */
+/* $NetBSD: trap.c,v 1.121 2019/07/13 17:03:01 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2000, 2017 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.120 2019/05/15 13:49:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121 2019/07/13 17:03:01 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -481,13 +481,9 @@ trap(struct trapframe *frame)
if (frame->tf_err & PGEX_X) {
/* SMEP might have brought us here */
if (cr2 < VM_MAXUSER_ADDRESS) {
-if (cr2 == 0)
- panic("prevented jump to null"
- " instruction pointer (SMEP)");
-else
- panic("prevented execution of"
- " user address %p (SMEP)",
- (void *)cr2);
+printf("prevented execution of %p (SMEP)\n",
+(void *)cr2);
+goto we_re_toast;
}
}
@@ -495,8 +491,9 @@ trap(struct trapframe *frame)
cr2 < VM_MAXUSER_ADDRESS) {
/* SMAP might have brought us here */
if (onfault_handler(pcb, frame) == NULL) {
-panic("prevented access to %p (SMAP)",
+printf("prevented access to %p (SMAP)\n",
(void *)cr2);
+goto we_re_toast;
}
}
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: maxv Date: Sat Jul 13 14:24:37 UTC 2019 Modified Files: src/sys/fs/tmpfs: tmpfs_mem.c Log Message: Remove the roundups, they are incorrect and cause memcmp to wrongfully fail because of uninitialized bytes at the end of the buffers. ok rmind@ To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/fs/tmpfs/tmpfs_mem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: maxv
Date: Sat Jul 13 14:24:37 UTC 2019
Modified Files:
src/sys/fs/tmpfs: tmpfs_mem.c
Log Message:
Remove the roundups, they are incorrect and cause memcmp to wrongfully fail
because of uninitialized bytes at the end of the buffers.
ok rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/fs/tmpfs/tmpfs_mem.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/fs/tmpfs/tmpfs_mem.c
diff -u src/sys/fs/tmpfs/tmpfs_mem.c:1.9 src/sys/fs/tmpfs/tmpfs_mem.c:1.10
--- src/sys/fs/tmpfs/tmpfs_mem.c:1.9 Mon Aug 22 23:07:36 2016
+++ src/sys/fs/tmpfs/tmpfs_mem.c Sat Jul 13 14:24:37 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_mem.c,v 1.9 2016/08/22 23:07:36 skrll Exp $ */
+/* $NetBSD: tmpfs_mem.c,v 1.10 2019/07/13 14:24:37 maxv Exp $ */
/*
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_mem.c,v 1.9 2016/08/22 23:07:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_mem.c,v 1.10 2019/07/13 14:24:37 maxv Exp $");
#include
#include
@@ -234,8 +234,8 @@ tmpfs_strname_free(struct tmpfs_mount *m
bool
tmpfs_strname_neqlen(struct componentname *fcnp, struct componentname *tcnp)
{
- const size_t fln = roundup2(fcnp->cn_namelen, TMPFS_NAME_QUANTUM);
- const size_t tln = roundup2(tcnp->cn_namelen, TMPFS_NAME_QUANTUM);
+ const size_t fln = fcnp->cn_namelen;
+ const size_t tln = tcnp->cn_namelen;
return (fln != tln) || memcmp(fcnp->cn_nameptr, tcnp->cn_nameptr, fln);
}
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: gson Date: Sat Jul 13 12:44:02 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_getitimer.c Log Message: In the setitimer_old test case, allow for time passing between the two setitimer() calls. Should fix PR kern/54370. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_getitimer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: gson
Date: Sat Jul 13 12:44:02 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_getitimer.c
Log Message:
In the setitimer_old test case, allow for time passing between the two
setitimer() calls. Should fix PR kern/54370.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_getitimer.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/lib/libc/sys/t_getitimer.c
diff -u src/tests/lib/libc/sys/t_getitimer.c:1.2 src/tests/lib/libc/sys/t_getitimer.c:1.3
--- src/tests/lib/libc/sys/t_getitimer.c:1.2 Thu Mar 22 18:20:46 2012
+++ src/tests/lib/libc/sys/t_getitimer.c Sat Jul 13 12:44:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_getitimer.c,v 1.2 2012/03/22 18:20:46 christos Exp $ */
+/* $NetBSD: t_getitimer.c,v 1.3 2019/07/13 12:44:02 gson Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_getitimer.c,v 1.2 2012/03/22 18:20:46 christos Exp $");
+__RCSID("$NetBSD: t_getitimer.c,v 1.3 2019/07/13 12:44:02 gson Exp $");
#include
@@ -175,11 +175,13 @@ ATF_TC_BODY(setitimer_old, tc)
struct itimerval it, ot;
/*
- * Make two calls; the second one
- * should store the old values.
+ * Make two calls; the second one should store the old
+ * timer value which should be the same as that set in
+ * the first call, or slightly less due to time passing
+ * between the two calls.
*/
it.it_value.tv_sec = 4;
- it.it_value.tv_usec = 3;
+ it.it_value.tv_usec = 99;
it.it_interval.tv_sec = 0;
it.it_interval.tv_usec = 0;
@@ -194,7 +196,8 @@ ATF_TC_BODY(setitimer_old, tc)
ATF_REQUIRE(setitimer(ITIMER_REAL, &it, &ot) == 0);
- if (ot.it_value.tv_sec != 4 || ot.it_value.tv_usec != 3)
+ /* Check seconds only as microseconds may have decremented */
+ if (ot.it_value.tv_sec != 4)
atf_tc_fail("setitimer(2) did not store old values");
}
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Sat Jul 13 09:47:15 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: genassym.cf Log Message: G/C To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/aarch64/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Sat Jul 13 09:47:15 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: genassym.cf Log Message: G/C To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/aarch64/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/aarch64/aarch64/genassym.cf diff -u src/sys/arch/aarch64/aarch64/genassym.cf:1.12 src/sys/arch/aarch64/aarch64/genassym.cf:1.13 --- src/sys/arch/aarch64/aarch64/genassym.cf:1.12 Thu Dec 27 09:55:27 2018 +++ src/sys/arch/aarch64/aarch64/genassym.cf Sat Jul 13 09:47:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.12 2018/12/27 09:55:27 mrg Exp $ +# $NetBSD: genassym.cf,v 1.13 2019/07/13 09:47:14 skrll Exp $ #- # Copyright (c) 2014 The NetBSD Foundation, Inc. # All rights reserved. @@ -74,35 +74,6 @@ define UPAGES UPAGES define USPACE (UPAGES * PAGE_SIZE) #define PV_PA offsetof(pv_addr_t, pv_pa) -#define PMAP_DOMAIN_KERNEL PMAP_DOMAIN_KERNEL -#define DOMAIN_CLIENT DOMAIN_CLIENT -#define L1_S_PROTO_generic L1_S_PROTO_generic -#define L1_S_PROTO_armv7 L1_S_PROTO_armv7 -#define L1_S_PROTO_xscale L1_S_PROTO_xscale -#if ARM_NMMUS == 1 -#define L1_S_PROTO L1_S_PROTO -#endif -#define L1_S_FRAME L1_S_FRAME -#define L1_S_SHIFT L1_S_SHIFT -#define L1_S_SIZE L1_S_SIZE -#define L1_S_B L1_S_B -#define L1_S_C L1_S_C -#define L1_S_V6_S L1_S_V6_S -#define L1_S_AP_KR L1_S_AP(AP_KR) -#define L1_S_AP_KRW L1_S_AP(AP_KRW) -#define L1_S_APv7_KRW L1_S_AP(AP7_KRW) -#define L1_TABLE_SIZE L1_TABLE_SIZE -#define L1_TYPE_S L1_TYPE_S -#define L1_S_DOM_KERNEL L1_S_DOM(PMAP_DOMAIN_KERNEL) -#define L2_S_SIZE L2_S_SIZE - -#define L1_C_PROTO_generic L1_C_PROTO_generic - -#define L2_S_PROTO_generic L2_S_PROTO_generic -#define L2_S_SHIFT L2_S_SHIFT -#define L2_S_SIZE L2_S_SIZE -#define L2_C L2_C -#define L2_AP_KRW L2_AP(AP_KRW) define L0_ADDR_BITS L0_ADDR_BITS define L0_SHIFT L0_SHIFT
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Sat Jul 13 09:28:03 UTC 2019 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Define some new bits of CPUID Fn8000_0007 %edx AMD Advanced Power Management leaf. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Sat Jul 13 09:28:03 UTC 2019 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Define some new bits of CPUID Fn8000_0007 %edx AMD Advanced Power Management leaf. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.148 src/sys/arch/x86/include/specialreg.h:1.149 --- src/sys/arch/x86/include/specialreg.h:1.148 Wed Jun 26 12:29:00 2019 +++ src/sys/arch/x86/include/specialreg.h Sat Jul 13 09:28:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.148 2019/06/26 12:29:00 mgorny Exp $ */ +/* $NetBSD: specialreg.h,v 1.149 2019/07/13 09:28:03 msaitoh Exp $ */ /* * Copyright (c) 2014-2019 The NetBSD Foundation, Inc. @@ -701,12 +701,16 @@ #define CPUID_APM_TSC 0x0100 /* TSC invariant */ #define CPUID_APM_CPB 0x0200 /* Core performance boost */ #define CPUID_APM_EFF 0x0400 /* Effective Frequency (read-only) */ - -#define CPUID_APM_FLAGS "\20" \ - "\1" "TS" "\2" "FID" "\3" "VID" "\4" "TTP" \ - "\5" "HTC" "\6" "STC" "\7" "100" "\10" "HWP" \ - "\11" "TSC" "\12" "CPB" "\13" "EffFreq" "\14" "B11" \ - "\15" "B12" +#define CPUID_APM_PROCFI 0x0800 /* Proc Feedback Interface */ +#define CPUID_APM_PROCPR 0x1000 /* Proc Power Reporting */ +#define CPUID_APM_CONNSTBY 0x2000 /* Connected Standby */ +#define CPUID_APM_RAPL 0x4000 /* Running Average Power Limit */ + +#define CPUID_APM_FLAGS "\20" \ + "\1" "TS" "\2" "FID" "\3" "VID" "\4" "TTP" \ + "\5" "HTC" "\6" "STC" "\7" "100" "\10" "HWP" \ + "\11" "TSC" "\12" "CPB" "\13" "EffFreq" "\14" "PROCFI" \ + "\15" "PROCPR" "\16" "CONNSTBY" "\17" "RAPL" /* AMD Fn800a %edx features (SVM features) */ #define CPUID_AMD_SVM_NP 0x0001
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sat Jul 13 09:24:17 UTC 2019
Modified Files:
src/sys/dev/pci: piixpm.c piixpmreg.h
Log Message:
Improve SB800 and newer chipsets support:
- Add newer chipset (e.g. X370/X399 and newer) support that the PCI device id
is 0x790b. The register definitions are mainly taken from FreeBSD.
- Rename PIIXPM_INDIRECTIO_* to SB800_INDIRECTIO_* because those are only
for SB800 and newer chipsets.
- SB800 also support 4 ports.
- SB800's interrupt configuration bit is different from others.
Use SB800_SMB_HOSTC's bit 0.
- Do not bus_space_map devices which are at address 0 (it's uninitialized)
in piixpm_attach().
- Add the port number to the dmesg output.
- Avoid uninitiliazed use of ctl and corresponding warnings. From OpenBSD rev.
1.38
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/piixpm.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/piixpmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.53 src/sys/dev/pci/piixpm.c:1.54
--- src/sys/dev/pci/piixpm.c:1.53 Fri Jul 12 03:57:50 2019
+++ src/sys/dev/pci/piixpm.c Sat Jul 13 09:24:17 2019
@@ -1,5 +1,5 @@
-/* $NetBSD: piixpm.c,v 1.53 2019/07/12 03:57:50 msaitoh Exp $ */
-/* $OpenBSD: piixpm.c,v 1.35 2011/04/09 04:33:40 deraadt Exp $ */
+/* $NetBSD: piixpm.c,v 1.54 2019/07/13 09:24:17 msaitoh Exp $ */
+/* $OpenBSD: piixpm.c,v 1.39 2013/10/01 20:06:02 sf Exp $ */
/*
* Copyright (c) 2005, 2006 Alexander Yurchenko
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.53 2019/07/12 03:57:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.54 2019/07/13 09:24:17 msaitoh Exp $");
#include
#include
@@ -49,12 +49,27 @@ __KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1
#define DPRINTF(x)
#endif
-#define PIIXPM_IS_CSB5(id) \
- (PCI_VENDOR((id)) == PCI_VENDOR_SERVERWORKS && \
- PCI_PRODUCT((id)) == PCI_PRODUCT_SERVERWORKS_CSB5)
+#define PIIXPM_IS_CSB5(sc) \
+ (PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_SERVERWORKS && \
+ PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_SERVERWORKS_CSB5)
#define PIIXPM_DELAY 200
#define PIIXPM_TIMEOUT 1
+#define PIIXPM_IS_SB800GRP(sc) \
+ ((PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_ATI) && \
+ ((PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_ATI_SB600_SMB) && \
+ ((sc)->sc_rev >= 0x40)))
+
+#define PIIXPM_IS_HUDSON(sc) \
+ ((PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_AMD) && \
+ (PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_AMD_HUDSON_SMB))
+
+#define PIIXPM_IS_KERNCZ(sc) \
+ ((PCI_VENDOR((sc)->sc_id) == PCI_VENDOR_AMD) && \
+ (PCI_PRODUCT((sc)->sc_id) == PCI_PRODUCT_AMD_KERNCZ_SMB))
+
+#define PIIXPM_IS_FCHGRP(sc) (PIIXPM_IS_HUDSON(sc) || PIIXPM_IS_KERNCZ(sc))
+
struct piixpm_smbus {
int sda;
struct piixpm_softc *softc;
@@ -75,6 +90,7 @@ struct piixpm_softc {
pci_chipset_tag_t sc_pc;
pcitag_t sc_pcitag;
pcireg_t sc_id;
+ pcireg_t sc_rev;
int sc_numbusses;
device_t sc_i2c_device[4];
@@ -149,6 +165,7 @@ piixpm_match(device_t parent, cfdata_t m
case PCI_VENDOR_AMD:
switch (PCI_PRODUCT(pa->pa_id)) {
case PCI_PRODUCT_AMD_HUDSON_SMB:
+ case PCI_PRODUCT_AMD_KERNCZ_SMB:
return 1;
}
break;
@@ -165,6 +182,7 @@ piixpm_attach(device_t parent, device_t
pcireg_t base, conf;
pcireg_t pmmisc;
pci_intr_handle_t ih;
+ bool usesmi = false;
const char *intrstr = NULL;
int i, flags;
char intrbuf[PCI_INTRSTR_LEN];
@@ -172,6 +190,7 @@ piixpm_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_iot = pa->pa_iot;
sc->sc_id = pa->pa_id;
+ sc->sc_rev = PCI_REVISION(pa->pa_class);
sc->sc_pc = pa->pa_pc;
sc->sc_pcitag = pa->pa_tag;
sc->sc_numbusses = 1;
@@ -181,10 +200,6 @@ piixpm_attach(device_t parent, device_t
if (!pmf_device_register(self, piixpm_suspend, piixpm_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
- /* Read configuration */
- conf = pci_conf_read(pa->pa_pc, pa->pa_tag, PIIX_SMB_HOSTC);
- DPRINTF(("%s: conf 0x%x\n", device_xname(self), conf));
-
if ((PCI_VENDOR(pa->pa_id) != PCI_VENDOR_INTEL) ||
(PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_INTEL_82371AB_PMC))
goto nopowermanagement;
@@ -208,48 +223,52 @@ piixpm_attach(device_t parent, device_t
* PIIX4 and PIIX4E have a bug in the timer latch, see Errata #20
* in the "Specification update" (document #297738).
*/
- acpipmtimer_attach(self, sc->sc_pm_iot, sc->sc_pm_ioh,
- PIIX_PM_PMTMR,
- (PCI_REVISION(pa->pa_class) < 3) ? ACPIPMT_BADLATCH : 0 );
+ acpipmtimer_attach(self, sc->sc_pm_iot, sc->sc_pm_ioh, PIIX_PM_PMTMR,
+ (PCI_REVISION(pa->pa_class) < 3) ? ACPIPMT_BADLATCH : 0);
nopowermanagement:
- /* SB800 rev 0x40+ and AMD HUDSON need special initialization */
- if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_AMD &&
- PCI_PRODUCT(
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sat Jul 13 09:24:17 UTC 2019 Modified Files: src/sys/dev/pci: piixpm.c piixpmreg.h Log Message: Improve SB800 and newer chipsets support: - Add newer chipset (e.g. X370/X399 and newer) support that the PCI device id is 0x790b. The register definitions are mainly taken from FreeBSD. - Rename PIIXPM_INDIRECTIO_* to SB800_INDIRECTIO_* because those are only for SB800 and newer chipsets. - SB800 also support 4 ports. - SB800's interrupt configuration bit is different from others. Use SB800_SMB_HOSTC's bit 0. - Do not bus_space_map devices which are at address 0 (it's uninitialized) in piixpm_attach(). - Add the port number to the dmesg output. - Avoid uninitiliazed use of ctl and corresponding warnings. From OpenBSD rev. 1.38 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/piixpm.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/piixpmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
