CVS commit: src/distrib/notes/common
Module Name:src Committed By: pedro Date: Mon Feb 10 06:36:53 UTC 2014 Modified Files: src/distrib/notes/common: main Log Message: add myself To generate a diff of this commit: cvs rdiff -u -r1.504 -r1.505 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.504 src/distrib/notes/common/main:1.505 --- src/distrib/notes/common/main:1.504 Sat Feb 8 15:50:29 2014 +++ src/distrib/notes/common/main Mon Feb 10 06:36:53 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.504 2014/02/08 15:50:29 maxv Exp $ +.\" $NetBSD: main,v 1.505 2014/02/10 06:36:53 pedro Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1287,6 +1287,7 @@ If you're one of them, and would like to .It Ta Anthony Mallet Ta Mt t...@netbsd.org .It Ta John Marino Ta Mt mar...@netbsd.org .It Ta Roy Marples Ta Mt r...@netbsd.org +.It Ta Pedro Martelletto Ta Mt pe...@netbsd.org .It Ta Cherry G. Mathew Ta Mt che...@netbsd.org .It Ta David Maxwell Ta Mt da...@netbsd.org .It Ta Gregory McGarry Ta Mt gmcga...@netbsd.org
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: pedro Date: Fri Jan 10 16:47:07 UTC 2014 Modified Files: src/sys/arch/i386/i386: copy.S Log Message: Fix a comment describing the check performed by copyin(); the value checked against VM_MAXUSER_ADDRESS is derived from the source address, not the destination address. OK rmind@. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/i386/copy.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/i386/i386/copy.S diff -u src/sys/arch/i386/i386/copy.S:1.22 src/sys/arch/i386/i386/copy.S:1.23 --- src/sys/arch/i386/i386/copy.S:1.22 Wed Jul 7 01:21:15 2010 +++ src/sys/arch/i386/i386/copy.S Fri Jan 10 16:47:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: copy.S,v 1.22 2010/07/07 01:21:15 chs Exp $ */ +/* $NetBSD: copy.S,v 1.23 2014/01/10 16:47:07 pedro Exp $ */ /* NetBSD: locore.S,v 1.34 2005/04/01 11:59:31 yamt Exp $ */ /*- @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: copy.S,v 1.22 2010/07/07 01:21:15 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: copy.S,v 1.23 2014/01/10 16:47:07 pedro Exp $"); #include "assym.h" @@ -270,9 +270,9 @@ ENTRY(copyin) movl 16(%esp),%edi movl 20(%esp),%eax /* - * We check that the end of the destination buffer is not past the end - * of the user's address space. If it's not, then we only need to - * check that each page is readable, and the CPU will do that for us. + * We check that the end of the source buffer is not past the end of + * the user's address space. If it's not, then we only need to check + * that each page is readable, and the CPU will do that for us. */ .Lcopyin_start: movl %esi,%edx
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: pedro
Date: Fri Jan 10 16:42:38 UTC 2014
Modified Files:
src/sys/fs/tmpfs: tmpfs_vnops.c
Log Message:
Prevent a diagnostic assertion in tmpfs_rmdir() from being triggered
through an rmdir on ".." by moving it so it happens after the check for
empty directories; OK rmind@.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/fs/tmpfs/tmpfs_vnops.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_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.111 src/sys/fs/tmpfs/tmpfs_vnops.c:1.112
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.111 Fri Jan 3 09:53:12 2014
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Fri Jan 10 16:42:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.111 2014/01/03 09:53:12 hannken Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.112 2014/01/10 16:42:38 pedro Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.111 2014/01/03 09:53:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.112 2014/01/10 16:42:38 pedro Exp $");
#include
#include
@@ -837,7 +837,6 @@ tmpfs_rmdir(void *v)
KASSERT(VOP_ISLOCKED(dvp));
KASSERT(VOP_ISLOCKED(vp));
- KASSERT(node->tn_spec.tn_dir.tn_parent == dnode);
/*
* Directories with more than two entries ('.' and '..') cannot be
@@ -861,6 +860,8 @@ tmpfs_rmdir(void *v)
KASSERT(error == 0);
}
+ KASSERT(node->tn_spec.tn_dir.tn_parent == dnode);
+
/* Lookup the directory entry (check the cached hint first). */
de = tmpfs_dir_cached(node);
if (de == NULL) {
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: pedro
Date: Wed Jan 8 16:11:04 UTC 2014
Modified Files:
src/sys/fs/tmpfs: tmpfs_subr.c
Log Message:
Allocate direntp on the stack in tmpfs_dir_getdents(), thus saving
calls to kmem_zalloc() and kmem_free(); OK rmind@. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/fs/tmpfs/tmpfs_subr.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_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.93 src/sys/fs/tmpfs/tmpfs_subr.c:1.94
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.93 Fri Jan 3 09:53:12 2014
+++ src/sys/fs/tmpfs/tmpfs_subr.c Wed Jan 8 16:11:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_subr.c,v 1.93 2014/01/03 09:53:12 hannken Exp $ */
+/* $NetBSD: tmpfs_subr.c,v 1.94 2014/01/08 16:11:04 pedro Exp $ */
/*
* Copyright (c) 2005-2013 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.93 2014/01/03 09:53:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.94 2014/01/08 16:11:04 pedro Exp $");
#include
#include
@@ -797,26 +797,26 @@ int
tmpfs_dir_getdents(tmpfs_node_t *node, struct uio *uio, off_t *cntp)
{
tmpfs_dirent_t *de;
- struct dirent *dentp;
+ struct dirent dent;
int error = 0;
KASSERT(VOP_ISLOCKED(node->tn_vnode));
TMPFS_VALIDATE_DIR(node);
/*
- * Allocate struct dirent and first check for the "." and "..".
+ * First check for the "." and ".." cases.
* Note: tmpfs_dir_getdotents() will "seek" for us.
*/
- dentp = kmem_zalloc(sizeof(struct dirent), KM_SLEEP);
+ memset(&dent, 0, sizeof(dent));
if (uio->uio_offset == TMPFS_DIRSEQ_DOT) {
- if ((error = tmpfs_dir_getdotents(node, dentp, uio)) != 0) {
+ if ((error = tmpfs_dir_getdotents(node, &dent, uio)) != 0) {
goto done;
}
(*cntp)++;
}
if (uio->uio_offset == TMPFS_DIRSEQ_DOTDOT) {
- if ((error = tmpfs_dir_getdotents(node, dentp, uio)) != 0) {
+ if ((error = tmpfs_dir_getdotents(node, &dent, uio)) != 0) {
goto done;
}
(*cntp)++;
@@ -840,26 +840,26 @@ tmpfs_dir_getdents(tmpfs_node_t *node, s
*/
do {
if (de->td_node == TMPFS_NODE_WHITEOUT) {
- dentp->d_fileno = 1;
- dentp->d_type = DT_WHT;
+ dent.d_fileno = 1;
+ dent.d_type = DT_WHT;
} else {
- dentp->d_fileno = de->td_node->tn_id;
- dentp->d_type = vtype2dt(de->td_node->tn_type);
+ dent.d_fileno = de->td_node->tn_id;
+ dent.d_type = vtype2dt(de->td_node->tn_type);
}
- dentp->d_namlen = de->td_namelen;
- KASSERT(de->td_namelen < sizeof(dentp->d_name));
- memcpy(dentp->d_name, de->td_name, de->td_namelen);
- dentp->d_name[de->td_namelen] = '\0';
- dentp->d_reclen = _DIRENT_SIZE(dentp);
+ dent.d_namlen = de->td_namelen;
+ KASSERT(de->td_namelen < sizeof(dent.d_name));
+ memcpy(dent.d_name, de->td_name, de->td_namelen);
+ dent.d_name[de->td_namelen] = '\0';
+ dent.d_reclen = _DIRENT_SIZE(&dent);
- if (dentp->d_reclen > uio->uio_resid) {
+ if (dent.d_reclen > uio->uio_resid) {
/* Exhausted UIO space. */
error = EJUSTRETURN;
break;
}
/* Copy out the directory entry and continue. */
- error = uiomove(dentp, dentp->d_reclen, uio);
+ error = uiomove(&dent, dent.d_reclen, uio);
if (error) {
break;
}
@@ -873,7 +873,6 @@ tmpfs_dir_getdents(tmpfs_node_t *node, s
node->tn_spec.tn_dir.tn_readdir_lastp = de;
done:
tmpfs_update(node->tn_vnode, TMPFS_UPDATE_ATIME);
- kmem_free(dentp, sizeof(struct dirent));
if (error == EJUSTRETURN) {
/* Exhausted UIO space - just return. */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: pedro Date: Fri Dec 13 07:11:09 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add entries for Atheros AR9462 and a new flavour of Intel Haswell Integrated Graphics Device; OK rmind@ mbalmer@ To generate a diff of this commit: cvs rdiff -u -r1.1167 -r1.1168 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1167 src/sys/dev/pci/pcidevs:1.1168 --- src/sys/dev/pci/pcidevs:1.1167 Thu Dec 12 15:05:07 2013 +++ src/sys/dev/pci/pcidevs Fri Dec 13 07:11:09 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1167 2013/12/12 15:05:07 nonaka Exp $ +$NetBSD: pcidevs,v 1.1168 2013/12/13 07:11:09 pedro Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1557,6 +1557,7 @@ product ATHEROS AR9227 0x002d AR9227 Wi product ATHEROS AR9287 0x002e AR9287 Wireless LAN product ATHEROS AR9300 0x0030 AR9300 Wireless LAN product ATHEROS AR9485 0x0032 AR9485 Wireless LAN +product ATHEROS AR9462 0x0034 AR9462 Wireless LAN product ATHEROS AR5201_AP 0x0207 AR5201 Wireless LAN Reference Card (Early AP11) product ATHEROS AR5201_DEFAULT 0x1107 AR5201 Wireless LAN (no eeprom) product ATHEROS AR5212_DEFAULT 0x1113 AR5212 Wireless LAN (no eeprom) @@ -2547,6 +2548,7 @@ product INTEL SRCZCRX 0x0407 RAID Contr product INTEL SRCU42E 0x0408 SCSI RAID Controller product INTEL SRCS28X 0x0409 SATA RAID Controller product INTEL HASWELL_IGD 0x0402 Haswell Integrated Graphics Device +product INTEL HASWELL_IGD_1 0x0412 Haswell Integrated Graphics Device product INTEL I347AT4 0x0438 I347-AT4 Gigabit Network Connection product INTEL PCEB 0x0482 82375EB/SB PCI-EISA Bridge product INTEL CDC 0x0483 82424ZX Cache and DRAM Controller
