CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg
Module Name:src
Committed By: mrg
Date: Fri Aug 12 20:45:05 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
fix a edit-o in the previous, pointed out by richard@. thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Aug 12 20:45:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/12 01:15:49 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/12 20:45:05 mrg Exp $
.include
@@ -46,7 +46,7 @@ LDADD+= ${LDADD.mi}
LDADD+= ${LDADD.xfixes}
LDADD+= ${LDADD.Xext/Xextbuiltin}
LDADD+= ${LDADD.render}
-eDADD+= ${LDADD.randr}
+LDADD+= ${LDADD.randr}
LDADD+= ${LDADD.damageext}
LDADD+= ${LDADD.miext/damage}
LDADD+= ${LDADD.miext/shadow}
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: macallan
Date: Fri Aug 12 20:30:15 UTC 2016
Modified Files:
src/sys/ufs/ext2fs: ext2fs_xattr.h
Log Message:
cast pointers to uintptr_t before comparing them, also ()s
now this at least compiles
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/ext2fs/ext2fs_xattr.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/ufs/ext2fs/ext2fs_xattr.h
diff -u src/sys/ufs/ext2fs/ext2fs_xattr.h:1.1 src/sys/ufs/ext2fs/ext2fs_xattr.h:1.2
--- src/sys/ufs/ext2fs/ext2fs_xattr.h:1.1 Fri Aug 12 19:04:03 2016
+++ src/sys/ufs/ext2fs/ext2fs_xattr.h Fri Aug 12 20:30:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_xattr.h,v 1.1 2016/08/12 19:04:03 jdolecek Exp $ */
+/* $NetBSD: ext2fs_xattr.h,v 1.2 2016/08/12 20:30:15 macallan Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _UFS_EXT2FS_EXT2FS_XATTR_H_
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_xattr.h,v 1.1 2016/08/12 19:04:03 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_xattr.h,v 1.2 2016/08/12 20:30:15 macallan Exp $");
#ifdef _KERNEL
@@ -79,7 +79,7 @@ struct ext2fs_xattr_entry {
* doesn't overflow past end.
*/
#define EXT2FS_XATTR_IS_LAST_ENTRY(entry, end) \
- *((uint32_t *)(entry)) == 0 || EXT2FS_XATTR_NEXT(entry) > end
+ (*((uint32_t *)(entry)) == 0 || (uintptr_t)EXT2FS_XATTR_NEXT(entry) > (uintptr_t)end)
/*
* Each ext2fs_xattr_entry starts on next 4-byte boundary, pad if necessary.
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: macallan
Date: Fri Aug 12 20:26:15 UTC 2016
Modified Files:
src/sys/ufs/ext2fs: ext2fs.h
Log Message:
sprinkle ()s in macros with comparisons, shuts up compiler warnings
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/ufs/ext2fs/ext2fs.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/ufs/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.42 src/sys/ufs/ext2fs/ext2fs.h:1.43
--- src/sys/ufs/ext2fs/ext2fs.h:1.42 Fri Aug 12 19:04:03 2016
+++ src/sys/ufs/ext2fs/ext2fs.h Fri Aug 12 20:26:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.h,v 1.42 2016/08/12 19:04:03 jdolecek Exp $ */
+/* $NetBSD: ext2fs.h,v 1.43 2016/08/12 20:26:15 macallan Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -342,12 +342,12 @@ struct m_ext2fs {
"\01INCOMPAT_COMP"
#define EXT2F_HAS_COMPAT_FEATURE(ip, feature) \
- (ip)->i_e2fs->e2fs.e2fs_rev >= E2FS_REV1 && \
- ((ip)->i_e2fs->e2fs.e2fs_features_compat & (feature)) != 0
+ ((ip)->i_e2fs->e2fs.e2fs_rev >= E2FS_REV1 && \
+ ((ip)->i_e2fs->e2fs.e2fs_features_compat & (feature)) != 0)
#define EXT2F_HAS_INCOMPAT_FEATURE(ip, feature) \
- (ip)->i_e2fs->e2fs.e2fs_rev >= E2FS_REV1 && \
- ((ip)->i_e2fs->e2fs.e2fs_features_incompat & (feature)) != 0
+ ((ip)->i_e2fs->e2fs.e2fs_rev >= E2FS_REV1 && \
+ ((ip)->i_e2fs->e2fs.e2fs_features_incompat & (feature)) != 0)
/*
* Features supported in this implementation
CVS commit: src/sys/rump/fs/lib/libext2fs
Module Name:src
Committed By: martin
Date: Fri Aug 12 20:25:34 UTC 2016
Modified Files:
src/sys/rump/fs/lib/libext2fs: Makefile
Log Message:
Add new file to fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/fs/lib/libext2fs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/lib/libext2fs/Makefile
diff -u src/sys/rump/fs/lib/libext2fs/Makefile:1.7 src/sys/rump/fs/lib/libext2fs/Makefile:1.8
--- src/sys/rump/fs/lib/libext2fs/Makefile:1.7 Fri Jun 24 21:31:30 2016
+++ src/sys/rump/fs/lib/libext2fs/Makefile Fri Aug 12 20:25:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/24 21:31:30 christos Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/12 20:25:34 martin Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/ext2fs
@@ -9,7 +9,8 @@ COMMENT=Linux Ext2
SRCS= ext2fs_alloc.c ext2fs_balloc.c ext2fs_bmap.c ext2fs_bswap.c \
ext2fs_hash.c ext2fs_htree.c \
ext2fs_extents.c ext2fs_inode.c ext2fs_lookup.c ext2fs_readwrite.c \
- ext2fs_rename.c ext2fs_subr.c ext2fs_vfsops.c ext2fs_vnops.c
+ ext2fs_rename.c ext2fs_subr.c ext2fs_vfsops.c ext2fs_vnops.c \
+ ext2fs_xattr.c
.include
.include
CVS commit: src/sys/netinet
Module Name:src
Committed By: jdolecek
Date: Fri Aug 12 19:08:54 UTC 2016
Modified Files:
src/sys/netinet: sctp_crc32.c
Log Message:
sprinkle const on sctp_crc_c[]
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/sctp_crc32.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/netinet/sctp_crc32.c
diff -u src/sys/netinet/sctp_crc32.c:1.1 src/sys/netinet/sctp_crc32.c:1.2
--- src/sys/netinet/sctp_crc32.c:1.1 Tue Oct 13 21:28:35 2015
+++ src/sys/netinet/sctp_crc32.c Fri Aug 12 19:08:54 2016
@@ -1,5 +1,5 @@
/* $KAME: sctp_crc32.c,v 1.12 2005/03/06 16:04:17 itojun Exp $ */
-/* $NetBSD: sctp_crc32.c,v 1.1 2015/10/13 21:28:35 rjs Exp $ */
+/* $NetBSD: sctp_crc32.c,v 1.2 2016/08/12 19:08:54 jdolecek Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sctp_crc32.c,v 1.1 2015/10/13 21:28:35 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_crc32.c,v 1.2 2016/08/12 19:08:54 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_sctp.h"
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_crc32.c
/* IEEE Transactions on Communications, Vol.41, No.6, June 1993 */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-unsigned long sctp_crc_c[256] = {
+const unsigned long sctp_crc_c[256] = {
0xL, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L,
0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL,
0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL,
CVS commit: src/sys/modules/ext2fs
Module Name:src Committed By: jdolecek Date: Fri Aug 12 19:07:14 UTC 2016 Modified Files: src/sys/modules/ext2fs: Makefile Log Message: add ext2fs_xattr.c To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/ext2fs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/ext2fs/Makefile diff -u src/sys/modules/ext2fs/Makefile:1.4 src/sys/modules/ext2fs/Makefile:1.5 --- src/sys/modules/ext2fs/Makefile:1.4 Fri Jun 24 17:22:13 2016 +++ src/sys/modules/ext2fs/Makefile Fri Aug 12 19:07:14 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/06/24 17:22:13 christos Exp $ +# $NetBSD: Makefile,v 1.5 2016/08/12 19:07:14 jdolecek Exp $ .include "../Makefile.inc" @@ -8,6 +8,7 @@ KMOD= ext2fs SRCS= ext2fs_alloc.c ext2fs_balloc.c ext2fs_bmap.c ext2fs_bswap.c \ ext2fs_hash.c ext2fs_htree.c \ ext2fs_extents.c ext2fs_inode.c ext2fs_lookup.c ext2fs_readwrite.c \ - ext2fs_rename.c ext2fs_subr.c ext2fs_vfsops.c ext2fs_vnops.c + ext2fs_rename.c ext2fs_subr.c ext2fs_vfsops.c ext2fs_vnops.c \ + ext2fs_xattr.c .include
CVS commit: src/sys/ufs
Module Name:src
Committed By: jdolecek
Date: Fri Aug 12 19:04:03 UTC 2016
Modified Files:
src/sys/ufs: files.ufs
src/sys/ufs/ext2fs: ext2fs.h ext2fs_dinode.h ext2fs_vnops.c
Added Files:
src/sys/ufs/ext2fs: ext2fs_xattr.c ext2fs_xattr.h
Log Message:
add support for extended attributes in ext2fs for ext3/ext4; read-only for now
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/ufs/files.ufs
cvs rdiff -u -r1.41 -r1.42 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.35 -r1.36 src/sys/ufs/ext2fs/ext2fs_dinode.h
cvs rdiff -u -r1.120 -r1.121 src/sys/ufs/ext2fs/ext2fs_vnops.c
cvs rdiff -u -r0 -r1.1 src/sys/ufs/ext2fs/ext2fs_xattr.c \
src/sys/ufs/ext2fs/ext2fs_xattr.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/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.42 src/sys/ufs/files.ufs:1.43
--- src/sys/ufs/files.ufs:1.42 Fri Jun 24 17:21:56 2016
+++ src/sys/ufs/files.ufs Fri Aug 12 19:04:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.42 2016/06/24 17:21:56 christos Exp $
+# $NetBSD: files.ufs,v 1.43 2016/08/12 19:04:03 jdolecek Exp $
deffs FFS
deffs EXT2FS
@@ -28,6 +28,7 @@ file ufs/ext2fs/ext2fs_rename.c ext2fs
file ufs/ext2fs/ext2fs_subr.c ext2fs
file ufs/ext2fs/ext2fs_vfsops.c ext2fs
file ufs/ext2fs/ext2fs_vnops.c ext2fs
+file ufs/ext2fs/ext2fs_xattr.c ext2fs
define chfs: vfs, ffs
file ufs/chfs/ebh.c chfs
Index: src/sys/ufs/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.41 src/sys/ufs/ext2fs/ext2fs.h:1.42
--- src/sys/ufs/ext2fs/ext2fs.h:1.41 Fri Aug 5 21:22:06 2016
+++ src/sys/ufs/ext2fs/ext2fs.h Fri Aug 12 19:04:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.h,v 1.41 2016/08/05 21:22:06 jdolecek Exp $ */
+/* $NetBSD: ext2fs.h,v 1.42 2016/08/12 19:04:03 jdolecek Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -341,6 +341,14 @@ struct m_ext2fs {
"\02INCOMPAT_FTYPE" \
"\01INCOMPAT_COMP"
+#define EXT2F_HAS_COMPAT_FEATURE(ip, feature) \
+ (ip)->i_e2fs->e2fs.e2fs_rev >= E2FS_REV1 && \
+ ((ip)->i_e2fs->e2fs.e2fs_features_compat & (feature)) != 0
+
+#define EXT2F_HAS_INCOMPAT_FEATURE(ip, feature) \
+ (ip)->i_e2fs->e2fs.e2fs_rev >= E2FS_REV1 && \
+ ((ip)->i_e2fs->e2fs.e2fs_features_incompat & (feature)) != 0
+
/*
* Features supported in this implementation
*
Index: src/sys/ufs/ext2fs/ext2fs_dinode.h
diff -u src/sys/ufs/ext2fs/ext2fs_dinode.h:1.35 src/sys/ufs/ext2fs/ext2fs_dinode.h:1.36
--- src/sys/ufs/ext2fs/ext2fs_dinode.h:1.35 Sat Aug 6 09:29:28 2016
+++ src/sys/ufs/ext2fs/ext2fs_dinode.h Fri Aug 12 19:04:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_dinode.h,v 1.35 2016/08/06 09:29:28 jdolecek Exp $ */
+/* $NetBSD: ext2fs_dinode.h,v 1.36 2016/08/12 19:04:03 jdolecek Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -123,11 +123,11 @@ struct ext2fs_dinode {
uint32_t e2di_blocks[EXT2FS_NDADDR+EXT2FS_NIADDR];
/* 40: disk blocks */
uint32_t e2di_gen; /* 100: generation number */
- uint32_t e2di_facl; /* 104: file ACL (not implemented) (ext3) */
+ uint32_t e2di_facl; /* 104: file ACL (ext3) */
uint32_t e2di_size_high; /* 108: Size (in bytes) high */
uint32_t e2di_obso_faddr;/* 112: obsolete fragment address (ext2) */
uint16_t e2di_nblock_high; /* 116: Blocks count bits 47:32 (ext4) */
- uint16_t e2di_facl_high; /* 118: file ACL bits 47:32 (ext4) */
+ uint16_t e2di_facl_high; /* 118: file ACL bits 47:32 (ext4/64bit) */
uint16_t e2di_uid_high; /* 120: Owner UID top 16 bits (ext4) */
uint16_t e2di_gid_high; /* 122: Owner GID top 16 bits (ext4) */
uint16_t e2di_checksum_low; /* 124: crc LE (not implemented) (ext4) */
Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.120 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.121
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.120 Fri Aug 5 20:15:41 2016
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c Fri Aug 12 19:04:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vnops.c,v 1.120 2016/08/05 20:15:41 jdolecek Exp $ */
+/* $NetBSD: ext2fs_vnops.c,v 1.121 2016/08/12 19:04:03 jdolecek Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.120 2016/08/05 20:15:41 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.121 2016/08/12 19:04:03 jdolecek Exp $");
#include
#include
@@ -94,6 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops
#include
#include
#include
+#include
extern int prtactive;
@@ -1182,6 +1183,10 @@ const struct vnodeopv_entry_desc ext2fs_
{ _bwrite_desc, vn_bwrite }, /* bwrite */
{ _getpages_desc, genfs_getpages }, /* getpages */
{ _putpages_desc, genfs_putpages }, /* putpages */
+ { _getextattr_desc, ext2fs_getextattr }, /* getextattr */
+ { _setextattr_desc, ext2fs_setextattr }, /* setextattr */
+ { _listextattr_desc, ext2fs_listextattr }, /* listextattr */
+ { _deleteextattr_desc, ext2fs_deleteextattr },/*
CVS commit: src/lib/libc/arch/mips/gen
Module Name:src
Committed By: skrll
Date: Fri Aug 12 15:21:25 UTC 2016
Modified Files:
src/lib/libc/arch/mips/gen: _resumecontext.S
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/mips/gen/_resumecontext.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/mips/gen/_resumecontext.S
diff -u src/lib/libc/arch/mips/gen/_resumecontext.S:1.7 src/lib/libc/arch/mips/gen/_resumecontext.S:1.8
--- src/lib/libc/arch/mips/gen/_resumecontext.S:1.7 Wed Sep 12 02:00:52 2012
+++ src/lib/libc/arch/mips/gen/_resumecontext.S Fri Aug 12 15:21:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: _resumecontext.S,v 1.7 2012/09/12 02:00:52 manu Exp $ */
+/* $NetBSD: _resumecontext.S,v 1.8 2016/08/12 15:21:25 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,12 +35,12 @@
#include "assym.h"
#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: _resumecontext.S,v 1.7 2012/09/12 02:00:52 manu Exp $")
+ RCSID("$NetBSD: _resumecontext.S,v 1.8 2016/08/12 15:21:25 skrll Exp $")
#endif /* SYSLIBC_SCCS && !lint */
.set reorder
.hidden _C_LABEL(__resumecontext)
-
+
LEAF_NOPROFILE(__resumecontext)
/*
* We get here not by a call through $t9 but thru $ra after the
@@ -55,7 +55,7 @@ LEAF_NOPROFILE(__resumecontext)
nop
PIC_TAILCALL(setcontext) # yes, become it.
/* NOTREACHED (in theory) */
- li a0, -1# failure,
+ li a0, -1# failure,
1:
SYSTRAP(exit) # all hope is lost.
/* NOTREACHED */
CVS commit: src/lib/libc/arch/mips
Module Name:src
Committed By: skrll
Date: Fri Aug 12 15:26:04 UTC 2016
Modified Files:
src/lib/libc/arch/mips: genassym.cf
src/lib/libc/arch/mips/sys: getcontext.S
Log Message:
Provide _OFFSETOF_UC_GREGS_GP and use _OFFSETOF_UC_GREGS_* in getcontext
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/mips/genassym.cf
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/mips/sys/getcontext.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/mips/genassym.cf
diff -u src/lib/libc/arch/mips/genassym.cf:1.2 src/lib/libc/arch/mips/genassym.cf:1.3
--- src/lib/libc/arch/mips/genassym.cf:1.2 Mon Dec 14 01:07:41 2009
+++ src/lib/libc/arch/mips/genassym.cf Fri Aug 12 15:26:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.2 2009/12/14 01:07:41 matt Exp $
+# $NetBSD: genassym.cf,v 1.3 2016/08/12 15:26:04 skrll Exp $
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -36,8 +36,8 @@ include
include
include
-define _OFFSETOF_UC_GREGS offsetof(ucontext_t, uc_mcontext.__gregs[0])
define _OFFSETOF_UC_GREGS_V0 offsetof(ucontext_t, uc_mcontext.__gregs[_REG_V0])
+define _OFFSETOF_UC_GREGS_GP offsetof(ucontext_t, uc_mcontext.__gregs[_REG_GP])
define _OFFSETOF_UC_GREGS_SP offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP])
define _OFFSETOF_UC_GREGS_EPC offsetof(ucontext_t, uc_mcontext.__gregs[_REG_EPC])
define _OFFSETOF_UC_LINK offsetof(ucontext_t, uc_link)
Index: src/lib/libc/arch/mips/sys/getcontext.S
diff -u src/lib/libc/arch/mips/sys/getcontext.S:1.5 src/lib/libc/arch/mips/sys/getcontext.S:1.6
--- src/lib/libc/arch/mips/sys/getcontext.S:1.5 Wed Aug 10 16:45:24 2016
+++ src/lib/libc/arch/mips/sys/getcontext.S Fri Aug 12 15:26:04 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: getcontext.S,v 1.5 2016/08/10 16:45:24 skrll Exp $ */
+/* $NetBSD: getcontext.S,v 1.6 2016/08/12 15:26:04 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: getcontext.S,v 1.5 2016/08/10 16:45:24 skrll Exp $")
+ RCSID("$NetBSD: getcontext.S,v 1.6 2016/08/12 15:26:04 skrll Exp $")
#endif /* SYSLIBC_SCCS && !lint */
#ifdef WEAK_ALIAS
@@ -47,12 +47,12 @@ LEAF(_getcontext)
SYSTRAP(getcontext)
bne a3, zero, 1f
REG_PROLOGUE
- REG_S zero, (_OFFSETOF_UC_GREGS + _REG_V0 * SZREG)(a0)
+ REG_S zero, _OFFSETOF_UC_GREGS_V0(a0)
#if !defined(__mips_o32)
/* PIC_PROLOGUE saved gp in t3 */
- REG_S t3, (_OFFSETOF_UC_GREGS + _REG_GP * SZREG)(a0)
+ REG_S t3, _OFFSETOF_UC_GREGS_GP(a0)
#endif
- REG_S ra, (_OFFSETOF_UC_GREGS + _REG_EPC * SZREG)(a0)
+ REG_S ra, _OFFSETOF_UC_GREGS_EPC(a0)
REG_EPILOGUE
PIC_RETURN()
1:
CVS commit: src/sys/uvm
Module Name:src Committed By: skrll Date: Fri Aug 12 13:40:21 UTC 2016 Modified Files: src/sys/uvm: files.uvm Log Message: Make UVMHIST_PRINT work again by making it define KERNHIST_PRINT To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/uvm/files.uvm 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/files.uvm diff -u src/sys/uvm/files.uvm:1.25 src/sys/uvm/files.uvm:1.26 --- src/sys/uvm/files.uvm:1.25 Mon Jul 27 09:24:28 2015 +++ src/sys/uvm/files.uvm Fri Aug 12 13:40:21 2016 @@ -1,9 +1,10 @@ -# $NetBSD: files.uvm,v 1.25 2015/07/27 09:24:28 maxv Exp $ +# $NetBSD: files.uvm,v 1.26 2016/08/12 13:40:21 skrll Exp $ # # UVM options # -defflag opt_uvmhist.h UVMHIST UVMHIST_PRINT: KERNHIST +defflag opt_uvmhist.h UVMHIST: KERNHIST +defflag opt_uvmhist.h UVMHIST_PRINT: KERNHIST_PRINT defflag opt_uvm.h USE_TOPDOWN_VM UVMMAP_COUNTERS defparam opt_uvm.h UVM_RESERVED_PAGES_PER_CPU defflag opt_vmswap.h VMSWAP
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Fri Aug 12 11:44:24 UTC 2016
Modified Files:
src/sys/netinet6: scope6.c
Log Message:
In rump (ifp)->if_afdata[AF_INET6] == NULL if we did not register netinet6
yet. Treat this like we don't have a scope, and make the sid tests consistent.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/netinet6/scope6.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/netinet6/scope6.c
diff -u src/sys/netinet6/scope6.c:1.14 src/sys/netinet6/scope6.c:1.15
--- src/sys/netinet6/scope6.c:1.14 Wed Jun 15 02:01:21 2016
+++ src/sys/netinet6/scope6.c Fri Aug 12 07:44:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.14 2016/06/15 06:01:21 ozaki-r Exp $ */
+/* $NetBSD: scope6.c,v 1.15 2016/08/12 11:44:24 christos Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.14 2016/06/15 06:01:21 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.15 2016/08/12 11:44:24 christos Exp $");
#include
#include
@@ -56,7 +56,8 @@ int ip6_use_defzone = 0;
static struct scope6_id sid_default;
#define SID(ifp) \
- (((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->scope6_id)
+((ifp)->if_afdata[AF_INET6] == NULL ? NULL : \
+ ((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->scope6_id)
void
scope6_init(void)
@@ -100,9 +101,7 @@ scope6_set(struct ifnet *ifp, const stru
{
int i;
int error = 0;
- struct scope6_id *sid = NULL;
-
- sid = SID(ifp);
+ struct scope6_id *sid = SID(ifp);
if (!sid) /* paranoid? */
return (EINVAL);
@@ -393,7 +392,8 @@ in6_setscope(struct in6_addr *in6, const
uint32_t zoneid = 0;
const struct scope6_id *sid = SID(ifp);
- KASSERT(sid != NULL);
+ if (sid == NULL)
+ return EINVAL;
/*
* special case: the loopback address can only belong to a loopback
CVS commit: src/sys/rump/net/lib
Module Name:src Committed By: christos Date: Fri Aug 12 11:43:04 UTC 2016 Modified Files: src/sys/rump/net/lib/libnetinet: netinet_component.c src/sys/rump/net/lib/libnetinet6: netinet6_component.c Log Message: more loopinit(); To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libnetinet/netinet_component.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/rump/net/lib/libnetinet6/netinet6_component.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/net/lib/libnetinet/netinet_component.c diff -u src/sys/rump/net/lib/libnetinet/netinet_component.c:1.5 src/sys/rump/net/lib/libnetinet/netinet_component.c:1.6 --- src/sys/rump/net/lib/libnetinet/netinet_component.c:1.5 Tue Jan 26 18:12:19 2016 +++ src/sys/rump/net/lib/libnetinet/netinet_component.c Fri Aug 12 07:43:04 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: netinet_component.c,v 1.5 2016/01/26 23:12:19 pooka Exp $ */ +/* $NetBSD: netinet_component.c,v 1.6 2016/08/12 11:43:04 christos Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.5 2016/01/26 23:12:19 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.6 2016/08/12 11:43:04 christos Exp $"); #include #include @@ -54,6 +54,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_NET) domain_attach(); domain_attach(); + loopinit(); carpattach(1); rump_netisr_register(NETISR_ARP, arpintr); Index: src/sys/rump/net/lib/libnetinet6/netinet6_component.c diff -u src/sys/rump/net/lib/libnetinet6/netinet6_component.c:1.4 src/sys/rump/net/lib/libnetinet6/netinet6_component.c:1.5 --- src/sys/rump/net/lib/libnetinet6/netinet6_component.c:1.4 Tue Jan 26 18:12:19 2016 +++ src/sys/rump/net/lib/libnetinet6/netinet6_component.c Fri Aug 12 07:43:04 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: netinet6_component.c,v 1.4 2016/01/26 23:12:19 pooka Exp $ */ +/* $NetBSD: netinet6_component.c,v 1.5 2016/08/12 11:43:04 christos Exp $ */ /* * Copyright (c) 2013 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.4 2016/01/26 23:12:19 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.5 2016/08/12 11:43:04 christos Exp $"); #include #include @@ -48,6 +48,8 @@ RUMP_COMPONENT(RUMP_COMPONENT_NET) extern struct domain inet6domain; domain_attach(); + + loopinit(); } RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: nonaka Date: Fri Aug 12 09:26:35 UTC 2016 Modified Files: src/sys/arch/zaurus/conf: INSTALL INSTALL_C700 Log Message: remove some phy(4) from zaurus INSTALL kernel. avoid kernel size limit... To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/zaurus/conf/INSTALL cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/conf/INSTALL_C700 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/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.27 src/sys/arch/zaurus/conf/INSTALL:1.28 --- src/sys/arch/zaurus/conf/INSTALL:1.27 Tue Feb 16 05:14:31 2016 +++ src/sys/arch/zaurus/conf/INSTALL Fri Aug 12 09:26:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.27 2016/02/16 05:14:31 nonaka Exp $ +# $NetBSD: INSTALL,v 1.28 2016/08/12 09:26:35 nonaka Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -83,6 +83,16 @@ no ugen* no uk* at scsibus? +no acphy* +no amhphy* +no bmtphy* +no glxtphy* +no gphyter* +no makphy* +no tlphy* +no tqphy* +no urlphy* + no pseudo-device vnd no options VND_COMPRESSION no pseudo-device accf_data Index: src/sys/arch/zaurus/conf/INSTALL_C700 diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.1 src/sys/arch/zaurus/conf/INSTALL_C700:1.2 --- src/sys/arch/zaurus/conf/INSTALL_C700:1.1 Thu Feb 2 15:57:39 2012 +++ src/sys/arch/zaurus/conf/INSTALL_C700 Fri Aug 12 09:26:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_C700,v 1.1 2012/02/02 15:57:39 tsutsui Exp $ +# $NetBSD: INSTALL_C700,v 1.2 2016/08/12 09:26:35 nonaka Exp $ # # INSTALL config file (C700 with memory disk root) # @@ -45,13 +45,3 @@ no cue* no kue* no udav* no url* - -no acphy* -no amhphy* -no bmtphy* -no glxtphy* -no gphyter* -no makphy* -no tlphy* -no tqphy* -no urlphy*
CVS commit: src/usr.sbin/dumplfs
Module Name:src
Committed By: dholland
Date: Fri Aug 12 08:22:13 UTC 2016
Modified Files:
src/usr.sbin/dumplfs: dumplfs.c
Log Message:
If the number of inodes per block is zero, bail instead of using
uninitialized stack trash as a dinode pointer. Fixes PR 51409 where
"dumplfs /dev/zero" receives SIGSEGV.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/dumplfs/dumplfs.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/dumplfs/dumplfs.c
diff -u src/usr.sbin/dumplfs/dumplfs.c:1.62 src/usr.sbin/dumplfs/dumplfs.c:1.63
--- src/usr.sbin/dumplfs/dumplfs.c:1.62 Wed Jun 15 14:07:54 2016
+++ src/usr.sbin/dumplfs/dumplfs.c Fri Aug 12 08:22:13 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dumplfs.c,v 1.62 2016/06/15 14:07:54 riastradh Exp $ */
+/* $NetBSD: dumplfs.c,v 1.63 2016/08/12 08:22:13 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)dumplfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: dumplfs.c,v 1.62 2016/06/15 14:07:54 riastradh Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.63 2016/08/12 08:22:13 dholland Exp $");
#endif
#endif /* not lint */
@@ -336,12 +336,19 @@ dump_ifile(int fd, struct lfs *lfsp, int
err(1, "malloc");
get(fd, fsbtobyte(lfsp, addr), dpage, psize);
+ dip = NULL;
for (i = LFS_INOPB(lfsp); i-- > 0; ) {
dip = DINO_IN_BLOCK(lfsp, dpage, i);
if (lfs_dino_getinumber(lfsp, dip) == LFS_IFILE_INUM)
break;
}
+ /* just in case */
+ if (dip == NULL) {
+ warnx("this volume apparently has zero inodes per block");
+ return;
+ }
+
if (lfs_dino_getinumber(lfsp, dip) != LFS_IFILE_INUM) {
warnx("unable to locate ifile inode at disk address 0x%jx",
(uintmax_t)addr);
