CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Fri Nov 19 08:11:04 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
More adjustment.
Reorder
genfs_node_unlock() - putiobuf()
to
putiobuf() - genfs_node_unlock()
but I don't think there's any constraint between these two.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.43 -r1.36.2.44 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.43 src/sys/miscfs/genfs/genfs_io.c:1.36.2.44
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.43 Fri Nov 19 07:09:49 2010
+++ src/sys/miscfs/genfs/genfs_io.c Fri Nov 19 08:11:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.43 2010/11/19 07:09:49 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.44 2010/11/19 08:11:04 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.43 2010/11/19 07:09:49 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.44 2010/11/19 08:11:04 uebayasi Exp $);
#include opt_xip.h
@@ -62,6 +62,8 @@
#ifdef XIP
static int genfs_do_getpages_xip_io(struct vnode *, voff_t, struct vm_page **,
int *, int, vm_prot_t, int, int, const int);
+static int genfs_do_getpages_xip_io_done(struct vnode *, voff_t, struct vm_page **,
+int *, int, vm_prot_t, int, int, const int);
static int genfs_do_putpages_xip(struct vnode *, off_t, off_t, int,
struct vm_page **);
#endif
@@ -475,26 +477,10 @@
mutex_exit(uobj-vmobjlock);
-#if 1
- if ((ap-a_vp-v_vflag VV_XIP) != 0) {
- error = genfs_do_getpages_xip_io(
- ap-a_vp,
- ap-a_offset,
- ap-a_m,
- ap-a_count,
- ap-a_centeridx,
- ap-a_access_type,
- ap-a_advice,
- ap-a_flags,
- orignmempages);
- goto out_err_free;
- }
-#endif
-
{
size_t bytes, iobytes, tailstart, tailbytes, totalbytes, skipbytes;
- vaddr_t kva;
- struct buf *bp, *mbp;
+ vaddr_t kva = 0;
+ struct buf *bp = NULL, *mbp = NULL;
bool sawhole = false;
/*
@@ -506,6 +492,11 @@
tailbytes = totalbytes - bytes;
skipbytes = 0;
+#if 1
+ if ((ap-a_vp-v_vflag VV_XIP) != 0)
+ goto genfs_getpages_bio_prepare_done;
+#endif
+
kva = uvm_pagermapin(pgs, npages,
UVMPAGER_MAPIN_READ | UVMPAGER_MAPIN_WAITOK);
@@ -526,6 +517,10 @@
else
BIO_SETPRIO(mbp, BPRIO_TIMECRITICAL);
+#if 1
+genfs_getpages_bio_prepare_done:
+#endif
+
/*
* if EOF is in the middle of the range, zero the part past EOF.
* skip over pages which are not PG_FAKE since in that case they have
@@ -546,6 +541,22 @@
tailbytes -= len;
}
+#if 1
+ if ((ap-a_vp-v_vflag VV_XIP) != 0) {
+ error = genfs_do_getpages_xip_io(
+ ap-a_vp,
+ ap-a_offset,
+ ap-a_m,
+ ap-a_count,
+ ap-a_centeridx,
+ ap-a_access_type,
+ ap-a_advice,
+ ap-a_flags,
+ orignmempages);
+ goto loopdone;
+ }
+#endif
+
/*
* now loop over the pages, reading as needed.
*/
@@ -675,6 +686,16 @@
}
loopdone:
+#if 1
+ if ((ap-a_vp-v_vflag VV_XIP) != 0)
+ goto genfs_getpages_biodone_done;
+#endif
+#if 0
+
+int
+genfs_getpages_biodone()
+{
+#endif
nestiobuf_done(mbp, skipbytes, error);
if (async) {
UVMHIST_LOG(ubchist, returning 0 (async),0,0,0,0);
@@ -731,12 +752,47 @@
}
}
}
+
+ putiobuf(mbp);
+#if 0
+}
+
+#endif
+#if 1
+genfs_getpages_biodone_done:
+ {}
+#endif
+}
+
if (!glocked) {
genfs_node_unlock(vp);
}
- putiobuf(mbp);
-}
+#if 1
+ if ((ap-a_vp-v_vflag VV_XIP) != 0) {
+ error = genfs_do_getpages_xip_io_done(
+ ap-a_vp,
+ ap-a_offset,
+ ap-a_m,
+ ap-a_count,
+ ap-a_centeridx,
+ ap-a_access_type,
+ ap-a_advice,
+ ap-a_flags,
+ orignmempages);
+ goto genfs_getpages_generic_io_done_done;
+ }
+#endif
+#if 0
+ else {
+ error = genfs_getpages_generic_io_done();
+ }
+}
+
+int
+genfs_getpages_generic_io_done()
+{
+#endif
mutex_enter(uobj-vmobjlock);
@@ -804,6 +860,7 @@
}
}
mutex_exit(uvm_pageqlock);
+
if (memwrite) {
genfs_markdirty(vp);
}
@@ -812,6 +869,14 @@
memcpy(ap-a_m, pgs[ridx],
orignmempages * sizeof(struct vm_page *));
}
+#if 0
+}
+
+#endif
+#if 1
+genfs_getpages_generic_io_done_done:
+ {}
+#endif
out_err_free:
if (pgs != NULL pgs != pgs_onstack)
@@ -841,9 +906,6 @@
int flags,
const int orignmempages)
{
- struct uvm_object * const uobj = vp-v_uobj;
- const bool glocked = (flags PGO_GLOCKHELD) != 0;
-
const int fs_bshift = vp2fs_bshift(vp);
const int dev_bshift = vp2dev_bshift(vp);
const int fs_bsize = 1 fs_bshift;
@@ -872,7 +934,7 @@
UVMHIST_FUNC(genfs_do_getpages_xip_io); UVMHIST_CALLED(ubchist);
- KASSERT(glocked || genfs_node_rdlocked(vp));
+ KASSERT(((flags PGO_GLOCKHELD) != 0) || genfs_node_rdlocked(vp));
#if 0
GOP_SIZE(vp, vp-v_size, memeof, GOP_SIZE_MEM);
@@ -936,6
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src Committed By: uebayasi Date: Fri Nov 19 08:12:12 UTC 2010 Modified Files: src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c Log Message: Remove unused code. To generate a diff of this commit: cvs rdiff -u -r1.36.2.44 -r1.36.2.45 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.44 src/sys/miscfs/genfs/genfs_io.c:1.36.2.45 --- src/sys/miscfs/genfs/genfs_io.c:1.36.2.44 Fri Nov 19 08:11:04 2010 +++ src/sys/miscfs/genfs/genfs_io.c Fri Nov 19 08:12:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: genfs_io.c,v 1.36.2.44 2010/11/19 08:11:04 uebayasi Exp $ */ +/* $NetBSD: genfs_io.c,v 1.36.2.45 2010/11/19 08:12:12 uebayasi Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.44 2010/11/19 08:11:04 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.45 2010/11/19 08:12:12 uebayasi Exp $); #include opt_xip.h @@ -909,47 +909,15 @@ const int fs_bshift = vp2fs_bshift(vp); const int dev_bshift = vp2dev_bshift(vp); const int fs_bsize = 1 fs_bshift; -#if 0 -#define blk_mask (fs_bsize - 1) -#define trunc_blk(x) ((x) ~blk_mask) -#define round_blk(x) (((x) + blk_mask) ~blk_mask) - - const int orignmempages = MIN(orignpages, - round_page(memeof - origoffset) PAGE_SHIFT); - npages = orignmempages; - const off_t startoffset = trunc_blk(origoffset); - const off_t endoffset = MIN( - round_page(round_blk(origoffset + (npages PAGE_SHIFT))), - round_page(memeof)); - const int ridx = (origoffset - startoffset) PAGE_SHIFT; -#endif int error; off_t off; -#if 0 - off_t memeof; - int orignmempages; -#endif int i; UVMHIST_FUNC(genfs_do_getpages_xip_io); UVMHIST_CALLED(ubchist); KASSERT(((flags PGO_GLOCKHELD) != 0) || genfs_node_rdlocked(vp)); -#if 0 - GOP_SIZE(vp, vp-v_size, memeof, GOP_SIZE_MEM); - orignmempages = MIN(orignpages, round_page(memeof - origoffset) PAGE_SHIFT); -#endif - -#if 0 - int fs_bshift, fs_bsize, dev_bshift, dev_bsize; - - fs_bshift = vp-v_mount-mnt_fs_bshift; - fs_bsize = 1 fs_bshift; - dev_bshift = vp-v_mount-mnt_dev_bshift; - dev_bsize = 1 dev_bshift; -#endif - #ifdef UVMHIST const off_t startoffset = trunc_blk(origoffset); const off_t endoffset = round_blk(origoffset + PAGE_SIZE * orignmempages);
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Fri Nov 19 08:39:25 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Comment.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.45 -r1.36.2.46 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.45 src/sys/miscfs/genfs/genfs_io.c:1.36.2.46
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.45 Fri Nov 19 08:12:12 2010
+++ src/sys/miscfs/genfs/genfs_io.c Fri Nov 19 08:39:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.45 2010/11/19 08:12:12 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.46 2010/11/19 08:39:25 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.45 2010/11/19 08:12:12 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.46 2010/11/19 08:39:25 uebayasi Exp $);
#include opt_xip.h
@@ -220,20 +220,20 @@
if (flags PGO_LOCKED) {
#if 0
- genfs_do_getpages_locked();
+ genfs_getpages_mem();
} else {
- genfs_do_getpages_unlocked();
+ genfs_getpages_io();
}
}
int
-genfs_do_getpages_locked()
+genfs_getpages_mem()
{
#endif
int nfound;
struct vm_page *pg;
-#if 1
+#ifdef XIP
if ((ap-a_vp-v_vflag VV_XIP) != 0) {
*ap-a_count = 0;
return 0;
@@ -284,7 +284,7 @@
}
int
-genfs_do_getpages_unlocked()
+genfs_getpages_io()
{
#endif
/*
@@ -331,7 +331,13 @@
UVMHIST_LOG(ubchist, ridx %d npages %d startoff %ld endoff %ld,
ridx, npages, startoffset, endoffset);
+#if 0
+}
+int
+genfs_getpages_io_relock()
+{
+#endif
if (!has_trans) {
fstrans_start(vp-v_mount, FSTRANS_SHARED);
has_trans = true;
@@ -360,10 +366,16 @@
kmem_free(pgs, pgs_size);
goto startover;
}
+#if 0
+}
-#if 1
+int
+genfs_getpages_io_findpages()
+{
+#endif
+#ifdef XIP
if ((ap-a_vp-v_vflag VV_XIP) != 0)
- goto find_pagecache_done;
+ goto genfs_getpages_allocpages_done;
#endif
if (uvn_findpages(uobj, origoffset, npages, pgs[ridx],
@@ -405,14 +417,14 @@
if (overwrite) {
#if 0
- genfs_do_getpages_overwrite();
+ genfs_getpages_io_overwrite();
} else {
- genfs_do_getpages_io();
+ genfs_getpages_io_read();
}
}
int
-genfs_do_getpages_overwrite()
+genfs_getpages_io_overwrite()
{
{
#endif
@@ -433,7 +445,7 @@
}
int
-genfs_do_getpages_io()
+genfs_getpages_io_read()
{
#endif
/*
@@ -441,7 +453,13 @@
* so we're going to have to do some i/o.
* find any additional pages needed to cover the expanded range.
*/
+#if 0
+}
+int
+genfs_getpages_io_read_allocpages()
+{
+#endif
npages = (endoffset - startoffset) PAGE_SHIFT;
if (startoffset != origoffset || npages != orignmempages) {
int npgs;
@@ -470,11 +488,16 @@
goto out_err_free;
}
}
-
-#if 1
-find_pagecache_done:
+#ifdef XIP
+genfs_getpages_io_read_allocpages_done:
#endif
+#if 0
+}
+int
+genfs_getpages_io_read_bio()
+{
+#endif
mutex_exit(uobj-vmobjlock);
{
@@ -496,7 +519,13 @@
if ((ap-a_vp-v_vflag VV_XIP) != 0)
goto genfs_getpages_bio_prepare_done;
#endif
+#if 0
+}
+int
+genfs_getpages_io_read_bio_prepare()
+{
+#endif
kva = uvm_pagermapin(pgs, npages,
UVMPAGER_MAPIN_READ | UVMPAGER_MAPIN_WAITOK);
@@ -516,7 +545,10 @@
BIO_SETPRIO(mbp, BPRIO_TIMELIMITED);
else
BIO_SETPRIO(mbp, BPRIO_TIMECRITICAL);
+#if 0
+}
+#endif
#if 1
genfs_getpages_bio_prepare_done:
#endif
@@ -556,7 +588,13 @@
goto loopdone;
}
#endif
+#if 0
+}
+int
+genfs_getpages_io_read_bio_loop()
+{
+#endif
/*
* now loop over the pages, reading as needed.
*/
CVS commit: src/sys/dev
Module Name:src
Committed By: dholland
Date: Fri Nov 19 09:08:26 UTC 2010
Modified Files:
src/sys/dev: kloader.c
Log Message:
add missing pathbuf_destroy on error path, noticed by enami
XXX: this code is wrong; it should not be calling namei and then
XXX: vn_open on the same nameidata.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/kloader.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/kloader.c
diff -u src/sys/dev/kloader.c:1.24 src/sys/dev/kloader.c:1.25
--- src/sys/dev/kloader.c:1.24 Fri Nov 19 06:44:39 2010
+++ src/sys/dev/kloader.c Fri Nov 19 09:08:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.c,v 1.24 2010/11/19 06:44:39 dholland Exp $ */
+/* $NetBSD: kloader.c,v 1.25 2010/11/19 09:08:26 dholland Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kloader.c,v 1.24 2010/11/19 06:44:39 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: kloader.c,v 1.25 2010/11/19 09:08:26 dholland Exp $);
#include debug_kloader.h
@@ -607,6 +607,7 @@
error = vn_open(nid, FREAD, 0);
if (error != 0) {
PRINTF(%s: open failed, errno=%d\n, filename, error);
+ pathbuf_destroy(pb);
return (NULL);
}
CVS commit: src/sys/dev
Module Name:src
Committed By: dholland
Date: Fri Nov 19 09:11:45 UTC 2010
Modified Files:
src/sys/dev: ccd.c
Log Message:
Fix previous, was all wrong. noticed by enami.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/dev/ccd.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/ccd.c
diff -u src/sys/dev/ccd.c:1.136 src/sys/dev/ccd.c:1.137
--- src/sys/dev/ccd.c:1.136 Fri Nov 19 06:44:39 2010
+++ src/sys/dev/ccd.c Fri Nov 19 09:11:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.136 2010/11/19 06:44:39 dholland Exp $ */
+/* $NetBSD: ccd.c,v 1.137 2010/11/19 09:11:45 dholland Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -127,7 +127,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.136 2010/11/19 06:44:39 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.137 2010/11/19 09:11:45 dholland Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1173,10 +1173,9 @@
printf(ccdioctl: lookedup = %d\n, lookedup);
#endif
error = pathbuf_copyin(cpp[i], pb);
- if (error) {
-goto out;
+ if (error == 0) {
+error = dk_lookup(pb, l, vpp[i]);
}
- error = dk_lookup(pb, l, vpp[i]);
pathbuf_destroy(pb);
if (error != 0) {
for (j = 0; j lookedup; ++j)
CVS commit: src/tests/games
Module Name:src
Committed By: pgoyette
Date: Fri Nov 19 12:31:36 UTC 2010
Modified Files:
src/tests/games: t_factor.sh
Log Message:
Since /usr/games is rarely in one's $PATH, provide an absolute path to the
test-program. This lets automated testing reach and execute a couple more
tests rather than skipping them.
Discussed privately with pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/games/t_factor.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/games/t_factor.sh
diff -u src/tests/games/t_factor.sh:1.6 src/tests/games/t_factor.sh:1.7
--- src/tests/games/t_factor.sh:1.6 Sun Nov 7 17:51:19 2010
+++ src/tests/games/t_factor.sh Fri Nov 19 12:31:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_factor.sh,v 1.6 2010/11/07 17:51:19 jmmv Exp $
+# $NetBSD: t_factor.sh,v 1.7 2010/11/19 12:31:36 pgoyette Exp $
#
# Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -27,13 +27,13 @@
expect() {
echo ${2} expout
- atf_check -s eq:0 -o file:expout -e empty factor ${1}
+ atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
}
atf_test_case overflow
overflow_head() {
atf_set descr Tests for overflow conditions
- atf_set require.progs factor
+ atf_set require.progs /usr/games/factor
}
overflow_body() {
expect '8675309' '8675309: 8675309'
@@ -44,7 +44,7 @@
loop_head() {
atf_set descr Tests some cases that once locked the program \
in an infinite loop
- atf_set require.progs factor
+ atf_set require.progs /usr/games/factor
}
loop_body() {
expect '91' '91: 7 13 769231 1428571'
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: pooka
Date: Fri Nov 19 12:36:50 UTC 2010
Modified Files:
src/tests/fs/ffs: Makefile
Added Files:
src/tests/fs/ffs: t_snapshot_v2.c
Log Message:
test snapshots on ffsv2 too
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/ffs/t_snapshot_v2.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/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.13 src/tests/fs/ffs/Makefile:1.14
--- src/tests/fs/ffs/Makefile:1.13 Fri Nov 5 11:32:09 2010
+++ src/tests/fs/ffs/Makefile Fri Nov 19 12:36:49 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/11/05 11:32:09 pooka Exp $
+# $NetBSD: Makefile,v 1.14 2010/11/19 12:36:49 pooka Exp $
#
.include bsd.own.mk
@@ -9,6 +9,7 @@
TESTS_C+= t_fifos
TESTS_C+= t_snapshot
TESTS_C+= t_snapshot_log
+TESTS_C+= t_snapshot_v2
TESTS_C+= t_mount
LDADD+=-lrumpfs_ffs # ffs
Added files:
Index: src/tests/fs/ffs/t_snapshot_v2.c
diff -u /dev/null src/tests/fs/ffs/t_snapshot_v2.c:1.1
--- /dev/null Fri Nov 19 12:36:50 2010
+++ src/tests/fs/ffs/t_snapshot_v2.c Fri Nov 19 12:36:49 2010
@@ -0,0 +1,42 @@
+/* $NetBSD: t_snapshot_v2.c,v 1.1 2010/11/19 12:36:49 pooka Exp $ */
+
+#include sys/types.h
+#include sys/mount.h
+
+#include rump/rump.h
+#include rump/rump_syscalls.h
+
+#include ufs/ufs/ufsmount.h
+
+#include atf-c.h
+#include fcntl.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include unistd.h
+
+#include ../../h_macros.h
+
+#define IMGNAME ffs.img
+#define NEWFS newfs -F -s 1 -O 2 IMGNAME
+#define BAKNAME /mnt/le_snapp
+
+static void
+mount_diskfs(const char *fspec, const char *path)
+{
+ struct ufs_args uargs;
+
+ uargs.fspec = __UNCONST(fspec);
+
+ if (rump_sys_mount(MOUNT_FFS, path, 0, uargs, sizeof(uargs)) == -1)
+ atf_tc_fail_errno(mount ffs %s, path);
+}
+
+static void
+begin(void)
+{
+
+ /* empty */
+}
+
+#include ../common/snapshot.c
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Fri Nov 19 12:37:48 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +tp To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/lists/tests/mi 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.156 src/distrib/sets/lists/tests/mi:1.157 --- src/distrib/sets/lists/tests/mi:1.156 Tue Nov 16 14:04:11 2010 +++ src/distrib/sets/lists/tests/mi Fri Nov 19 12:37:48 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.156 2010/11/16 14:04:11 tron Exp $ +# $NetBSD: mi,v 1.157 2010/11/19 12:37:48 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -228,6 +228,7 @@ ./usr/libdata/debug/usr/tests/fs/ffs/t_renamerace.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/fs/ffs/t_snapshot.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_snapshot_log.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/t_snapshot_v2.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/kernfs tests-fs-debug ./usr/libdata/debug/usr/tests/fs/kernfs/t_basic.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/lfs tests-fs-debug @@ -1040,6 +1041,7 @@ ./usr/tests/fs/ffs/t_renamerace tests-obsolete obsolete ./usr/tests/fs/ffs/t_snapshot tests-fs-tests atf ./usr/tests/fs/ffs/t_snapshot_log tests-fs-tests atf +./usr/tests/fs/ffs/t_snapshot_v2 tests-fs-tests atf ./usr/tests/fs/kernfstests-fs-tests ./usr/tests/fs/kernfs/Atffile tests-fs-tests atf ./usr/tests/fs/kernfs/t_basic tests-fs-tests atf
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Fri Nov 19 13:38:18 UTC 2010
Modified Files:
src/sys/dev/pci: vga_pci.c
Log Message:
add PCI_MAGIC_IO_RANGE so non-x86 machines can map the IO range belonging to
the console vga
thanks to nick for reminding me to commit this and for confirming that it works
as intended
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/vga_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/vga_pci.c
diff -u src/sys/dev/pci/vga_pci.c:1.50 src/sys/dev/pci/vga_pci.c:1.51
--- src/sys/dev/pci/vga_pci.c:1.50 Tue Nov 9 21:12:19 2010
+++ src/sys/dev/pci/vga_pci.c Fri Nov 19 13:38:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.50 2010/11/09 21:12:19 shattered Exp $ */
+/* $NetBSD: vga_pci.c,v 1.51 2010/11/19 13:38:17 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga_pci.c,v 1.50 2010/11/09 21:12:19 shattered Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga_pci.c,v 1.51 2010/11/19 13:38:17 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -351,6 +351,16 @@
return (bus_space_mmap(vc-hdl.vh_memt, IOM_BEGIN,
(offset - IOM_BEGIN), prot, 0));
+#ifdef PCI_MAGIC_IO_RANGE
+ /* allow to map our IO space on non-x86 machines */
+ if ((offset = PCI_MAGIC_IO_RANGE)
+ (offset PCI_MAGIC_IO_RANGE + 0x1)) {
+ return bus_space_mmap(vc-hdl.vh_iot,
+ offset - PCI_MAGIC_IO_RANGE,
+ 0, prot, BUS_SPACE_MAP_LINEAR);
+ }
+#endif
+
/* Range not found. */
return (-1);
}
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Fri Nov 19 15:25:37 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
genfs_*_xip_io: Adjust start offset.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.46 -r1.36.2.47 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.46 src/sys/miscfs/genfs/genfs_io.c:1.36.2.47
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.46 Fri Nov 19 08:39:25 2010
+++ src/sys/miscfs/genfs/genfs_io.c Fri Nov 19 15:25:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.46 2010/11/19 08:39:25 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.47 2010/11/19 15:25:37 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.46 2010/11/19 08:39:25 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.47 2010/11/19 15:25:37 uebayasi Exp $);
#include opt_xip.h
@@ -375,7 +375,7 @@
#endif
#ifdef XIP
if ((ap-a_vp-v_vflag VV_XIP) != 0)
- goto genfs_getpages_allocpages_done;
+ goto genfs_getpages_io_read_allocpages_done;
#endif
if (uvn_findpages(uobj, origoffset, npages, pgs[ridx],
@@ -578,7 +578,7 @@
error = genfs_do_getpages_xip_io(
ap-a_vp,
ap-a_offset,
- ap-a_m,
+ pgs,
ap-a_count,
ap-a_centeridx,
ap-a_access_type,
@@ -811,7 +811,7 @@
error = genfs_do_getpages_xip_io_done(
ap-a_vp,
ap-a_offset,
- ap-a_m,
+ pgs,
ap-a_count,
ap-a_centeridx,
ap-a_access_type,
@@ -903,6 +903,10 @@
genfs_markdirty(vp);
}
mutex_exit(uobj-vmobjlock);
+#if 1
+genfs_getpages_generic_io_done_done:
+ {}
+#endif
if (ap-a_m != NULL) {
memcpy(ap-a_m, pgs[ridx],
orignmempages * sizeof(struct vm_page *));
@@ -911,10 +915,6 @@
}
#endif
-#if 1
-genfs_getpages_generic_io_done_done:
- {}
-#endif
out_err_free:
if (pgs != NULL pgs != pgs_onstack)
@@ -964,8 +964,10 @@
UVMHIST_LOG(ubchist, xip npages=%d startoffset=%lx endoffset=%lx,
orignmempages, (long)startoffset, (long)endoffset, 0);
+ const int ridx = (origoffset - startoffset) PAGE_SHIFT;
+
off = origoffset;
- for (i = 0; i orignmempages; i++) {
+ for (i = ridx; i ridx + orignmempages; i++) {
daddr_t lbn, blkno;
int run;
struct vnode *devvp;
@@ -1022,9 +1024,15 @@
struct uvm_object * const uobj = vp-v_uobj;
int i;
+ const int fs_bshift = vp2fs_bshift(vp);
+ const int fs_bsize = 1 fs_bshift;
+
+ const off_t startoffset = trunc_blk(origoffset);
+ const int ridx = (origoffset - startoffset) PAGE_SHIFT;
+
mutex_enter(uobj-vmobjlock);
- for (i = 0; i orignmempages; i++) {
+ for (i = ridx; i ridx + orignmempages; i++) {
struct vm_page *pg = pps[i];
KASSERT((pg-flags PG_RDONLY) != 0);
CVS commit: src/lib
Module Name:src
Committed By: pooka
Date: Fri Nov 19 15:25:50 UTC 2010
Modified Files:
src/lib/librumpclient: rumpclient.c
src/lib/librumpuser: rumpuser_sp.c sp_common.c
Log Message:
Start working on making the syscall proxy code threadsafe. The
basics are there, but a few more tweaks are needed. The reason
I'm committing it now is that the code was mindnumbingly boring to
write (no wonder it took me almost 3 years to get it done), and I
might burn it if it's not in a safe place.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/librumpclient/rumpclient.c
cvs rdiff -u -r1.6 -r1.7 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r1.3 -r1.4 src/lib/librumpuser/sp_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.2 src/lib/librumpclient/rumpclient.c:1.3
--- src/lib/librumpclient/rumpclient.c:1.2 Fri Nov 5 13:50:48 2010
+++ src/lib/librumpclient/rumpclient.c Fri Nov 19 15:25:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.2 2010/11/05 13:50:48 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.3 2010/11/19 15:25:49 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -58,52 +58,70 @@
static struct spclient clispc;
static int
-send_syscall_req(struct spclient *spc, int sysnum,
- const void *data, size_t dlen)
+syscall_req(struct spclient *spc, int sysnum,
+ const void *data, size_t dlen, void **resp)
{
struct rsp_hdr rhdr;
+ struct respwait rw;
+ int rv;
rhdr.rsp_len = sizeof(rhdr) + dlen;
- rhdr.rsp_reqno = nextreq++;
- rhdr.rsp_type = RUMPSP_SYSCALL_REQ;
+ rhdr.rsp_class = RUMPSP_REQ;
+ rhdr.rsp_type = RUMPSP_SYSCALL;
rhdr.rsp_sysnum = sysnum;
- dosend(spc, rhdr, sizeof(rhdr));
- dosend(spc, data, dlen);
+ putwait(spc, rw, rhdr);
- return 0;
+ sendlock(spc);
+ rv = dosend(spc, rhdr, sizeof(rhdr));
+ rv = dosend(spc, data, dlen);
+ sendunlock(spc);
+ if (rv)
+ return rv; /* XXX: unputwait */
+
+ rv = waitresp(spc, rw);
+ *resp = rw.rw_data;
+ return rv;
}
static int
send_copyin_resp(struct spclient *spc, uint64_t reqno, void *data, size_t dlen)
{
struct rsp_hdr rhdr;
+ int rv;
rhdr.rsp_len = sizeof(rhdr) + dlen;
rhdr.rsp_reqno = reqno;
- rhdr.rsp_type = RUMPSP_COPYIN_RESP;
+ rhdr.rsp_class = RUMPSP_RESP;
+ rhdr.rsp_type = RUMPSP_COPYIN;
rhdr.rsp_sysnum = 0;
- dosend(spc, rhdr, sizeof(rhdr));
- dosend(spc, data, dlen);
+ sendlock(spc);
+ rv = dosend(spc, rhdr, sizeof(rhdr));
+ rv = dosend(spc, data, dlen);
+ sendunlock(spc);
- return 0;
+ return rv;
}
static int
send_anonmmap_resp(struct spclient *spc, uint64_t reqno, void *addr)
{
struct rsp_hdr rhdr;
+ int rv;
rhdr.rsp_len = sizeof(rhdr) + sizeof(addr);
rhdr.rsp_reqno = reqno;
- rhdr.rsp_type = RUMPSP_ANONMMAP_RESP;
+ rhdr.rsp_class = RUMPSP_RESP;
+ rhdr.rsp_type = RUMPSP_ANONMMAP;
rhdr.rsp_sysnum = 0;
- dosend(spc, rhdr, sizeof(rhdr));
- dosend(spc, addr, sizeof(addr));
+ sendlock(spc);
+ rv = dosend(spc, rhdr, sizeof(rhdr));
+ rv = dosend(spc, addr, sizeof(addr));
+ sendunlock(spc);
- return 0;
+ return rv;
}
int
@@ -111,71 +129,71 @@
register_t *retval)
{
struct rsp_sysresp *resp;
- struct rsp_copydata *copydata;
- struct pollfd pfd;
- size_t maplen;
- void *mapaddr;
- int gotresp;
+ void *rdata;
+ int rv;
- DPRINTF((rump_sp_syscall: executing syscall %d\n, sysnum));
+ DPRINTF((rumpsp syscall_req: syscall %d with %p/%zu\n,
+ sysnum, data, dlen));
- send_syscall_req(clispc, sysnum, data, dlen);
+ rv = syscall_req(clispc, sysnum, data, dlen, rdata);
+ if (rv)
+ return rv;
+
+ resp = rdata;
+ DPRINTF((rumpsp syscall_resp: syscall %d error %d, rv: %d/%d\n,
+ sysnum, rv, resp-rsys_retval[0], resp-rsys_retval[1]));
- DPRINTF((rump_sp_syscall: syscall %d request sent.
- waiting for response\n, sysnum));
+ memcpy(retval, resp-rsys_retval, sizeof(resp-rsys_retval));
+ rv = resp-rsys_error;
+ free(rdata);
- pfd.fd = clispc.spc_fd;
- pfd.events = POLLIN;
-
- gotresp = 0;
- while (!gotresp) {
- while (readframe(clispc) 1)
- poll(pfd, 1, INFTIM);
-
- switch (clispc.spc_hdr.rsp_type) {
- case RUMPSP_COPYIN_REQ:
- /*LINTED*/
- copydata = (struct rsp_copydata *)clispc.spc_buf;
- DPRINTF((rump_sp_syscall: copyin request: %p/%zu\n,
- copydata-rcp_addr, copydata-rcp_len));
- send_copyin_resp(clispc, clispc.spc_hdr.rsp_reqno,
- copydata-rcp_addr, copydata-rcp_len);
- clispc.spc_off = 0;
- break;
- case RUMPSP_COPYOUT_REQ:
- /*LINTED*/
- copydata = (struct rsp_copydata *)clispc.spc_buf;
- DPRINTF((rump_sp_syscall: copyout request: %p/%zu\n,
- copydata-rcp_addr, copydata-rcp_len));
- /*LINTED*/
- memcpy(copydata-rcp_addr, copydata-rcp_data,
- copydata-rcp_len);
- clispc.spc_off = 0;
- break;
- case RUMPSP_ANONMMAP_REQ:
- /*LINTED*/
- maplen = *(size_t
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Fri Nov 19 15:40:56 UTC 2010
Modified Files:
src/lib/librumpuser: sp_common.c
Log Message:
delint
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/librumpuser/sp_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/sp_common.c
diff -u src/lib/librumpuser/sp_common.c:1.4 src/lib/librumpuser/sp_common.c:1.5
--- src/lib/librumpuser/sp_common.c:1.4 Fri Nov 19 15:25:49 2010
+++ src/lib/librumpuser/sp_common.c Fri Nov 19 15:40:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sp_common.c,v 1.4 2010/11/19 15:25:49 pooka Exp $ */
+/* $NetBSD: sp_common.c,v 1.5 2010/11/19 15:40:55 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -469,10 +469,12 @@
return 0;
}
+/*ARGSUSED*/
static int
unix_parse(const char *addr, struct sockaddr **sa, int allow_wildcard)
{
struct sockaddr_un sun;
+ size_t slen;
if (strlen(addr) sizeof(sun.sun_path))
return ENAMETOOLONG;
@@ -484,12 +486,12 @@
memset(sun, 0, sizeof(sun));
sun.sun_family = AF_LOCAL;
strlcpy(sun.sun_path, addr, sizeof(sun.sun_path));
- sun.sun_len = SUN_LEN(sun);
+ sun.sun_len = slen = SUN_LEN(sun);
- *sa = malloc(sun.sun_len);
+ *sa = malloc(slen);
if (*sa == NULL)
return errno;
- memcpy(*sa, sun, sun.sun_len);
+ memcpy(*sa, sun, slen);
return 0;
}
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: tsutsui
Date: Fri Nov 19 15:47:32 UTC 2010
Modified Files:
src/usr.sbin/makefs: cd9660.c
Log Message:
cd9960 - cd9660
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/makefs/cd9660.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/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.27 src/usr.sbin/makefs/cd9660.c:1.28
--- src/usr.sbin/makefs/cd9660.c:1.27 Wed Oct 27 18:51:34 2010
+++ src/usr.sbin/makefs/cd9660.c Fri Nov 19 15:47:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.27 2010/10/27 18:51:34 christos Exp $ */
+/* $NetBSD: cd9660.c,v 1.28 2010/11/19 15:47:32 tsutsui Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: cd9660.c,v 1.27 2010/10/27 18:51:34 christos Exp $);
+__RCSID($NetBSD: cd9660.c,v 1.28 2010/11/19 15:47:32 tsutsui Exp $);
#endif /* !__lint */
#include string.h
@@ -135,7 +135,7 @@
static int cd9660_fill_extended_attribute_record(cd9660node *);
#endif
static void cd9660_sort_nodes(cd9660node *);
-static int cd9960_translate_node_common(cd9660node *);
+static int cd9660_translate_node_common(cd9660node *);
static int cd9660_translate_node(fsnode *, cd9660node *);
static int cd9660_compare_filename(const char *, const char *);
static void cd9660_sorted_child_insert(cd9660node *, cd9660node *);
@@ -815,7 +815,7 @@
#endif
static int
-cd9960_translate_node_common(cd9660node *newnode)
+cd9660_translate_node_common(cd9660node *newnode)
{
time_t tim;
int test;
@@ -852,7 +852,7 @@
}
/*
- * Translate fsnode to cd9960node
+ * Translate fsnode to cd9660node
* Translate filenames and other metadata, including dates, sizes,
* permissions, etc
* @param struct fsnode * The node generated by makefs
@@ -881,7 +881,7 @@
if (!(S_ISDIR(node-type)))
newnode-fileDataLength = node-inode-st.st_size;
- if (cd9960_translate_node_common(newnode) == 0)
+ if (cd9660_translate_node_common(newnode) == 0)
return 0;
/* Finally, overwrite some of the values that are set by default */
@@ -2046,7 +2046,7 @@
return NULL;
*temp-node-inode = *me-node-inode;
- if (cd9960_translate_node_common(temp) == 0)
+ if (cd9660_translate_node_common(temp) == 0)
return NULL;
return temp;
}
@@ -2073,7 +2073,7 @@
return NULL;
*temp-node-inode = *me-node-inode;
- if (cd9960_translate_node_common(temp) == 0)
+ if (cd9660_translate_node_common(temp) == 0)
return NULL;
return temp;
}
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Nov 19 17:06:57 UTC 2010
Modified Files:
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Pass routines necessary for multithreaded operation down to rumpuser_sp.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.200 -r1.201 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/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.50 src/sys/rump/include/rump/rumpuser.h:1.51
--- src/sys/rump/include/rump/rumpuser.h:1.50 Thu Nov 4 20:57:00 2010
+++ src/sys/rump/include/rump/rumpuser.h Fri Nov 19 17:06:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.50 2010/11/04 20:57:00 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.51 2010/11/19 17:06:57 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -36,7 +36,7 @@
#include stdint.h
#endif
-#define RUMPUSER_VERSION 3
+#define RUMPUSER_VERSION 4
int rumpuser_getversion(void);
struct msghdr;
@@ -211,8 +211,10 @@
void (*spop_lwproc_switch)(struct lwp *);
void (*spop_lwproc_release)(void);
int (*spop_lwproc_newproc)(void);
+ int (*spop_lwproc_newlwp)(pid_t);
struct lwp * (*spop_lwproc_curlwp)(void);
int (*spop_syscall)(int, void *, register_t *);
+ pid_t (*spop_getpid)(void);
};
int rumpuser_sp_init(const struct rumpuser_sp_ops *, const char *);
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.200 src/sys/rump/librump/rumpkern/rump.c:1.201
--- src/sys/rump/librump/rumpkern/rump.c:1.200 Wed Nov 17 21:57:33 2010
+++ src/sys/rump/librump/rumpkern/rump.c Fri Nov 19 17:06:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.200 2010/11/17 21:57:33 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.201 2010/11/19 17:06:56 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.200 2010/11/17 21:57:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.201 2010/11/19 17:06:56 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -190,14 +190,24 @@
hostname, MAXHOSTNAMELEN, CTL_KERN, KERN_HOSTNAME, CTL_EOL);
}
+/* there's no convenient kernel entry point for this, so just craft out own */
+static pid_t
+spgetpid(void)
+{
+
+ return curproc-p_pid;
+}
+
static const struct rumpuser_sp_ops spops = {
.spop_schedule = rump_schedule,
.spop_unschedule = rump_unschedule,
.spop_lwproc_switch = rump_lwproc_switch,
.spop_lwproc_release = rump_lwproc_releaselwp,
.spop_lwproc_newproc = rump_lwproc_newproc,
+ .spop_lwproc_newlwp = rump_lwproc_newlwp,
.spop_lwproc_curlwp = rump_lwproc_curlwp,
.spop_syscall = rump_proxy_syscall,
+ .spop_getpid = spgetpid,
};
int
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Fri Nov 19 17:09:45 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser_sp.c sp_common.c
Log Message:
Support multithreaded clients and fix a few bugs.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/sp_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.7 src/lib/librumpuser/rumpuser_sp.c:1.8
--- src/lib/librumpuser/rumpuser_sp.c:1.7 Fri Nov 19 15:25:49 2010
+++ src/lib/librumpuser/rumpuser_sp.c Fri Nov 19 17:09:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.7 2010/11/19 15:25:49 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.8 2010/11/19 17:09:44 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_sp.c,v 1.7 2010/11/19 15:25:49 pooka Exp $);
+__RCSID($NetBSD: rumpuser_sp.c,v 1.8 2010/11/19 17:09:44 pooka Exp $);
#include sys/types.h
#include sys/mman.h
@@ -107,6 +107,18 @@
return rv;
}
+static int
+lwproc_newlwp(pid_t pid)
+{
+ int rv;
+
+ spops.spop_schedule();
+ rv = spops.spop_lwproc_newlwp(pid);
+ spops.spop_unschedule();
+
+ return rv;
+}
+
static struct lwp *
lwproc_curlwp(void)
{
@@ -119,6 +131,18 @@
return l;
}
+static pid_t
+lwproc_getpid(void)
+{
+ pid_t p;
+
+ spops.spop_schedule();
+ p = spops.spop_getpid();
+ spops.spop_unschedule();
+
+ return p;
+}
+
static int
rumpsyscall(int sysnum, void *data, register_t *retval)
{
@@ -271,7 +295,7 @@
DPRINTF((rump_sp: disconnecting [%u]\n, idx));
- lwproc_switch(spc-spc_lwp);
+ lwproc_switch(spc-spc_mainlwp);
lwproc_release();
pthread_mutex_destroy(spc-spc_mtx);
@@ -342,8 +366,9 @@
pfdlist[i].fd = newfd;
spclist[i].spc_fd = newfd;
- spclist[i].spc_lwp = lwproc_curlwp();
+ spclist[i].spc_mainlwp = lwproc_curlwp();
spclist[i].spc_istatus = SPCSTATUS_BUSY; /* dedicated receiver */
+ spclist[i].spc_pid = lwproc_getpid();
TAILQ_INIT(spclist[i].spc_respwait);
pthread_mutex_init(spclist[i].spc_mtx, NULL);
@@ -353,7 +378,7 @@
maxidx = i;
DPRINTF((rump_sp: added new connection at idx %u, pid %d\n,
- i, 9)); /* XXX: getpid not spop */
+ i, lwproc_getpid()));
lwproc_switch(NULL);
@@ -371,7 +396,7 @@
sysnum, 0));
pthread_setspecific(spclient_tls, spc);
- lwproc_switch(spc-spc_lwp);
+ lwproc_newlwp(spc-spc_pid);
rv = rumpsyscall(sysnum, data, retval);
lwproc_switch(NULL);
pthread_setspecific(spclient_tls, NULL);
Index: src/lib/librumpuser/sp_common.c
diff -u src/lib/librumpuser/sp_common.c:1.5 src/lib/librumpuser/sp_common.c:1.6
--- src/lib/librumpuser/sp_common.c:1.5 Fri Nov 19 15:40:55 2010
+++ src/lib/librumpuser/sp_common.c Fri Nov 19 17:09:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sp_common.c,v 1.5 2010/11/19 15:40:55 pooka Exp $ */
+/* $NetBSD: sp_common.c,v 1.6 2010/11/19 17:09:44 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -117,7 +117,9 @@
struct spclient {
int spc_fd;
- struct lwp *spc_lwp;
+
+ struct lwp *spc_mainlwp;
+ pid_t spc_pid;
/* incoming */
struct rsp_hdr spc_hdr;
@@ -226,11 +228,10 @@
}
if (rw == NULL) {
printf(PANIC: no waiter\n);
- pthread_mutex_unlock(spc-spc_mtx);
+ abort();
return;
}
rw-rw_data = spc-spc_buf;
- TAILQ_REMOVE(spc-spc_respwait, rw, rw_entries);
pthread_cond_signal(rw-rw_cv);
pthread_mutex_unlock(spc-spc_mtx);
@@ -288,7 +289,6 @@
if (spc-spc_istatus == SPCSTATUS_WANTED)
kickall(spc);
spc-spc_istatus = SPCSTATUS_FREE;
- pthread_mutex_unlock(spc-spc_mtx);
} else {
spc-spc_istatus = SPCSTATUS_WANTED;
pthread_cond_wait(rw-rw_cv, spc-spc_mtx);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri Nov 19 17:11:20 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
remove no longer necessary code
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 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.201 src/sys/rump/librump/rumpkern/rump.c:1.202
--- src/sys/rump/librump/rumpkern/rump.c:1.201 Fri Nov 19 17:06:56 2010
+++ src/sys/rump/librump/rumpkern/rump.c Fri Nov 19 17:11:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.201 2010/11/19 17:06:56 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.202 2010/11/19 17:11:20 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.201 2010/11/19 17:06:56 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.202 2010/11/19 17:11:20 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -105,7 +105,6 @@
* but good enough for now.
*/
static struct vmspace sp_vmspace;
-static bool iamtheserver = false;
static int rump_proxy_syscall(int, void *, register_t *);
@@ -233,7 +232,6 @@
error = rumpuser_sp_init(spops, buf);
if (error)
return error;
- iamtheserver = true;
}
if (rumpuser_getversion() != RUMPUSER_VERSION) {
CVS commit: src/lib/librump
Module Name:src Committed By: pooka Date: Fri Nov 19 17:35:04 UTC 2010 Modified Files: src/lib/librump: rump.3 Log Message: document RUMP_NVNODES To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/librump/rump.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/librump/rump.3 diff -u src/lib/librump/rump.3:1.4 src/lib/librump/rump.3:1.5 --- src/lib/librump/rump.3:1.4 Thu Sep 2 15:24:34 2010 +++ src/lib/librump/rump.3 Fri Nov 19 17:35:04 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump.3,v 1.4 2010/09/02 15:24:34 pooka Exp $ +.\ $NetBSD: rump.3,v 1.5 2010/11/19 17:35:04 pooka Exp $ .\ .\ Copyright (c) 2008-2010 Antti Kantee. All rights reserved. .\ @@ -23,7 +23,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd August 26, 2010 +.Dd November 19, 2010 .Dt RUMP 3 .Os .Sh NAME @@ -87,6 +87,14 @@ If set, indicates how many bytes of memory a rump kernel will allocate before attempting to purge caches. The default is as much as the host allows. +.It Dv RUMP_NVNODES +Sets the value of the kern.maxvnodes sysctl node to the indicated amount. +Adjusting this may be useful for example when testing vnode reclaim +code paths. +While the same value can be set by means of sysctl, the env variable +is often more convenient for quick testing. +As expected, this option has effect only in rump kernels which support VFS. +The current default is 1024 vnodes. .El .Pp A number of interfaces are available for requesting services from
CVS commit: src/tests/fs/vfs
Module Name:src Committed By: pooka Date: Fri Nov 19 17:46:02 UTC 2010 Modified Files: src/tests/fs/vfs: t_vfsops.c Log Message: Convert skipped tests into proper xfails (a lazy bum is me). prompted by pgoyette To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/fs/vfs/t_vfsops.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/fs/vfs/t_vfsops.c diff -u src/tests/fs/vfs/t_vfsops.c:1.7 src/tests/fs/vfs/t_vfsops.c:1.8 --- src/tests/fs/vfs/t_vfsops.c:1.7 Mon Aug 16 10:47:16 2010 +++ src/tests/fs/vfs/t_vfsops.c Fri Nov 19 17:46:02 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: t_vfsops.c,v 1.7 2010/08/16 10:47:16 pooka Exp $ */ +/* $NetBSD: t_vfsops.c,v 1.8 2010/11/19 17:46:02 pooka Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -134,10 +134,6 @@ void *fhp; int fd; - /* should repeat above, but ... */ - if (FSTYPE_TMPFS(tc)) - atf_tc_skip(file handles broken (PR kern/43605)); - RL(rump_sys_chdir(path)); RL(fd = rump_sys_open(FNAME, O_RDWR | O_CREAT, 0777)); RL(rump_sys_close(fd)); @@ -158,6 +154,8 @@ if (FSTYPE_MSDOS(tc) || FSTYPE_LFS(tc)) atf_tc_expect_fail(fhopen() for removed file succeeds (PR kern/43745)); + if (FSTYPE_TMPFS(tc)) + atf_tc_expect_fail(PR kern/43605); ATF_REQUIRE_ERRNO(ESTALE, rump_sys_fhopen(fhp, fhsize, O_RDONLY) == -1); atf_tc_expect_pass(); @@ -177,8 +175,7 @@ unsigned long seed; int fd; - if (FSTYPE_TMPFS(tc)) - atf_tc_skip(file handles broken (PR kern/43605)); + /* XXX: this test succeeds accidentally on tmpfs, PR kern/43605 */ srandom(seed = time(NULL)); printf(RNG seed %lu\n, seed);
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Fri Nov 19 17:47:44 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser_sp.c
Log Message:
squelch the compiler whine
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/librumpuser/rumpuser_sp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.8 src/lib/librumpuser/rumpuser_sp.c:1.9
--- src/lib/librumpuser/rumpuser_sp.c:1.8 Fri Nov 19 17:09:44 2010
+++ src/lib/librumpuser/rumpuser_sp.c Fri Nov 19 17:47:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.8 2010/11/19 17:09:44 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.9 2010/11/19 17:47:44 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_sp.c,v 1.8 2010/11/19 17:09:44 pooka Exp $);
+__RCSID($NetBSD: rumpuser_sp.c,v 1.9 2010/11/19 17:47:44 pooka Exp $);
#include sys/types.h
#include sys/mman.h
@@ -427,7 +427,7 @@
rumpuser_sp_copyin(const void *uaddr, void *kaddr, size_t len)
{
struct spclient *spc;
- void *rdata;
+ void *rdata = NULL; /* XXXuninit */
spc = pthread_getspecific(spclient_tls);
if (!spc)
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: tron Date: Tue Nov 16 14:04:12 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add new t_environment_pth test to the set lists. To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/tests/mi 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.155 src/distrib/sets/lists/tests/mi:1.156 --- src/distrib/sets/lists/tests/mi:1.155 Fri Nov 12 17:50:12 2010 +++ src/distrib/sets/lists/tests/mi Tue Nov 16 14:04:11 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.155 2010/11/12 17:50:12 pooka Exp $ +# $NetBSD: mi,v 1.156 2010/11/16 14:04:11 tron Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -322,6 +322,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlibtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment_pth.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_mi_vector_hash.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stringtests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/string/t_popcount.debug tests-obsolete obsolete @@ -1507,6 +1508,7 @@ ./usr/tests/lib/libc/stdlib tests-lib-tests ./usr/tests/lib/libc/stdlib/Atffile tests-lib-tests atf ./usr/tests/lib/libc/stdlib/t_environment tests-lib-tests atf +./usr/tests/lib/libc/stdlib/t_environment_pth tests-lib-tests atf ./usr/tests/lib/libc/stdlib/t_mi_vector_hash tests-lib-tests atf ./usr/tests/lib/libc/stdio tests-lib-tests ./usr/tests/lib/libc/stdio/Atffile tests-lib-tests atf
CVS commit: src
Module Name:src
Committed By: njoly
Date: Fri Nov 19 18:18:54 UTC 2010
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/libc/stdio: Makefile
Added Files:
src/tests/lib/libc/stdio: t_format.c
Log Message:
Add testcase for PR/44113: printf(3) should ignore zero padding for
nan/inf.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/stdio/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdio/t_format.c
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.157 src/distrib/sets/lists/tests/mi:1.158
--- src/distrib/sets/lists/tests/mi:1.157 Fri Nov 19 12:37:48 2010
+++ src/distrib/sets/lists/tests/mi Fri Nov 19 18:18:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.157 2010/11/19 12:37:48 pooka Exp $
+# $NetBSD: mi,v 1.158 2010/11/19 18:18:54 njoly Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -321,6 +321,7 @@
./usr/libdata/debug/usr/tests/lib/libc/hash/t_sha2.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdiotests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlibtests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment_pth.debug tests-lib-debug debug,atf
@@ -1515,6 +1516,7 @@
./usr/tests/lib/libc/stdio tests-lib-tests
./usr/tests/lib/libc/stdio/Atffile tests-lib-tests atf
./usr/tests/lib/libc/stdio/t_fmemopen tests-lib-tests atf
+./usr/tests/lib/libc/stdio/t_format tests-lib-tests atf
./usr/tests/lib/libc/string tests-obsolete obsolete
./usr/tests/lib/libc/string/Atffile tests-obsolete obsolete
./usr/tests/lib/libc/string/t_popcount tests-obsolete obsolete
Index: src/tests/lib/libc/stdio/Makefile
diff -u src/tests/lib/libc/stdio/Makefile:1.1 src/tests/lib/libc/stdio/Makefile:1.2
--- src/tests/lib/libc/stdio/Makefile:1.1 Fri Sep 24 09:21:53 2010
+++ src/tests/lib/libc/stdio/Makefile Fri Nov 19 18:18:53 2010
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/09/24 09:21:53 tnozaki Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/19 18:18:53 njoly Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/lib/libc/stdio
TESTS_C+= t_fmemopen
+TESTS_C+= t_format
.include bsd.test.mk
Added files:
Index: src/tests/lib/libc/stdio/t_format.c
diff -u /dev/null src/tests/lib/libc/stdio/t_format.c:1.1
--- /dev/null Fri Nov 19 18:18:54 2010
+++ src/tests/lib/libc/stdio/t_format.c Fri Nov 19 18:18:53 2010
@@ -0,0 +1,62 @@
+/* $NetBSD */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include atf-c.h
+#include math.h
+#include stdio.h
+#include string.h
+
+ATF_TC(zero_padding);
+
+ATF_TC_HEAD(zero_padding, tc)
+{
+
+ atf_tc_set_md_var(tc, descr, output format zero padding);
+}
+
+ATF_TC_BODY(zero_padding, tc)
+{
+ char str[1024];
+
+ ATF_CHECK(sprintf(str, %010f, 0.0) == 10);
+ ATF_REQUIRE_STREQ(str, 000.00);
+
+ /* PR/44113: printf(3) should ignore zero padding for nan/inf */
+ ATF_CHECK(sprintf(str, %010f, NAN) == 10);
+ ATF_REQUIRE_STREQ(str,nan);
+ ATF_CHECK(sprintf(str, %010f, INFINITY) == 10);
+ ATF_REQUIRE_STREQ(str,inf);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+
CVS commit: src/sys/dev/usb
Module Name:src Committed By: phx Date: Fri Nov 19 18:21:49 UTC 2010 Modified Files: src/sys/dev/usb: usb.h Log Message: Added UIPROTO_MOUSE for HID-class. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/dev/usb/usb.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/usb/usb.h diff -u src/sys/dev/usb/usb.h:1.87 src/sys/dev/usb/usb.h:1.88 --- src/sys/dev/usb/usb.h:1.87 Wed Nov 3 22:34:24 2010 +++ src/sys/dev/usb/usb.h Fri Nov 19 18:21:48 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.h,v 1.87 2010/11/03 22:34:24 dyoung Exp $ */ +/* $NetBSD: usb.h,v 1.88 2010/11/19 18:21:48 phx Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ /* @@ -475,6 +475,7 @@ #define UICLASS_HID 0x03 #define UISUBCLASS_BOOT 1 #define UIPROTO_BOOT_KEYBOARD 1 +#define UIPROTO_MOUSE 2 #define UICLASS_PHYSICAL 0x05
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: phx
Date: Fri Nov 19 18:27:13 UTC 2010
Modified Files:
src/sys/arch/macppc/dev: pbms.c
Log Message:
Make sure the interface protocol is UIPROTO_MOUSE, before we attach.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/pbms.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/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.10 src/sys/arch/macppc/dev/pbms.c:1.11
--- src/sys/arch/macppc/dev/pbms.c:1.10 Mon Nov 8 12:06:47 2010
+++ src/sys/arch/macppc/dev/pbms.c Fri Nov 19 18:27:12 2010
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.10 2010/11/08 12:06:47 pooka Exp $ */
+/* $Id: pbms.c,v 1.11 2010/11/19 18:27:12 phx Exp $ */
/*
* Copyright (c) 2005, Johan Wall�n
@@ -301,7 +301,8 @@
* We just check if the vendor and product IDs have the magic numbers
* we expect.
*/
- if ((udd = usbd_get_device_descriptor(uha-parent-sc_udev)) != NULL) {
+ if (uha-uaa-proto == UIPROTO_MOUSE
+ (udd = usbd_get_device_descriptor(uha-parent-sc_udev)) != NULL) {
vendor = UGETW(udd-idVendor);
product = UGETW(udd-idProduct);
for (i = 0; i PBMS_NUM_DEVICES; i++) {
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Fri Nov 19 20:45:37 UTC 2010 Modified Files: src/gnu/usr.bin/groff/tmac [netbsd-5]: mdoc.local src/sys/sys [netbsd-5]: param.h Added Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Welcome to 5.1_STABLE. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.2 cvs rdiff -u -r1.43.4.15 -r1.43.4.16 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.15 -r1.330.4.16 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.16 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15 Sat Nov 6 18:10:17 2010 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Fri Nov 19 20:45:37 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.15 2010/11/06 18:10:17 snj Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.16 2010/11/19 20:45:37 riz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~5.1 +.ds doc-operating-system NetBSD\~5.1_STABLE .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.1 +.ds doc-default-operating-system NetBSD\~5.1_STABLE .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.15 src/sys/sys/param.h:1.330.4.16 --- src/sys/sys/param.h:1.330.4.15 Sat Nov 6 18:10:17 2010 +++ src/sys/sys/param.h Fri Nov 19 20:45:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.15 2010/11/06 18:10:17 snj Exp $ */ +/* $NetBSD: param.h,v 1.330.4.16 2010/11/19 20:45:37 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50100 /* NetBSD 5.1 */ +#define __NetBSD_Version__ 50100 /* NetBSD 5.1_STABLE */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.2 diff -u /dev/null src/doc/CHANGES-5.2:1.1.2.1 --- /dev/null Fri Nov 19 20:45:37 2010 +++ src/doc/CHANGES-5.2 Fri Nov 19 20:45:36 2010 @@ -0,0 +1,11 @@ +# $NetBSD: CHANGES-5.2,v 1.1.2.1 2010/11/19 20:45:36 riz Exp $ + +A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 +release: + +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.1_STABLE. + [riz] +
CVS commit: [netbsd-5] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: riz
Date: Fri Nov 19 21:11:25 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5]: t1_lib.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1479):
crypto/dist/openssl/ssl/t1_lib.c: patch
apply patch from a rel=nofollow
href=http://www.openssl.org/news/secadv_20101116.txt;http://www.openssl.org/news/secadv_20101116.txt/a
to fix a race condition which can be exploited in a buffer
overrun attack (CVE-2010-3864)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/crypto/dist/openssl/ssl/t1_lib.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/dist/openssl/ssl/t1_lib.c
diff -u src/crypto/dist/openssl/ssl/t1_lib.c:1.2 src/crypto/dist/openssl/ssl/t1_lib.c:1.2.4.1
--- src/crypto/dist/openssl/ssl/t1_lib.c:1.2 Thu Jun 5 15:30:10 2008
+++ src/crypto/dist/openssl/ssl/t1_lib.c Fri Nov 19 21:11:24 2010
@@ -625,14 +625,23 @@
switch (servname_type)
{
case TLSEXT_NAMETYPE_host_name:
- if (s-session-tlsext_hostname == NULL)
+ if (!s-hit)
{
- if (len TLSEXT_MAXLEN_host_name ||
- ((s-session-tlsext_hostname = OPENSSL_malloc(len+1)) == NULL))
+ if(s-session-tlsext_hostname)
+ {
+ *al = SSL_AD_DECODE_ERROR;
+ return 0;
+ }
+ if (len TLSEXT_MAXLEN_host_name)
{
*al = TLS1_AD_UNRECOGNIZED_NAME;
return 0;
}
+ if ((s-session-tlsext_hostname = OPENSSL_malloc(len+1)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
memcpy(s-session-tlsext_hostname, sdata, len);
s-session-tlsext_hostname[len]='\0';
if (strlen(s-session-tlsext_hostname) != len) {
@@ -645,7 +654,8 @@
}
else
- s-servername_done = strlen(s-session-tlsext_hostname) == len
+ s-servername_done = s-session-tlsext_hostname
+ strlen(s-session-tlsext_hostname) == len
strncmp(s-session-tlsext_hostname, (char *)sdata, len) == 0;
break;
@@ -675,15 +685,22 @@
*al = TLS1_AD_DECODE_ERROR;
return 0;
}
- s-session-tlsext_ecpointformatlist_length = 0;
- if (s-session-tlsext_ecpointformatlist != NULL) OPENSSL_free(s-session-tlsext_ecpointformatlist);
- if ((s-session-tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+ if (!s-hit)
{
-*al = TLS1_AD_INTERNAL_ERROR;
-return 0;
+if(s-session-tlsext_ecpointformatlist)
+ {
+ *al = TLS1_AD_DECODE_ERROR;
+ return 0;
+ }
+s-session-tlsext_ecpointformatlist_length = 0;
+if ((s-session-tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
+s-session-tlsext_ecpointformatlist_length = ecpointformatlist_length;
+memcpy(s-session-tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
}
- s-session-tlsext_ecpointformatlist_length = ecpointformatlist_length;
- memcpy(s-session-tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
#if 0
fprintf(stderr,ssl_parse_clienthello_tlsext s-session-tlsext_ecpointformatlist (length=%i) , s-session-tlsext_ecpointformatlist_length);
sdata = s-session-tlsext_ecpointformatlist;
@@ -703,15 +720,22 @@
*al = TLS1_AD_DECODE_ERROR;
return 0;
}
- s-session-tlsext_ellipticcurvelist_length = 0;
- if (s-session-tlsext_ellipticcurvelist != NULL) OPENSSL_free(s-session-tlsext_ellipticcurvelist);
- if ((s-session-tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+ if (!s-hit)
{
-*al = TLS1_AD_INTERNAL_ERROR;
-return 0;
+if(s-session-tlsext_ellipticcurvelist)
+ {
+ *al = TLS1_AD_DECODE_ERROR;
+ return 0;
+ }
+s-session-tlsext_ellipticcurvelist_length = 0;
+if ((s-session-tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
+s-session-tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
+memcpy(s-session-tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
}
- s-session-tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
- memcpy(s-session-tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
#if 0
fprintf(stderr,ssl_parse_clienthello_tlsext s-session-tlsext_ellipticcurvelist (length=%i) , s-session-tlsext_ellipticcurvelist_length);
sdata = s-session-tlsext_ellipticcurvelist;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Fri Nov 19 21:11:42 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1479. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-5.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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.1 src/doc/CHANGES-5.2:1.1.2.2 --- src/doc/CHANGES-5.2:1.1.2.1 Fri Nov 19 20:45:36 2010 +++ src/doc/CHANGES-5.2 Fri Nov 19 21:11:42 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.1 2010/11/19 20:45:36 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.2 2010/11/19 21:11:42 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -9,3 +9,8 @@ Welcome to 5.1_STABLE. [riz] +crypto/dist/openssl/ssl/t1_lib.c patch + + Fix a race condition. (CVE-2010-3864) + [christos, ticket #1479] +
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: riz
Date: Fri Nov 19 21:12:02 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-0]: t1_lib.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1479):
crypto/dist/openssl/ssl/t1_lib.c: patch
apply patch from a rel=nofollow
href=http://www.openssl.org/news/secadv_20101116.txt;http://www.openssl.org/news/secadv_20101116.txt/a
to fix a race condition which can be exploited in a buffer
overrun attack (CVE-2010-3864)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/crypto/dist/openssl/ssl/t1_lib.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/dist/openssl/ssl/t1_lib.c
diff -u src/crypto/dist/openssl/ssl/t1_lib.c:1.2 src/crypto/dist/openssl/ssl/t1_lib.c:1.2.8.1
--- src/crypto/dist/openssl/ssl/t1_lib.c:1.2 Thu Jun 5 15:30:10 2008
+++ src/crypto/dist/openssl/ssl/t1_lib.c Fri Nov 19 21:12:02 2010
@@ -625,14 +625,23 @@
switch (servname_type)
{
case TLSEXT_NAMETYPE_host_name:
- if (s-session-tlsext_hostname == NULL)
+ if (!s-hit)
{
- if (len TLSEXT_MAXLEN_host_name ||
- ((s-session-tlsext_hostname = OPENSSL_malloc(len+1)) == NULL))
+ if(s-session-tlsext_hostname)
+ {
+ *al = SSL_AD_DECODE_ERROR;
+ return 0;
+ }
+ if (len TLSEXT_MAXLEN_host_name)
{
*al = TLS1_AD_UNRECOGNIZED_NAME;
return 0;
}
+ if ((s-session-tlsext_hostname = OPENSSL_malloc(len+1)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
memcpy(s-session-tlsext_hostname, sdata, len);
s-session-tlsext_hostname[len]='\0';
if (strlen(s-session-tlsext_hostname) != len) {
@@ -645,7 +654,8 @@
}
else
- s-servername_done = strlen(s-session-tlsext_hostname) == len
+ s-servername_done = s-session-tlsext_hostname
+ strlen(s-session-tlsext_hostname) == len
strncmp(s-session-tlsext_hostname, (char *)sdata, len) == 0;
break;
@@ -675,15 +685,22 @@
*al = TLS1_AD_DECODE_ERROR;
return 0;
}
- s-session-tlsext_ecpointformatlist_length = 0;
- if (s-session-tlsext_ecpointformatlist != NULL) OPENSSL_free(s-session-tlsext_ecpointformatlist);
- if ((s-session-tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+ if (!s-hit)
{
-*al = TLS1_AD_INTERNAL_ERROR;
-return 0;
+if(s-session-tlsext_ecpointformatlist)
+ {
+ *al = TLS1_AD_DECODE_ERROR;
+ return 0;
+ }
+s-session-tlsext_ecpointformatlist_length = 0;
+if ((s-session-tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
+s-session-tlsext_ecpointformatlist_length = ecpointformatlist_length;
+memcpy(s-session-tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
}
- s-session-tlsext_ecpointformatlist_length = ecpointformatlist_length;
- memcpy(s-session-tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
#if 0
fprintf(stderr,ssl_parse_clienthello_tlsext s-session-tlsext_ecpointformatlist (length=%i) , s-session-tlsext_ecpointformatlist_length);
sdata = s-session-tlsext_ecpointformatlist;
@@ -703,15 +720,22 @@
*al = TLS1_AD_DECODE_ERROR;
return 0;
}
- s-session-tlsext_ellipticcurvelist_length = 0;
- if (s-session-tlsext_ellipticcurvelist != NULL) OPENSSL_free(s-session-tlsext_ellipticcurvelist);
- if ((s-session-tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+ if (!s-hit)
{
-*al = TLS1_AD_INTERNAL_ERROR;
-return 0;
+if(s-session-tlsext_ellipticcurvelist)
+ {
+ *al = TLS1_AD_DECODE_ERROR;
+ return 0;
+ }
+s-session-tlsext_ellipticcurvelist_length = 0;
+if ((s-session-tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
+s-session-tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
+memcpy(s-session-tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
}
- s-session-tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
- memcpy(s-session-tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
#if 0
fprintf(stderr,ssl_parse_clienthello_tlsext s-session-tlsext_ellipticcurvelist (length=%i) , s-session-tlsext_ellipticcurvelist_length);
sdata = s-session-tlsext_ellipticcurvelist;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Fri Nov 19 21:12:30 UTC 2010 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1479. To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-5.0.3 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-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.20 src/doc/CHANGES-5.0.3:1.1.2.21 --- src/doc/CHANGES-5.0.3:1.1.2.20 Fri Oct 15 23:21:43 2010 +++ src/doc/CHANGES-5.0.3 Fri Nov 19 21:12:29 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.20 2010/10/15 23:21:43 snj Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.21 2010/11/19 21:12:29 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -345,3 +345,8 @@ access to the next level directory from the virtual root directory. [mrg, ticket #1456] +crypto/dist/openssl/ssl/t1_lib.c patch + + Fix a race condition. (CVE-2010-3864) + [christos, ticket #1479] +
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: riz Date: Fri Nov 19 21:16:38 UTC 2010 Modified Files: src/gnu/usr.bin/groff/tmac [netbsd-5-1]: mdoc.local src/sys/sys [netbsd-5-1]: param.h Added Files: src/doc [netbsd-5-1]: CHANGES-5.1.1 Log Message: Welcome to 5.1.0_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.1.1 cvs rdiff -u -r1.43.4.15 -r1.43.4.15.2.1 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.15 -r1.330.4.15.2.1 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.1 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15 Sat Nov 6 18:10:17 2010 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Fri Nov 19 21:16:37 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.15 2010/11/06 18:10:17 snj Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.15.2.1 2010/11/19 21:16:37 riz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~5.1 +.ds doc-operating-system NetBSD\~5.1.0_PATCH .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.1 +.ds doc-default-operating-system NetBSD\~5.1_PATCH .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.15 src/sys/sys/param.h:1.330.4.15.2.1 --- src/sys/sys/param.h:1.330.4.15 Sat Nov 6 18:10:17 2010 +++ src/sys/sys/param.h Fri Nov 19 21:16:35 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.15 2010/11/06 18:10:17 snj Exp $ */ +/* $NetBSD: param.h,v 1.330.4.15.2.1 2010/11/19 21:16:35 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50100 /* NetBSD 5.1 */ +#define __NetBSD_Version__ 50100 /* NetBSD 5.1.0_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.1.1 diff -u /dev/null src/doc/CHANGES-5.1.1:1.1.2.1 --- /dev/null Fri Nov 19 21:16:38 2010 +++ src/doc/CHANGES-5.1.1 Fri Nov 19 21:16:35 2010 @@ -0,0 +1,11 @@ +# $NetBSD: CHANGES-5.1.1,v 1.1.2.1 2010/11/19 21:16:35 riz Exp $ + +A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 +release: + +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.1.0_PATCH. + [riz] +
CVS commit: [netbsd-5-1] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: riz
Date: Fri Nov 19 21:29:27 UTC 2010
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-1]: t1_lib.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1479):
crypto/dist/openssl/ssl/t1_lib.c: patch
apply patch from http://www.openssl.org/news/secadv_20101116.txt
to fix a race condition which can be exploited in a buffer
overrun attack (CVE-2010-3864)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.12.1 src/crypto/dist/openssl/ssl/t1_lib.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/dist/openssl/ssl/t1_lib.c
diff -u src/crypto/dist/openssl/ssl/t1_lib.c:1.2 src/crypto/dist/openssl/ssl/t1_lib.c:1.2.12.1
--- src/crypto/dist/openssl/ssl/t1_lib.c:1.2 Thu Jun 5 15:30:10 2008
+++ src/crypto/dist/openssl/ssl/t1_lib.c Fri Nov 19 21:29:26 2010
@@ -625,14 +625,23 @@
switch (servname_type)
{
case TLSEXT_NAMETYPE_host_name:
- if (s-session-tlsext_hostname == NULL)
+ if (!s-hit)
{
- if (len TLSEXT_MAXLEN_host_name ||
- ((s-session-tlsext_hostname = OPENSSL_malloc(len+1)) == NULL))
+ if(s-session-tlsext_hostname)
+ {
+ *al = SSL_AD_DECODE_ERROR;
+ return 0;
+ }
+ if (len TLSEXT_MAXLEN_host_name)
{
*al = TLS1_AD_UNRECOGNIZED_NAME;
return 0;
}
+ if ((s-session-tlsext_hostname = OPENSSL_malloc(len+1)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
memcpy(s-session-tlsext_hostname, sdata, len);
s-session-tlsext_hostname[len]='\0';
if (strlen(s-session-tlsext_hostname) != len) {
@@ -645,7 +654,8 @@
}
else
- s-servername_done = strlen(s-session-tlsext_hostname) == len
+ s-servername_done = s-session-tlsext_hostname
+ strlen(s-session-tlsext_hostname) == len
strncmp(s-session-tlsext_hostname, (char *)sdata, len) == 0;
break;
@@ -675,15 +685,22 @@
*al = TLS1_AD_DECODE_ERROR;
return 0;
}
- s-session-tlsext_ecpointformatlist_length = 0;
- if (s-session-tlsext_ecpointformatlist != NULL) OPENSSL_free(s-session-tlsext_ecpointformatlist);
- if ((s-session-tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+ if (!s-hit)
{
-*al = TLS1_AD_INTERNAL_ERROR;
-return 0;
+if(s-session-tlsext_ecpointformatlist)
+ {
+ *al = TLS1_AD_DECODE_ERROR;
+ return 0;
+ }
+s-session-tlsext_ecpointformatlist_length = 0;
+if ((s-session-tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
+s-session-tlsext_ecpointformatlist_length = ecpointformatlist_length;
+memcpy(s-session-tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
}
- s-session-tlsext_ecpointformatlist_length = ecpointformatlist_length;
- memcpy(s-session-tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
#if 0
fprintf(stderr,ssl_parse_clienthello_tlsext s-session-tlsext_ecpointformatlist (length=%i) , s-session-tlsext_ecpointformatlist_length);
sdata = s-session-tlsext_ecpointformatlist;
@@ -703,15 +720,22 @@
*al = TLS1_AD_DECODE_ERROR;
return 0;
}
- s-session-tlsext_ellipticcurvelist_length = 0;
- if (s-session-tlsext_ellipticcurvelist != NULL) OPENSSL_free(s-session-tlsext_ellipticcurvelist);
- if ((s-session-tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+ if (!s-hit)
{
-*al = TLS1_AD_INTERNAL_ERROR;
-return 0;
+if(s-session-tlsext_ellipticcurvelist)
+ {
+ *al = TLS1_AD_DECODE_ERROR;
+ return 0;
+ }
+s-session-tlsext_ellipticcurvelist_length = 0;
+if ((s-session-tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+ {
+ *al = TLS1_AD_INTERNAL_ERROR;
+ return 0;
+ }
+s-session-tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
+memcpy(s-session-tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
}
- s-session-tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
- memcpy(s-session-tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
#if 0
fprintf(stderr,ssl_parse_clienthello_tlsext s-session-tlsext_ellipticcurvelist (length=%i) , s-session-tlsext_ellipticcurvelist_length);
sdata = s-session-tlsext_ellipticcurvelist;
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Fri Nov 19 21:30:03 UTC 2010 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.1 Log Message: Ticket 1479. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-5.1.1 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-5.1.1 diff -u src/doc/CHANGES-5.1.1:1.1.2.1 src/doc/CHANGES-5.1.1:1.1.2.2 --- src/doc/CHANGES-5.1.1:1.1.2.1 Fri Nov 19 21:16:35 2010 +++ src/doc/CHANGES-5.1.1 Fri Nov 19 21:30:02 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.1,v 1.1.2.1 2010/11/19 21:16:35 riz Exp $ +# $NetBSD: CHANGES-5.1.1,v 1.1.2.2 2010/11/19 21:30:02 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -9,3 +9,8 @@ Welcome to 5.1.0_PATCH. [riz] +crypto/dist/openssl/ssl/t1_lib.c patch + + Fix a race condition. (CVE-2010-3864) + [christos, ticket #1479] +
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: njoly Date: Tue Nov 16 14:25:54 UTC 2010 Modified Files: src/distrib/sets/lists/comp: md.sparc Log Message: +libsparc_v8.so.0.0.debug To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/comp/md.sparc 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/md.sparc diff -u src/distrib/sets/lists/comp/md.sparc:1.69 src/distrib/sets/lists/comp/md.sparc:1.70 --- src/distrib/sets/lists/comp/md.sparc:1.69 Wed Mar 10 23:13:09 2010 +++ src/distrib/sets/lists/comp/md.sparc Tue Nov 16 14:25:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc,v 1.69 2010/03/10 23:13:09 abs Exp $ +# $NetBSD: md.sparc,v 1.70 2010/11/16 14:25:54 njoly Exp $ ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete @@ -134,7 +134,8 @@ ./usr/include/sparc64/z8530var.h comp-c-include ./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete ./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic -./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug +./usr/libdata/debug/usr/lib/libsparc_v8.so.0.0.debug comp-sys-debug debug,pic ./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/eeprom.debug comp-sysutil-debug debug
CVS commit: [netbsd-5] src/sys/arch
Module Name:src
Committed By: riz
Date: Fri Nov 19 23:19:13 UTC 2010
Modified Files:
src/sys/arch/x86/x86 [netbsd-5]: bus_dma.c
src/sys/arch/xen/x86 [netbsd-5]: xen_bus_dma.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1348):
sys/arch/x86/x86/bus_dma.c: revision 1.54
sys/arch/xen/x86/xen_bus_dma.c: revision 1.21
bus_dmamem_alloc() may not get a boundary smaller than size, but
it's perfectly valid for bus_dmamap_create() to do so (a contigous
transfers will then split in multiple segment).
Fix _xen_bus_dmamem_alloc_range() and _bus_dmamem_alloc_range() to
allow a boundary limit smaller than size:
- compute appropriate boundary for uvm_pglistalloc(), wich doesn't
accept boundary size
- also take care of boundary when deciding to start a new segment.
While there, remove useless boundary argument to _xen_alloc_contig().
Fix the boundary-related issue of PR port-amd64/42980
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.11.8.2 -r1.11.8.3 src/sys/arch/xen/x86/xen_bus_dma.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/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.45 src/sys/arch/x86/x86/bus_dma.c:1.45.6.1
--- src/sys/arch/x86/x86/bus_dma.c:1.45 Sat Jun 28 17:23:01 2008
+++ src/sys/arch/x86/x86/bus_dma.c Fri Nov 19 23:19:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.45 2008/06/28 17:23:01 bouyer Exp $ */
+/* $NetBSD: bus_dma.c,v 1.45.6.1 2010/11/19 23:19:12 riz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.45 2008/06/28 17:23:01 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.45.6.1 2010/11/19 23:19:12 riz Exp $);
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -155,14 +155,28 @@
struct vm_page *m;
struct pglist mlist;
int curseg, error;
+ bus_size_t uboundary;
/* Always round the size. */
size = round_page(size);
+ KASSERT(boundary = PAGE_SIZE || boundary == 0);
+
/*
* Allocate pages from the VM system.
- */
- error = uvm_pglistalloc(size, low, high, alignment, boundary,
+ * We accept boundaries size, splitting in multiple segments
+ * if needed. uvm_pglistalloc does not, so compute an appropriate
+ * boundary: next power of 2 = size
+ */
+
+ if (boundary == 0)
+ uboundary = 0;
+ else {
+ uboundary = boundary;
+ while (uboundary size)
+ uboundary = uboundary 1;
+ }
+ error = uvm_pglistalloc(size, low, high, alignment, uboundary,
mlist, nsegs, (flags BUS_DMA_NOWAIT) == 0);
if (error)
return (error);
@@ -186,10 +200,13 @@
panic(_bus_dmamem_alloc_range);
}
#endif
- if (curaddr == (lastaddr + PAGE_SIZE))
+ if (curaddr == (lastaddr + PAGE_SIZE)
+ (lastaddr boundary) == (curaddr boundary)) {
segs[curseg].ds_len += PAGE_SIZE;
- else {
+ } else {
curseg++;
+ if (curseg = nsegs)
+return EFBIG;
segs[curseg].ds_addr = curaddr;
segs[curseg].ds_len = PAGE_SIZE;
}
Index: src/sys/arch/xen/x86/xen_bus_dma.c
diff -u src/sys/arch/xen/x86/xen_bus_dma.c:1.11.8.2 src/sys/arch/xen/x86/xen_bus_dma.c:1.11.8.3
--- src/sys/arch/xen/x86/xen_bus_dma.c:1.11.8.2 Mon Mar 29 00:23:12 2010
+++ src/sys/arch/xen/x86/xen_bus_dma.c Fri Nov 19 23:19:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_bus_dma.c,v 1.11.8.2 2010/03/29 00:23:12 snj Exp $ */
+/* $NetBSD: xen_bus_dma.c,v 1.11.8.3 2010/11/19 23:19:12 riz Exp $ */
/* NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */
/*-
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xen_bus_dma.c,v 1.11.8.2 2010/03/29 00:23:12 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: xen_bus_dma.c,v 1.11.8.3 2010/11/19 23:19:12 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -61,7 +61,7 @@
}
static int
-_xen_alloc_contig(bus_size_t size, bus_size_t alignment, bus_size_t boundary,
+_xen_alloc_contig(bus_size_t size, bus_size_t alignment,
struct pglist *mlistp, int flags, bus_addr_t low, bus_addr_t high)
{
int order, i;
@@ -75,9 +75,9 @@
/*
* When requesting a contigous memory region, the hypervisor will
- * return a memory range aligned on size. This will automagically
- * handle boundary, but the only way to enforce alignment
- * is to request a memory region of size max(alignment, size).
+ * return a memory range aligned on size.
+ * The only way to enforce alignment is to request a memory region
+ * of size max(alignment, size).
*/
order = max(get_order(size), get_order(alignment));
npages = (1 order);
@@ -245,21 +245,32 @@
struct pglist mlist;
int curseg, error;
int doingrealloc = 0;
+ bus_size_t uboundary;
/* Always round the size. */
size = round_page(size);
KASSERT((alignment (alignment -
CVS commit: [netbsd-5] src/lib/libc/citrus/modules
Module Name:src
Committed By: riz
Date: Fri Nov 19 23:25:02 UTC 2010
Modified Files:
src/lib/libc/citrus/modules [netbsd-5]: citrus_utf1632.c
Log Message:
Pull up following revision(s) (requested by tnozaki in ticket #1356):
lib/libc/citrus/modules/citrus_utf1632.c: revision 1.10
lib/libc/citrus/modules/citrus_utf1632.c: revision 1.11
fix byte order mark related bug introduced by previous commit,
reported by Sverre Froyen via current-user, thanks!
1. fix wrong byte order mark of utf-16, reported by NARUSE Yui -san.
patch provided by tshiozak@ -san.
2. don't eat 0xfeff/0xfffe if they don't appear at the first of bytestream.
noticed y tshiozak@ -san, patch provied by me.
thanks a lot.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.4.1 src/lib/libc/citrus/modules/citrus_utf1632.c
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/citrus/modules/citrus_utf1632.c
diff -u src/lib/libc/citrus/modules/citrus_utf1632.c:1.9 src/lib/libc/citrus/modules/citrus_utf1632.c:1.9.4.1
--- src/lib/libc/citrus/modules/citrus_utf1632.c:1.9 Sat Jun 14 16:01:08 2008
+++ src/lib/libc/citrus/modules/citrus_utf1632.c Fri Nov 19 23:25:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_utf1632.c,v 1.9 2008/06/14 16:01:08 tnozaki Exp $ */
+/* $NetBSD: citrus_utf1632.c,v 1.9.4.1 2010/11/19 23:25:01 riz Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: citrus_utf1632.c,v 1.9 2008/06/14 16:01:08 tnozaki Exp $);
+__RCSID($NetBSD: citrus_utf1632.c,v 1.9.4.1 2010/11/19 23:25:01 riz Exp $);
#endif /* LIBC_SCCS and not lint */
#include assert.h
@@ -127,37 +127,38 @@
result++;
}
- /* judge endian marker */
- if ((ei-mode _MODE_UTF32) == 0) {
- /* UTF16 */
- if (psenc-ch[0]==0xFE psenc-ch[1]==0xFF) {
- psenc-current_endian = _ENDIAN_BIG;
- chlenbak = 0;
- goto refetch;
- } else if (psenc-ch[0]==0xFF psenc-ch[1]==0xFE) {
- psenc-current_endian = _ENDIAN_LITTLE;
- chlenbak = 0;
- goto refetch;
- }
- } else {
- /* UTF32 */
- if (psenc-ch[0]==0x00 psenc-ch[1]==0x00
- psenc-ch[2]==0xFE psenc-ch[3]==0xFF) {
- psenc-current_endian = _ENDIAN_BIG;
- chlenbak = 0;
- goto refetch;
- } else if (psenc-ch[0]==0xFF psenc-ch[1]==0xFE
- psenc-ch[2]==0x00 psenc-ch[3]==0x00) {
- psenc-current_endian = _ENDIAN_LITTLE;
- chlenbak = 0;
- goto refetch;
+ if (psenc-current_endian == _ENDIAN_UNKNOWN) {
+ if ((ei-mode _MODE_FORCE_ENDIAN) == 0) {
+ /* judge endian marker */
+ if ((ei-mode _MODE_UTF32) == 0) {
+/* UTF16 */
+if (psenc-ch[0]==0xFE psenc-ch[1]==0xFF) {
+ psenc-current_endian = _ENDIAN_BIG;
+ chlenbak = 0;
+ goto refetch;
+} else if (psenc-ch[0]==0xFF psenc-ch[1]==0xFE) {
+ psenc-current_endian = _ENDIAN_LITTLE;
+ chlenbak = 0;
+ goto refetch;
+}
+ } else {
+/* UTF32 */
+if (psenc-ch[0]==0x00 psenc-ch[1]==0x00
+psenc-ch[2]==0xFE psenc-ch[3]==0xFF) {
+ psenc-current_endian = _ENDIAN_BIG;
+ chlenbak = 0;
+ goto refetch;
+} else if (psenc-ch[0]==0xFF psenc-ch[1]==0xFE
+ psenc-ch[2]==0x00 psenc-ch[3]==0x00) {
+ psenc-current_endian = _ENDIAN_LITTLE;
+ chlenbak = 0;
+ goto refetch;
+}
+ }
}
+ psenc-current_endian = ei-preffered_endian;
}
- if ((ei-mode _MODE_FORCE_ENDIAN) != 0 ||
- psenc-current_endian == _ENDIAN_UNKNOWN)
- endian = ei-preffered_endian;
- else
- endian = psenc-current_endian;
+ endian = psenc-current_endian;
/* get wc */
if ((ei-mode _MODE_UTF32) == 0) {
@@ -186,13 +187,13 @@
wc = 10;
switch (endian) {
case _ENDIAN_LITTLE:
-if (psenc-ch[2]0xDC || psenc-ch[2]0xDF)
+if (psenc-ch[3]0xDC || psenc-ch[3]0xDF)
goto ilseq;
wc |= psenc-ch[2];
wc |= (wchar_t)(psenc-ch[3] 3) 8;
break;
case _ENDIAN_BIG:
-if (psenc-ch[3]0xDC || psenc-ch[3]0xDF)
+if (psenc-ch[2]0xDC || psenc-ch[2]0xDF)
goto ilseq;
wc |= psenc-ch[3];
wc |= (wchar_t)(psenc-ch[2] 3) 8;
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Fri Nov 19 23:45:11 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket #1358.
To generate a diff of this commit:
cvs rdiff -u -r1.963.4.11 -r1.963.4.12 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.962.4.11 -r1.962.4.12 src/sys/dev/pci/pcidevs_data.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/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.11 src/sys/dev/pci/pcidevs.h:1.963.4.12
--- src/sys/dev/pci/pcidevs.h:1.963.4.11 Sun Mar 28 15:07:24 2010
+++ src/sys/dev/pci/pcidevs.h Fri Nov 19 23:44:59 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.963.4.11 2010/03/28 15:07:24 snj Exp $ */
+/* $NetBSD: pcidevs.h,v 1.963.4.12 2010/11/19 23:44:59 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.11 2010/03/28 15:03:22 snj Exp
+ * NetBSD: pcidevs,v 1.962.4.12 2010/11/19 23:40:28 riz Exp
*/
/*
@@ -2224,6 +2224,7 @@
#define PCI_PRODUCT_INTEL_82801I_IFE_GT 0x10c3 /* 82801I (GT) LAN Controller */
#define PCI_PRODUCT_INTEL_82801H_IFE_GT 0x10c4 /* i82801H IFE (GT) LAN Controller */
#define PCI_PRODUCT_INTEL_82801H_IFE_G 0x10c5 /* i82801H IFE (G) LAN Controller */
+#define PCI_PRODUCT_INTEL_82576_COPPER 0x10c9 /* 82576 1000BaseT Ethernet */
#define PCI_PRODUCT_INTEL_82801H_IGP_M_V 0x10cb /* i82801H IGP (MV) LAN Controller */
#define PCI_PRODUCT_INTEL_82801J_R_BM_LM 0x10cc /* i82567LM-2 LAN Controller */
#define PCI_PRODUCT_INTEL_82801J_R_BM_LF 0x10cd /* i82567LF-2 LAN Controller */
@@ -2234,6 +2235,9 @@
#define PCI_PRODUCT_INTEL_82801J_D_BM_LF 0x10df /* i82567LF-3 LAN Controller */
#define PCI_PRODUCT_INTEL_82575GB_QUAD_COPPER_PM 0x10e2 /* i82575GB Quad-1000baseT Ethernet (PM) */
#define PCI_PRODUCT_INTEL_82801I_BM 0x10e5 /* i82567LM-4 LAN Controller */
+#define PCI_PRODUCT_INTEL_82576_FIBER 0x10e6 /* 82576 1000BaseX Ethernet */
+#define PCI_PRODUCT_INTEL_82576_SERDES 0x10e7 /* 82576 gigabit Ethernet (SERDES) */
+#define PCI_PRODUCT_INTEL_82576_QUAD_COPPER 0x10e8 /* 82576 quad-1000BaseT Ethernet */
#define PCI_PRODUCT_INTEL_PCH_M_LM 0x10ea /* PCH LAN (82577LM) Controller */
#define PCI_PRODUCT_INTEL_PCH_M_LC 0x10eb /* PCH LAN (82577LC) Controller */
#define PCI_PRODUCT_INTEL_PCH_D_DM 0x10ef /* PCH LAN (82578DM) Controller */
@@ -2274,6 +2278,16 @@
#define PCI_PRODUCT_INTEL_82870P2_HPLUG 0x1462 /* 82870P2 P64H2 Hot Plug Controller */
#define PCI_PRODUCT_INTEL_82801I_82567V_3 0x1501 /* i82567V-3 LAN Controller */
#define PCI_PRODUCT_INTEL_82583V 0x150c /* i82583V 1000baseT Ethernet */
+#define PCI_PRODUCT_INTEL_82576_NS 0x150a /* 82576 gigabit Ethernet */
+#define PCI_PRODUCT_INTEL_82576_SERDES_QUAD 0x150d /* 82576 quad-gigabit Ethernet (SERDES) */
+#define PCI_PRODUCT_INTEL_82580_COPPER 0x150e /* 82580 1000BaseT Ethernet */
+#define PCI_PRODUCT_INTEL_82580_FIBER 0x150f /* 82580 1000BaseX Ethernet */
+#define PCI_PRODUCT_INTEL_82580_SERDES 0x1510 /* 82580 1000BaseT Ethernet (SERDES) */
+#define PCI_PRODUCT_INTEL_82580_SGMII 0x1511 /* 82580 gigabit Ethernet (SGMII) */
+#define PCI_PRODUCT_INTEL_82580_COPPER_DUAL 0x1516 /* 82580 dual-1000BaseT Ethernet */
+#define PCI_PRODUCT_INTEL_82576_NS_SERDES 0x1518 /* 82576 gigabit Ethernet (SERDES) */
+#define PCI_PRODUCT_INTEL_82580_ER 0x151d /* 82580 1000BaseT Ethernet */
+#define PCI_PRODUCT_INTEL_82580_ER_DUAL 0x151e /* 82580 dual-1000BaseT Ethernet */
#define PCI_PRODUCT_INTEL_80960_RP 0x1960 /* ROB-in i960RP Microprocessor */
#define PCI_PRODUCT_INTEL_80960RM_2 0x1962 /* i960 RM PCI-PCI */
#define PCI_PRODUCT_INTEL_82840_HB 0x1a21 /* 82840 Host */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.11 src/sys/dev/pci/pcidevs_data.h:1.962.4.12
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.11 Sun Mar 28 15:07:24 2010
+++ src/sys/dev/pci/pcidevs_data.h Fri Nov 19 23:44:59 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.962.4.11 2010/03/28 15:07:24 snj Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.962.4.12 2010/11/19 23:44:59 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.11 2010/03/28 15:03:22 snj Exp
+ * NetBSD: pcidevs,v 1.962.4.12 2010/11/19 23:40:28 riz Exp
*/
/*
@@ -7724,6 +7724,10 @@
i82801H IFE (G) LAN Controller,
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_COPPER,
+ 82576 1000BaseT Ethernet,
+ },
+ {
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_IGP_M_V,
i82801H IGP (MV) LAN Controller,
},
@@ -7764,6 +7768,18 @@
i82567LM-4 LAN Controller,
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_FIBER,
+ 82576 1000BaseX Ethernet,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_SERDES,
+ 82576 gigabit Ethernet (SERDES),
+ },
+ {
+
CVS commit: [netbsd-5] src/sys/dev/mii
Module Name:src
Committed By: riz
Date: Fri Nov 19 23:59:22 UTC 2010
Modified Files:
src/sys/dev/mii [netbsd-5]: miidevs.h miidevs_data.h
Log Message:
Regen for ticket 1359.
To generate a diff of this commit:
cvs rdiff -u -r1.81.4.3 -r1.81.4.4 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.71.4.3 -r1.71.4.4 src/sys/dev/mii/miidevs_data.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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.81.4.3 src/sys/dev/mii/miidevs.h:1.81.4.4
--- src/sys/dev/mii/miidevs.h:1.81.4.3 Wed Jan 27 22:05:18 2010
+++ src/sys/dev/mii/miidevs.h Fri Nov 19 23:59:22 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.81.4.3 2010/01/27 22:05:18 sborrill Exp $ */
+/* $NetBSD: miidevs.h,v 1.81.4.4 2010/11/19 23:59:22 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.78.4.3 2010/01/27 22:03:18 sborrill Exp
+ * NetBSD: miidevs,v 1.78.4.4 2010/11/19 23:58:41 riz Exp
*/
/*-
@@ -172,6 +172,10 @@
#define MII_STR_BROADCOM_BCM5401 BCM5401 1000BASE-T media interface
#define MII_MODEL_BROADCOM_BCM5411 0x0007
#define MII_STR_BROADCOM_BCM5411 BCM5411 1000BASE-T media interface
+#define MII_MODEL_BROADCOM_BCM5464 0x000b
+#define MII_STR_BROADCOM_BCM5464 BCM5464 1000BASE-T media interface
+#define MII_MODEL_BROADCOM_BCM5461 0x000c
+#define MII_STR_BROADCOM_BCM5461 BCM5461 1000BASE-T media interface
#define MII_MODEL_BROADCOM_BCM5462 0x000d
#define MII_STR_BROADCOM_BCM5462 BCM5462 1000BASE-T media interface
#define MII_MODEL_BROADCOM_BCM5421 0x000e
@@ -206,8 +210,12 @@
#define MII_STR_BROADCOM2_BCM5709CAX BCM5709CAX 10/100/1000baseT PHY
#define MII_MODEL_BROADCOM2_BCM5722 0x002d
#define MII_STR_BROADCOM2_BCM5722 BCM5722 1000BASE-T media interface
+#define MII_MODEL_BROADCOM2_BCM5784 0x003a
+#define MII_STR_BROADCOM2_BCM5784 BCM5784 10/100/1000baseT PHY
#define MII_MODEL_BROADCOM2_BCM5709C 0x003c
#define MII_STR_BROADCOM2_BCM5709C BCM5709 10/100/1000baseT PHY
+#define MII_MODEL_BROADCOM2_BCM5761 0x003d
+#define MII_STR_BROADCOM2_BCM5761 BCM5761 10/100/1000baseT PHY
#define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004
#define MII_STR_xxBROADCOM_ALT1_BCM5906 BCM5906 10/100baseTX media interface
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.71.4.3 src/sys/dev/mii/miidevs_data.h:1.71.4.4
--- src/sys/dev/mii/miidevs_data.h:1.71.4.3 Wed Jan 27 22:05:19 2010
+++ src/sys/dev/mii/miidevs_data.h Fri Nov 19 23:59:22 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.71.4.3 2010/01/27 22:05:19 sborrill Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.71.4.4 2010/11/19 23:59:22 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.78.4.3 2010/01/27 22:03:18 sborrill Exp
+ * NetBSD: miidevs,v 1.78.4.4 2010/11/19 23:58:41 riz Exp
*/
/*-
@@ -60,6 +60,8 @@
{ MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5400, MII_STR_BROADCOM_BCM5400 },
{ MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5401, MII_STR_BROADCOM_BCM5401 },
{ MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5411, MII_STR_BROADCOM_BCM5411 },
+ { MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5464, MII_STR_BROADCOM_BCM5464 },
+ { MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5461, MII_STR_BROADCOM_BCM5461 },
{ MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5462, MII_STR_BROADCOM_BCM5462 },
{ MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5421, MII_STR_BROADCOM_BCM5421 },
{ MII_OUI_BROADCOM, MII_MODEL_BROADCOM_BCM5752, MII_STR_BROADCOM_BCM5752 },
@@ -77,7 +79,9 @@
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5754, MII_STR_BROADCOM2_BCM5754 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709CAX, MII_STR_BROADCOM2_BCM5709CAX },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5722, MII_STR_BROADCOM2_BCM5722 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5784, MII_STR_BROADCOM2_BCM5784 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709C, MII_STR_BROADCOM2_BCM5709C },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5761, MII_STR_BROADCOM2_BCM5761 },
{ MII_OUI_xxBROADCOM_ALT1, MII_MODEL_xxBROADCOM_ALT1_BCM5906, MII_STR_xxBROADCOM_ALT1_BCM5906 },
{ MII_OUI_CICADA, MII_MODEL_CICADA_CS8201, MII_STR_CICADA_CS8201 },
{ MII_OUI_CICADA, MII_MODEL_CICADA_CS8201A, MII_STR_CICADA_CS8201A },
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src Committed By: riz Date: Fri Nov 19 23:59:57 UTC 2010 Modified Files: src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket 1359. To generate a diff of this commit: cvs rdiff -u -r1.963.4.12 -r1.963.4.13 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.962.4.12 -r1.962.4.13 src/sys/dev/pci/pcidevs_data.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/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.963.4.12 src/sys/dev/pci/pcidevs.h:1.963.4.13 --- src/sys/dev/pci/pcidevs.h:1.963.4.12 Fri Nov 19 23:44:59 2010 +++ src/sys/dev/pci/pcidevs.h Fri Nov 19 23:59:46 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.963.4.12 2010/11/19 23:44:59 riz Exp $ */ +/* $NetBSD: pcidevs.h,v 1.963.4.13 2010/11/19 23:59:46 riz Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.962.4.12 2010/11/19 23:40:28 riz Exp + * NetBSD: pcidevs,v 1.962.4.13 2010/11/19 23:58:40 riz Exp */ /* @@ -1410,8 +1410,8 @@ #define PCI_PRODUCT_BLUESTEEL_5601 0x5601 /* 5601 */ /* Broadcom products */ -#define PCI_PRODUCT_BROADCOM_BCM5752 0x1600 /* BCM5752 10/100/1000 Ethernet */ -#define PCI_PRODUCT_BROADCOM_BCM5752M 0x1601 /* BCM5752M 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5752 0x1600 /* BCM5752 NetXtreme 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5752M 0x1601 /* BCM5752M NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5709 0x1639 /* BCM5709 NetXtreme II 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5709S 0x163a /* BCM5709 NetXtreme II 1000baseSX Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5716 0x163b /* BCM5716 NetXtreme II 1000baseT Ethernet */ @@ -1427,9 +1427,13 @@ #define PCI_PRODUCT_BROADCOM_BCM5702FE 0x164d /* BCM5702FE 10/100 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705 0x1653 /* BCM5705 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705K 0x1654 /* BCM5705K 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5717 0x1655 /* BCM5717 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5718 0x1656 /* BCM5718 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5720 0x1658 /* BCM5720 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5721 0x1659 /* BCM5721 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5722 0x165a /* BCM5722 NetXtreme 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5723 0x165b /* BCM5723 NetXtreme 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5724 0x165c /* BCM5724 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705M 0x165d /* BCM5705M 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5705M_ALT 0x165e /* BCM5705M 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5714 0x1668 /* BCM5714 1000baseT Ethernet */ @@ -1448,21 +1452,40 @@ #define PCI_PRODUCT_BROADCOM_BCM5755 0x167b /* BCM5755 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5750M 0x167c /* BCM5750M 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5751M 0x167d /* BCM5751M 10/100/1000 Ethernet */ -#define PCI_PRODUCT_BROADCOM_BCM5751F 0x167e /* BCM5751F 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5751F 0x167e /* BCM5751F 10/100 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5787F 0x167f /* BCM5787F 10/100 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5761E 0x1680 /* BCM5761E 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5761 0x1681 /* BCM5761 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5764 0x1684 /* BCM5764 NetXtreme 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5761S 0x1688 /* BCM5761S 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5761SE 0x1689 /* BCM5761SE 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57760 0x1690 /* BCM57760 NetXtreme 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57788 0x1691 /* BCM57788 NetLink 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57780 0x1692 /* BCM57780 NetXtreme 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5787M 0x1693 /* BCM5787M 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM57790 0x1694 /* BCM57790 10/100 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5782 0x1696 /* BCM5782 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5784M 0x1698 /* BCM5784M NetLink 1000baseT Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5785G 0x1699 /* BCM5785G 10/100/1000 Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5786 0x169a /* BCM5786 NetLink 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5787 0x169b /* BCM5787 NetLink 1000baseT Ethernet */ #define PCI_PRODUCT_BROADCOM_BCM5788 0x169c /* BCM5788 10/100/1000 Ethernet */ -#define PCI_PRODUCT_BROADCOM_BCM5789 0x169d /* BCM5789 10/100/1000 Ethernet */ +#define PCI_PRODUCT_BROADCOM_BCM5789 0x169d /* BCM5789 NetLink 1000baseT Ethernet */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat Nov 20 00:02:59 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1348, 1356, 1358, 1359. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-5.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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.2 src/doc/CHANGES-5.2:1.1.2.3 --- src/doc/CHANGES-5.2:1.1.2.2 Fri Nov 19 21:11:42 2010 +++ src/doc/CHANGES-5.2 Sat Nov 20 00:02:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.2 2010/11/19 21:11:42 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.3 2010/11/20 00:02:59 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14,3 +14,50 @@ Fix a race condition. (CVE-2010-3864) [christos, ticket #1479] +sys/arch/x86/x86/bus_dma.c 1.54 +sys/arch/xen/x86/xen_bus_dma.c 1.21 + + Fix _xen_bus_dmamem_alloc_range() and _bus_dmamem_alloc_range() to + allow a boundary limit smaller than size. PR#42980 + [bouyer, ticket #1348] + +lib/libc/citrus/modules/citrus_utf1632.c 1.10-1.11 via patch + + Fix byte order bugs. + [tnozaki, ticket #1356] + +mii/igphy.c 1.21 +mii/igphyvar.h 1.1 +mii/inbmphyreg.h1.2 +sys/dev/pci/if_wm.c1.196-1.199,1.202,1.205 +sys/dev/pci/if_wmvar.h1.9 +sys/dev/pci/if_wmreg.h1.36-1.39 +sys/dev/pci/pcireg.h1.61-1.64 +sys/dev/pci/pcidevs1.1023 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Update wm(4): Fix PR#30349, add support for 82575, 82576, 82580(ER). + Add two workarounds for ICH8 with igp3. Workaround for 82566 Kumeran + PCS lock loss. + [msaitoh, ticket #1358] + +sys/dev/mii/miidevs1.89, 1.93 +sys/dev/mii/miidevs.hregen +sys/dev/mii/miidevs_data.h regen +sys/dev/mii/brgphy.c1.49, 1.52 +sys/dev/pci/if_bge.c1.170-1.181 +sys/dev/pci/if_bgereg.h1.53-1.56 +sys/dev/pci/if_bgevar.h1.2-1.5 +sys/dev/pci/pcidevs1.1017, 1.1021 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Update bge(4)/brgphy(4): support for BCM5705F,BCM5714,SBCM5715S, + BCM5717,BCM5718,BCM5720,BCM5723,BCM5724,BCM5751F,BCM5753F, + BCM5756,BCM5761,BCM5761E,BCM5761S,BCM5761SE,BCM5764,BCM5781,BCM5784M, + BCM5903M,BCM57760,BCM57761,BCM57765,BCM57780,BCM57781,BCM57785, + BCM57788,BCM57790,BCM57791 and BCM57795. + Also BCM5461, BCM5464, BCM5784 and BCM5761, and many bugfixes. + [msaitoh, ticket #1359] +
CVS commit: [netbsd-5] src/usr.bin/passwd
Module Name:src
Committed By: riz
Date: Sat Nov 20 00:12:37 UTC 2010
Modified Files:
src/usr.bin/passwd [netbsd-5]: local_passwd.c pam_passwd.c
Log Message:
Pull up following revision(s) (requested by gdt in ticket #1360):
usr.bin/passwd/pam_passwd.c: revision 1.5
usr.bin/passwd/local_passwd.c: revision 1.34
Log successful and unsuccessful attempts to change passwords, via -l
or pam, to ease IT audit guideline compliance. Patch from Richard
Hansen of BBN in private mail.
Proposed on tech-kern with positive comments, except a suggestion I
didn't implement:
A possible future enhancement is refraining from logging if the old
password is empty, as some people abort password changing that way.
However, it's not clear if this complies with most guidelines that
require password change logging, and at first glance that appears to
be a fairly difficult change.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.10.1 src/usr.bin/passwd/local_passwd.c
cvs rdiff -u -r1.4.18.1 -r1.4.18.2 src/usr.bin/passwd/pam_passwd.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/passwd/local_passwd.c
diff -u src/usr.bin/passwd/local_passwd.c:1.31 src/usr.bin/passwd/local_passwd.c:1.31.10.1
--- src/usr.bin/passwd/local_passwd.c:1.31 Fri Jan 25 19:36:27 2008
+++ src/usr.bin/passwd/local_passwd.c Sat Nov 20 00:12:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: local_passwd.c,v 1.31 2008/01/25 19:36:27 christos Exp $ */
+/* $NetBSD: local_passwd.c,v 1.31.10.1 2010/11/20 00:12:37 riz Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)local_passwd.c8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: local_passwd.c,v 1.31 2008/01/25 19:36:27 christos Exp $);
+__RCSID($NetBSD: local_passwd.c,v 1.31.10.1 2010/11/20 00:12:37 riz Exp $);
#endif
#endif /* not lint */
@@ -53,6 +53,7 @@
#include unistd.h
#include util.h
#include login_cap.h
+#include syslog.h
#include extern.h
@@ -72,6 +73,10 @@
strcmp(crypt(getpass(Old password:), pw-pw_passwd),
pw-pw_passwd)) {
errno = EACCES;
+ syslog(LOG_AUTH | LOG_NOTICE,
+ user %s (UID %lu) failed to change the
+ local password of user %s: %m,
+ pw-pw_name, (unsigned long)uid, pw-pw_name);
pw_error(NULL, 1, 1);
}
@@ -213,6 +218,11 @@
if (pw_mkdb(username, old_change == pw-pw_change) 0)
pw_error((char *)NULL, 0, 1);
+
+ syslog(LOG_AUTH | LOG_INFO,
+ user %s (UID %lu) successfully changed
+ the local password of user %s,
+ uid ? username : root, (unsigned long)uid, username);
}
#else /* ! USE_PAM */
@@ -319,6 +329,12 @@
if (pw_mkdb(uname, old_change == pw-pw_change) 0)
pw_error((char *)NULL, 0, 1);
+
+ syslog(LOG_AUTH | LOG_INFO,
+ user %s (UID %lu) successfully changed
+ the local password of user %s,
+ uid ? uname : root, (unsigned long)uid, uname);
+
return (0);
}
Index: src/usr.bin/passwd/pam_passwd.c
diff -u src/usr.bin/passwd/pam_passwd.c:1.4.18.1 src/usr.bin/passwd/pam_passwd.c:1.4.18.2
--- src/usr.bin/passwd/pam_passwd.c:1.4.18.1 Wed Mar 17 03:03:58 2010
+++ src/usr.bin/passwd/pam_passwd.c Sat Nov 20 00:12:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_passwd.c,v 1.4.18.1 2010/03/17 03:03:58 snj Exp $ */
+/* $NetBSD: pam_passwd.c,v 1.4.18.2 2010/11/20 00:12:37 riz Exp $ */
/*-
* Copyright (c) 2002 Networks Associates Technologies, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/usr.bin/passwd/passwd.c,v 1.23 2003/04/18 21:27:09 nectar Exp $);
#else
-__RCSID($NetBSD: pam_passwd.c,v 1.4.18.1 2010/03/17 03:03:58 snj Exp $);
+__RCSID($NetBSD: pam_passwd.c,v 1.4.18.2 2010/11/20 00:12:37 riz Exp $);
#endif
#include sys/param.h
@@ -75,6 +75,12 @@
int ch, pam_err;
char hostname[MAXHOSTNAMELEN + 1];
+ /* details about the invoking user for logging */
+ const uid_t i_uid = getuid();
+ const struct passwd *const i_pwd = getpwuid(i_uid);
+ const char *const i_username = (i_pwd i_pwd-pw_name)
+ ? i_pwd-pw_name : (null);
+
while ((ch = getopt(argc, argv, )) != -1) {
switch (ch) {
default:
@@ -118,9 +124,22 @@
/* set new password */
pam_err = pam_chauthtok(pamh, 0);
- if (pam_err != PAM_SUCCESS)
+ if (pam_err != PAM_SUCCESS) {
+ if (pam_err == PAM_PERM_DENIED) {
+ syslog(LOG_AUTH | LOG_NOTICE,
+ user %s (UID %lu) failed to change the
+ PAM authentication token of user %s: %s,
+ i_username, (unsigned long)i_uid, username,
+ pam_strerror(pamh, pam_err));
+ }
printf(Unable to change auth token: %s\n,
pam_strerror(pamh, pam_err));
+ } else {
+ syslog(LOG_AUTH | LOG_INFO,
+ user %s (UID %lu) successfully changed the
+ PAM authentication token of user %s,
+ i_username, (unsigned long)i_uid, username);
+ }
end:
pam_end(pamh, pam_err);
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Sat Nov 20 00:18:59 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5]: agp_i810.c agp_intel.c pcidevs
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1362):
sys/dev/pci/pcidevs: revision 1.1026
sys/dev/pci/agp_intel.c: revision 1.35
sys/dev/pci/agp_i810.c: revision 1.67
Add Intel 82855GM Host-AGP Bridge.
regen
Add (non-IGP) AGP port support for Intel 82855GM.
agp_intel tested with radeondrm(4). agp_i810 tested with i915drm(4).
To generate a diff of this commit:
cvs rdiff -u -r1.56.4.1 -r1.56.4.2 src/sys/dev/pci/agp_i810.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/dev/pci/agp_intel.c
cvs rdiff -u -r1.962.4.13 -r1.962.4.14 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/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.56.4.1 src/sys/dev/pci/agp_i810.c:1.56.4.2
--- src/sys/dev/pci/agp_i810.c:1.56.4.1 Tue May 5 18:17:57 2009
+++ src/sys/dev/pci/agp_i810.c Sat Nov 20 00:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.56.4.1 2009/05/05 18:17:57 bouyer Exp $ */
+/* $NetBSD: agp_i810.c,v 1.56.4.2 2010/11/20 00:18:59 riz Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.56.4.1 2009/05/05 18:17:57 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.56.4.2 2010/11/20 00:18:59 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -241,6 +241,7 @@
case PCI_PRODUCT_INTEL_82865_HB:
case PCI_PRODUCT_INTEL_82845G_DRAM:
case PCI_PRODUCT_INTEL_82815_FULL_HUB:
+ case PCI_PRODUCT_INTEL_82855GM_MCH:
return agp_intel_attach(parent, self, aux);
}
#endif
Index: src/sys/dev/pci/agp_intel.c
diff -u src/sys/dev/pci/agp_intel.c:1.32 src/sys/dev/pci/agp_intel.c:1.32.8.1
--- src/sys/dev/pci/agp_intel.c:1.32 Mon Jun 9 06:49:54 2008
+++ src/sys/dev/pci/agp_intel.c Sat Nov 20 00:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $ */
+/* $NetBSD: agp_intel.c,v 1.32.8.1 2010/11/20 00:18:59 riz Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_intel.c,v 1.32.8.1 2010/11/20 00:18:59 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -90,6 +90,7 @@
agp_intel_vgamatch(struct pci_attach_args *pa)
{
switch (PCI_PRODUCT(pa-pa_id)) {
+ case PCI_PRODUCT_INTEL_82855GM_AGP:
case PCI_PRODUCT_INTEL_82855PM_AGP:
case PCI_PRODUCT_INTEL_82443LX_AGP:
case PCI_PRODUCT_INTEL_82443BX_AGP:
@@ -148,6 +149,7 @@
case PCI_PRODUCT_INTEL_82840_AGP:
isc-chiptype = CHIP_I840;
break;
+ case PCI_PRODUCT_INTEL_82855GM_AGP:
case PCI_PRODUCT_INTEL_82855PM_AGP:
case PCI_PRODUCT_INTEL_82845_AGP:
isc-chiptype = CHIP_I845;
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.962.4.13 src/sys/dev/pci/pcidevs:1.962.4.14
--- src/sys/dev/pci/pcidevs:1.962.4.13 Fri Nov 19 23:58:40 2010
+++ src/sys/dev/pci/pcidevs Sat Nov 20 00:18:58 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.962.4.13 2010/11/19 23:58:40 riz Exp $
+$NetBSD: pcidevs,v 1.962.4.14 2010/11/20 00:18:58 riz Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2636,6 +2636,7 @@
product INTEL 82830MP_IV 0x3577 82830MP Integrated Video
product INTEL 82830MP_IO_2 0x3578 82830MP CPU to I/O Bridge 2
product INTEL 82855GM_MCH 0x3580 82855GM Host-Hub Controller
+product INTEL 82855GM_AGP 0x3581 82855GM Host-AGP Bridge
product INTEL 82855GM_IGD 0x3582 82855GM GMCH Integrated Graphics Device
product INTEL 82855GM_MC 0x3584 82855GM GMCH Memory Controller
product INTEL 82855GM_CP 0x3585 82855GM GMCH Configuration Process
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Sat Nov 20 00:19:48 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket 1362.
To generate a diff of this commit:
cvs rdiff -u -r1.963.4.13 -r1.963.4.14 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.962.4.13 -r1.962.4.14 src/sys/dev/pci/pcidevs_data.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/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.13 src/sys/dev/pci/pcidevs.h:1.963.4.14
--- src/sys/dev/pci/pcidevs.h:1.963.4.13 Fri Nov 19 23:59:46 2010
+++ src/sys/dev/pci/pcidevs.h Sat Nov 20 00:19:36 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.963.4.13 2010/11/19 23:59:46 riz Exp $ */
+/* $NetBSD: pcidevs.h,v 1.963.4.14 2010/11/20 00:19:36 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.13 2010/11/19 23:58:40 riz Exp
+ * NetBSD
*/
/*
@@ -2643,6 +2643,7 @@
#define PCI_PRODUCT_INTEL_82830MP_IV 0x3577 /* 82830MP Integrated Video */
#define PCI_PRODUCT_INTEL_82830MP_IO_2 0x3578 /* 82830MP CPU to I/O Bridge 2 */
#define PCI_PRODUCT_INTEL_82855GM_MCH 0x3580 /* 82855GM Host-Hub Controller */
+#define PCI_PRODUCT_INTEL_82855GM_AGP 0x3581 /* 82855GM Host-AGP Bridge */
#define PCI_PRODUCT_INTEL_82855GM_IGD 0x3582 /* 82855GM GMCH Integrated Graphics Device */
#define PCI_PRODUCT_INTEL_82855GM_MC 0x3584 /* 82855GM GMCH Memory Controller */
#define PCI_PRODUCT_INTEL_82855GM_CP 0x3585 /* 82855GM GMCH Configuration Process */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.13 src/sys/dev/pci/pcidevs_data.h:1.962.4.14
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.13 Fri Nov 19 23:59:46 2010
+++ src/sys/dev/pci/pcidevs_data.h Sat Nov 20 00:19:37 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.962.4.13 2010/11/19 23:59:46 riz Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.962.4.14 2010/11/20 00:19:37 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.13 2010/11/19 23:58:40 riz Exp
+ * NetBSD
*/
/*
@@ -9400,6 +9400,10 @@
82855GM Host-Hub Controller,
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_AGP,
+ 82855GM Host-AGP Bridge,
+ },
+ {
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82855GM_IGD,
82855GM GMCH Integrated Graphics Device,
},
@@ -14972,4 +14976,4 @@
Video Controller,
},
};
-const int pci_nproducts = 3142;
+const int pci_nproducts = 3143;
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Sat Nov 20 00:26:52 UTC 2010 Modified Files: src/distrib/notes/atari [netbsd-5]: hardware src/share/man/man4 [netbsd-5]: we.4 src/sys/arch/atari/conf [netbsd-5]: GENERIC.in files.atari Added Files: src/sys/arch/atari/vme [netbsd-5]: if_we_vme.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1366): sys/arch/atari/vme/if_we_vme.c: revision 1.1 sys/arch/atari/vme/if_we_vme.c: revision 1.2 sys/arch/atari/conf/files.atari: revision 1.116 sys/arch/atari/conf/GENERIC.in: revision 1.84 share/man/man4/we.4: revision 1.17 distrib/notes/atari/hardware: revision 1.23 Add support for the SMC Elite Ultra Ethernet with the SMC_TT VME-ISA bridge. The SMC_TT is the user designed handmade VME-ISA bridge circuit for 16 bit VME slot on TT030 and the SMC Elite Ultra ISA Ethernet card. More information about SMC_TT can be found in the following archive: ftp://ftp.funet.fi/pub/atari/net/smc_tt1.zip Demonstrated on the NetBSD booth in Open Source Conference 2010 kan...@kobe. Check if mapped bus_space regions are actually valid before trying to access them. Fixes trap panic when SMC_TT board is not installed. (oops) Note atari SMC_TT in SYNOPSIS. - note SMC_TT to supported VME-bus devices - capitalize Ethernet To generate a diff of this commit: cvs rdiff -u -r1.21.40.1 -r1.21.40.2 src/distrib/notes/atari/hardware cvs rdiff -u -r1.16 -r1.16.4.1 src/share/man/man4/we.4 cvs rdiff -u -r1.73.4.5 -r1.73.4.6 src/sys/arch/atari/conf/GENERIC.in cvs rdiff -u -r1.112.20.1 -r1.112.20.2 src/sys/arch/atari/conf/files.atari cvs rdiff -u -r0 -r1.2.6.2 src/sys/arch/atari/vme/if_we_vme.c 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/atari/hardware diff -u src/distrib/notes/atari/hardware:1.21.40.1 src/distrib/notes/atari/hardware:1.21.40.2 --- src/distrib/notes/atari/hardware:1.21.40.1 Sat Apr 25 23:16:33 2009 +++ src/distrib/notes/atari/hardware Sat Nov 20 00:26:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: hardware,v 1.21.40.1 2009/04/25 23:16:33 snj Exp $ +.\ $NetBSD: hardware,v 1.21.40.2 2010/11/20 00:26:52 riz Exp $ . .Nx*M \*V runs on the TT030, Falcon, Hades and MilanI machines. @@ -51,13 +51,15 @@ .It VME-bus devices (TT030/Hades) .(bullet -compact -BVME410 ethernet +BVME410 Ethernet .It Circad Leonardo 24-bit VME graphics adapter .It Crazy Dots VME et4000 graphics adapter .It -Riebl (and possibly PAM) ethernet cards on the VME bus. +Riebl (and possibly PAM) Ethernet cards on the VME bus. +.It +SMC Elite Ultra ISA Ethernet with SMC_TT VME-ISA bridge .bullet) .It PCI-bus devices (Hades and Milan only) Index: src/share/man/man4/we.4 diff -u src/share/man/man4/we.4:1.16 src/share/man/man4/we.4:1.16.4.1 --- src/share/man/man4/we.4:1.16 Wed Apr 30 13:10:55 2008 +++ src/share/man/man4/we.4 Sat Nov 20 00:26:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: we.4,v 1.16 2008/04/30 13:10:55 martin Exp $ +.\ $NetBSD: we.4,v 1.16.4.1 2010/11/20 00:26:52 riz Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,16 +28,20 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 20, 1997 +.Dd March 23, 2010 .Dt WE 4 .Os .Sh NAME .Nm we .Nd Western Digital/SMC WD80x3, SMC Elite Ultra, and SMC EtherEZ Ethernet cards device driver .Sh SYNOPSIS +.Ss ISA boards .Cd we0 at isa? port 0x280 iomem 0xd irq 9 .Cd we1 at isa? port 0x300 iomem 0xcc000 irq 10 +.Ss MCA boards .Cd we* at mca? slot ? +.Ss atari +.Cd we0 at vme0 irq 4 # SMC Elite Ultra with SMC_TT VME-ISA bridge .Sh DESCRIPTION The .Nm @@ -69,7 +73,8 @@ the on-board RAM for more receive buffers. .El .Pp -Note that all supported MCA cards are 16bit. +Note that all supported MCA cards are 16bit, and the SMC_TT VME-ISA bridge +interface for atari supports only SMC Elite Ultra. .Sh MEDIA SELECTION The ability to select media from software is dependent on the particular model of WD/SMC card. The following models support only manual configuration: Index: src/sys/arch/atari/conf/GENERIC.in diff -u src/sys/arch/atari/conf/GENERIC.in:1.73.4.5 src/sys/arch/atari/conf/GENERIC.in:1.73.4.6 --- src/sys/arch/atari/conf/GENERIC.in:1.73.4.5 Thu Mar 12 23:32:35 2009 +++ src/sys/arch/atari/conf/GENERIC.in Sat Nov 20 00:26:51 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $ +# $NetBSD: GENERIC.in,v 1.73.4.6 2010/11/20 00:26:51 riz Exp $ # # Generic atari # @@ -351,6 +351,7 @@ vme0 at avmebus0 le0 at vme0 irq 5 # Lance ethernet (Riebl/PAM). le0 at vme0 irq 4 # Lance ethernet (BVME410). +we0 at vme0 irq 4 # SMC Elite Ultra with SMC_TT VME-ISA bridge et0 at vme0 # Crazy Dots II #endif /* TT030_KERNEL */ #endif /* SMALL030_KERNEL */ Index: src/sys/arch/atari/conf/files.atari
CVS commit: [netbsd-5] src/sys/arch/atari/conf
Module Name:src Committed By: riz Date: Sat Nov 20 00:27:31 UTC 2010 Modified Files: src/sys/arch/atari/conf [netbsd-5]: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen for ticket 1366. To generate a diff of this commit: cvs rdiff -u -r1.86.4.4 -r1.86.4.5 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.84.4.4 -r1.84.4.5 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.76.4.4 -r1.76.4.5 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.53.4.4 -r1.53.4.5 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.57.4.4 -r1.57.4.5 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.86.4.4 src/sys/arch/atari/conf/ATARITT:1.86.4.5 --- src/sys/arch/atari/conf/ATARITT:1.86.4.4 Thu Mar 12 23:33:48 2009 +++ src/sys/arch/atari/conf/ATARITT Sat Nov 20 00:27:31 2010 @@ -1,23 +1,27 @@ # -# $NetBSD: ATARITT,v 1.86.4.4 2009/03/12 23:33:48 snj Exp $ +# $NetBSD: ATARITT,v 1.86.4.5 2010/11/20 00:27:31 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $ +# NetBSD$ include arch/atari/conf/std.atari options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 + options HZ=64 # Set the clock-rate (48/64/96) + options INSECURE # disable kernel security levels options M68030 # support for 030 options FPU_EMULATE # Support for MC68881/MC68882 emulator options INET # IP + ICMP + TCP + UDP + options INET6 # IPV6 options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) + options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support options IPFILTER_LOOKUP # ippool(8) support @@ -25,6 +29,7 @@ file-system MFS # Memory based filesystem file-system MSDOSFS # MSDOS filesystem file-system CD9660 # ISO 9660 filesystem with Rock Ridge + file-system KERNFS # Kernel parameter filesystem file-system NFS # Network File System client side code file-system PROCFS # Process filesystem @@ -35,13 +40,20 @@ file-system UMAPFS # null file system (with uid gid remapping) file-system PORTAL # portal file system file-system EXT2FS # second extended file system (linux) + file-system PTYFS # /dev/pts/N support + options WAPBL # File system journaling support - Experimental + options SOFTDEP # FFS soft updates support. + options NFSSERVER # Network File System server side code + options PANICWAIT # Require keystroke to dump/reboot + options DDB # Kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB + options COMPAT_43 # 4.3 BSD compatible system calls options COMPAT_10 # Compatibility with NetBSD 1.0 options COMPAT_11 # Compatibility with NetBSD 1.1 @@ -49,71 +61,101 @@ options COMPAT_13 # Compatibility with NetBSD 1.3 options COMPAT_14 # Compatibility with NetBSD 1.4 options COMPAT_15 # Compatibility with NetBSD 1.5 + options COMPAT_16 # Compatibility with NetBSD 1.6 options COMPAT_20 # Compatibility with NetBSD 2.0 options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. + options COMPAT_AOUT_M68K # Compatibility to a.out executables options EXEC_AOUT # a.out format executables + options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. + options SYSVSHM # System V shared memory options SYSVMSG # System V messages options SYSVSEM # System V semaphores options P1003_1B_SEMAPHORE # p1003.1b semaphore support + options KTRACE # Add kernel tracing system call + options USERCONF # userconf(4) support + options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel + options SCSIVERBOSE # human readable SCSI error messages options ST_POOL_SIZE=24 # smallest that allows TT-HIGH + options TT_SCSI # SCSI-support for TT options TT_VIDEO # Graphics support for TT + options MEMORY_DISK_HOOKS # Boot RAM-disk options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels + options SERCONSOLE # modem1 console support, breaks Falcon + options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer + options TRY_SCSI_LINKED_COMMANDS=0x7f + config netbsd root on ? type ? + pseudo-device sl # Slip + pseudo-device ppp # ppp + pseudo-device pppoe # PPP over Ethernet (RFC 2516) + pseudo-device pty # pseudo-terminals pseudo-device loop # Loopback network + pseudo-device md 3 # Boot memory disk + pseudo-device vnd # 3 pseudo disks (see vnconfig) pseudo-device bpfilter # berkeley packet filters + pseudo-device tun # network tunnel
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Sat Nov 20 00:33:49 UTC 2010 Modified Files: src/distrib/notes/atari [netbsd-5]: hardware src/sys/arch/atari/atari [netbsd-5]: autoconf.c src/sys/arch/atari/conf [netbsd-5]: GENERIC.in files.atari src/sys/arch/x68k/dev [netbsd-5]: if_ne_intio.c if_ne_neptune.c src/sys/conf [netbsd-5]: files src/sys/dev/ic [netbsd-5]: dp8390.c ne2000.c ne2000var.h src/sys/dev/isa [netbsd-5]: if_ne_isa.c src/sys/dev/isapnp [netbsd-5]: if_ne_isapnp.c Added Files: src/sys/arch/atari/dev [netbsd-5]: if_ne_mb.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1367): sys/dev/ic/ne2000var.h: revision 1.25 sys/arch/atari/conf/MILAN.in: revision 1.24 sys/arch/atari/conf/MILAN.in: revision 1.25 sys/dev/ic/ne2000.c: revision 1.71 sys/dev/ic/ne2000.c: revision 1.72 sys/arch/atari/dev/if_ne_mb.c: revision 1.1 sys/arch/atari/dev/if_ne_mb.c: revision 1.2 sys/arch/atari/conf/MILAN-PCIIDE: revision 1.69 sys/arch/atari/conf/HADES.in: revision 1.10 sys/arch/atari/conf/HADES.in: revision 1.11 sys/arch/x68k/dev/if_ne_neptune.c: revision 1.20 sys/dev/isa/if_ne_isa.c: revision 1.27 sys/arch/atari/atari/autoconf.c: revision 1.57 sys/dev/ic/ne2000.c: revision 1.62 sys/dev/isapnp/if_ne_isapnp.c: revision 1.27 sys/arch/atari/conf/files.atari: revision 1.117 sys/arch/atari/conf/HADES: revision 1.88 sys/arch/atari/conf/GENERIC.in: revision 1.85 sys/dev/ic/ne2000.c: revision 1.65 sys/dev/ic/ne2000.c: revision 1.66 sys/dev/ic/ne2000.c: revision 1.68 sys/arch/atari/conf/MILAN-ISAIDE: revision 1.65 distrib/notes/atari/hardware: revision 1.24 sys/conf/files: revision 1.980 sys/dev/ic/ne2000var.h: revision 1.21 sys/arch/x68k/dev/if_ne_intio.c: revision 1.16 sys/dev/ic/dp8390.c: revision 1.74 sys/dev/ic/dp8390.c: revision 1.75 Added NE2000 with 8bit bus width support. reviewd by tsutsui@ at tech-kern ML. Fix a wrong calculation bug around RX ring buffer memory address slipped in about sixteen years ago. Fortunately, it had been working for ages because some devices used address zero and other devices ignored wrong higher bits. Tested on we(4) (SMC Elite Ultra) and ne(4) (NE2000 compatible named UL0001) on ISA. Note FreeBSD also uses the same correct value in their ed(4) driver. Now dp8390_config() calculates mem_ring correctly so no longer need to override it in ne2000_attach(). Use roundup2() in sys/param.h rather than a conditional. Also fix a wrong mem_ring calculation in dp8390_ipkdb_attach(). Put several fixes to ne(4) driver for better 8 bit mode support, especially on RTL8019AS which is also used for non-ISA local bus of embedded controllers and some m68k machines like atari and x68k. * move RTL8019 probe and attach code from each bus attachment to MI ne2000_detect() and ne2000_attach() * change a method for backend and attachment to specify 8 bit mode to use a new sc-sc_quirk member, instead of sc-sc_dmawidth * handle more NE2000 8 bit mode specific settings, including bus_space(9) access width and available size of buffer memory * add a function to detect NE2000 8 bit mode (disabled by default, but enalbed by options NE2000_DETECT_8BIT to avoid possible regression on various ISA clones) * fix ipkdb attachment accordingly (untested) Tested on two NE2000 ISA variants (RTL8019AS and another clone named UL0001) in both 8 bit and 16 bit mode on i386. Looks good from non...@. See my post on tech-kern for details: http://mail-index.NetBSD.org/tech-kern/2010/02/26/msg007423.html No need to override mem_ring value in ne2000_ipkdb_attach() since a wrong calculation in dp8390_ipkdb_attach() was fixed. Don't warn about DMA timeout during probe. Add support for the EtherNEC. The EtherNEC is yet another user designed device for Atari machines, an NE2000 based ISA board connected to Atari's ROM cartridge slot with simple but ingenious interface and cartridge port adapter, and it's the most available network solution for the old Atari machines. See following pages for more details about EtherNEC: http://hardware.atari.org/ether/ http://home.arcor.de/thomas.redelberger/prj/atari/etherne/ http://www.freemint.org/ethernec/ethernec.html Also note EtherNEC. Use callout_schedule(9) rather than callout_reset(9) on polling as callout(9) man says. Remove EtherNEC from HADES and MILAN. They have ISA so no one will bother to connect ISA NE2000 via EtherNEC. Regen from HADES.in rev 1.11 and MILAN.in rev 1.25: Remove EtherNEC from HADES and MILAN. They have ISA so no one will bother to connect ISA NE2000 via EtherNEC. To generate a diff of this commit: cvs rdiff -u -r1.21.40.2 -r1.21.40.3 src/distrib/notes/atari/hardware cvs rdiff -u -r1.54 -r1.54.28.1
CVS commit: [netbsd-5] src/sys/arch/atari/conf
Module Name:src Committed By: riz Date: Sat Nov 20 00:34:14 UTC 2010 Modified Files: src/sys/arch/atari/conf [netbsd-5]: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen for ticket 1367. To generate a diff of this commit: cvs rdiff -u -r1.86.4.5 -r1.86.4.6 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.84.4.5 -r1.84.4.6 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.76.4.5 -r1.76.4.6 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.53.4.5 -r1.53.4.6 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.57.4.5 -r1.57.4.6 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.86.4.5 src/sys/arch/atari/conf/ATARITT:1.86.4.6 --- src/sys/arch/atari/conf/ATARITT:1.86.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/ATARITT Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: ATARITT,v 1.86.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: ATARITT,v 1.86.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -145,6 +145,7 @@ ite2 at grfcc2 # 3rd tty lp0 at mainbus0 # centronics printer ser0 at mainbus0 # UART on first 68901 (ttyB0) +ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot avmebus0 at mainbus0 # VME bus vme0 at avmebus0 Index: src/sys/arch/atari/conf/FALCON diff -u src/sys/arch/atari/conf/FALCON:1.84.4.5 src/sys/arch/atari/conf/FALCON:1.84.4.6 --- src/sys/arch/atari/conf/FALCON:1.84.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/FALCON Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: FALCON,v 1.84.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: FALCON,v 1.84.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -147,6 +147,7 @@ ite2 at grfcc2 # 3rd tty lp0 at mainbus0 # centronics printer ser0 at mainbus0 # UART on first 68901 (ttyB0) +ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot wdc0 at mainbus0 # IDE-bus atabus* at wdc? channel ? wd* at atabus? drive ? Index: src/sys/arch/atari/conf/HADES diff -u src/sys/arch/atari/conf/HADES:1.76.4.5 src/sys/arch/atari/conf/HADES:1.76.4.6 --- src/sys/arch/atari/conf/HADES:1.76.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/HADES Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: HADES,v 1.76.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: HADES,v 1.76.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/MILAN-ISAIDE diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.5 src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.6 --- src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/MILAN-ISAIDE Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-ISAIDE,v 1.53.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: MILAN-ISAIDE,v 1.53.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/MILAN-PCIIDE diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.5 src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.6 --- src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.5 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/MILAN-PCIIDE Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-PCIIDE,v 1.57.4.5 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: MILAN-PCIIDE,v 1.57.4.6 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/SMALL030 diff -u src/sys/arch/atari/conf/SMALL030:1.1.2.4 src/sys/arch/atari/conf/SMALL030:1.1.2.5 --- src/sys/arch/atari/conf/SMALL030:1.1.2.4 Sat Nov 20 00:27:31 2010 +++ src/sys/arch/atari/conf/SMALL030 Sat Nov 20 00:34:14 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: SMALL030,v 1.1.2.4 2010/11/20 00:27:31 riz Exp $ +# $NetBSD: SMALL030,v 1.1.2.5 2010/11/20 00:34:14 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory.
CVS commit: [netbsd-5] src/sys/arch/atari/conf
Module Name:src Committed By: riz Date: Sat Nov 20 00:48:29 UTC 2010 Modified Files: src/sys/arch/atari/conf [netbsd-5]: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen for ticket 1368. To generate a diff of this commit: cvs rdiff -u -r1.86.4.6 -r1.86.4.7 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.84.4.6 -r1.84.4.7 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.76.4.6 -r1.76.4.7 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.53.4.6 -r1.53.4.7 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.57.4.6 -r1.57.4.7 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.86.4.6 src/sys/arch/atari/conf/ATARITT:1.86.4.7 --- src/sys/arch/atari/conf/ATARITT:1.86.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/ATARITT Sat Nov 20 00:48:26 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: ATARITT,v 1.86.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: ATARITT,v 1.86.4.7 2010/11/20 00:48:26 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -93,8 +93,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/FALCON diff -u src/sys/arch/atari/conf/FALCON:1.84.4.6 src/sys/arch/atari/conf/FALCON:1.84.4.7 --- src/sys/arch/atari/conf/FALCON:1.84.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/FALCON Sat Nov 20 00:48:27 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: FALCON,v 1.84.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: FALCON,v 1.84.4.7 2010/11/20 00:48:27 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. Index: src/sys/arch/atari/conf/HADES diff -u src/sys/arch/atari/conf/HADES:1.76.4.6 src/sys/arch/atari/conf/HADES:1.76.4.7 --- src/sys/arch/atari/conf/HADES:1.76.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/HADES Sat Nov 20 00:48:27 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: HADES,v 1.76.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: HADES,v 1.76.4.7 2010/11/20 00:48:27 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -99,8 +99,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/MILAN-ISAIDE diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.6 src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.7 --- src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/MILAN-ISAIDE Sat Nov 20 00:48:28 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-ISAIDE,v 1.53.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: MILAN-ISAIDE,v 1.53.4.7 2010/11/20 00:48:28 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -96,8 +96,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/MILAN-PCIIDE diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.6 src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.7 --- src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.6 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/MILAN-PCIIDE Sat Nov 20 00:48:28 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: MILAN-PCIIDE,v 1.57.4.6 2010/11/20 00:34:14 riz Exp $ +# $NetBSD: MILAN-PCIIDE,v 1.57.4.7 2010/11/20 00:48:28 riz Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. @@ -96,8 +96,6 @@ options DISKLABEL_NBDA # NetBSD disklabels (required) options DISKLABEL_AHDI # NetBSD/AHDI disklabels -options SERCONSOLE # modem1 console support, breaks Falcon - options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM options MSGBUFSIZE=32768 # size of kernel msg. buffer Index: src/sys/arch/atari/conf/SMALL030 diff -u src/sys/arch/atari/conf/SMALL030:1.1.2.5 src/sys/arch/atari/conf/SMALL030:1.1.2.6 --- src/sys/arch/atari/conf/SMALL030:1.1.2.5 Sat Nov 20 00:34:14 2010 +++ src/sys/arch/atari/conf/SMALL030 Sat Nov 20 00:48:29 2010 @@ -1,5 +1,5 @@ # -# $NetBSD: SMALL030,v 1.1.2.5 2010/11/20 00:34:14 riz Exp $ +# $NetBSD:
CVS commit: [netbsd-5] src/sys/arch/atari
Module Name:src
Committed By: riz
Date: Sat Nov 20 00:47:56 UTC 2010
Modified Files:
src/sys/arch/atari/conf [netbsd-5]: GENERIC.in
src/sys/arch/atari/dev [netbsd-5]: ser.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1368):
sys/arch/atari/dev/ser.c: revision 1.49
sys/arch/atari/conf/GENERIC.in: revision 1.86
Make options SERCONSOLE (force serial console if DCD is detected)
patchable by binpatch(8) like:
---
serconsole(0x23bac4): 0x0001 (1), at offset 0x23bb44 in /netbsd
new value: 0x (0)
---
May work around PR port-atari/39849
(netbsd-ATARITT kernel fails with serial port connected)
and some old TT030 with early revision boards.
Disable options SERCONSOLE (force serial console if DCD is detected)
because now it's patchable by binpatch(8).
Enabling serial console by DCD signal could be problematic
on some earlier TT030 (with revision A board), and it's also
annoying for users who connect an active device on the serial port
as mentioned in PR port-atari/39849.
XXX: Eventually serial console should be enabled by MD bootloader flags,
XXX: but I have no idea how to build bootloader binaries for TOS.
To generate a diff of this commit:
cvs rdiff -u -r1.73.4.7 -r1.73.4.8 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/arch/atari/dev/ser.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/atari/conf/GENERIC.in
diff -u src/sys/arch/atari/conf/GENERIC.in:1.73.4.7 src/sys/arch/atari/conf/GENERIC.in:1.73.4.8
--- src/sys/arch/atari/conf/GENERIC.in:1.73.4.7 Sat Nov 20 00:33:46 2010
+++ src/sys/arch/atari/conf/GENERIC.in Sat Nov 20 00:47:55 2010
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.73.4.7 2010/11/20 00:33:46 riz Exp $
+# $NetBSD: GENERIC.in,v 1.73.4.8 2010/11/20 00:47:55 riz Exp $
#
# Generic atari
#
@@ -231,7 +231,7 @@
options DISKLABEL_AHDI # NetBSD/AHDI disklabels
#if !defined(SMALL030_KERNEL)
#if !defined(FALCON_KERNEL)
-options SERCONSOLE # modem1 console support, breaks Falcon
+#options SERCONSOLE # modem1 console support, breaks Falcon
#endif /* !FALCON_KERNEL */
options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM
options MSGBUFSIZE=32768# size of kernel msg. buffer
Index: src/sys/arch/atari/dev/ser.c
diff -u src/sys/arch/atari/dev/ser.c:1.39 src/sys/arch/atari/dev/ser.c:1.39.6.1
--- src/sys/arch/atari/dev/ser.c:1.39 Wed Jun 11 14:35:53 2008
+++ src/sys/arch/atari/dev/ser.c Sat Nov 20 00:47:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $ */
+/* $NetBSD: ser.c,v 1.39.6.1 2010/11/20 00:47:55 riz Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ser.c,v 1.39.6.1 2010/11/20 00:47:55 riz Exp $);
#include opt_ddb.h
#include opt_mbtype.h
@@ -262,6 +262,11 @@
serstop, sertty, serpoll, nommap, ttykqfilter, D_TTY
};
+#ifndef SERCONSOLE
+#define SERCONSOLE 0
+#endif
+int serconsole = SERCONSOLE; /* patchable */
+
/*ARGSUSED*/
static int
sermatch(pdp, cfp, auxp)
@@ -316,13 +321,13 @@
callout_init(sc-sc_diag_ch, 0);
-#if SERCONSOLE 0
- /*
- * Activate serial console when DCD present...
- */
- if (!(MFP-mf_gpip MCR_DCD))
- SET(sc-sc_hwflags, SER_HW_CONSOLE);
-#endif /* SERCONSOLE 0 */
+ if (serconsole) {
+ /*
+ * Activate serial console when DCD present...
+ */
+ if (!(MFP-mf_gpip MCR_DCD))
+ SET(sc-sc_hwflags, SER_HW_CONSOLE);
+ }
printf(\n);
if (ISSET(sc-sc_hwflags, SER_HW_CONSOLE)) {
@@ -1416,11 +1421,10 @@
/* initialize required fields */
/* XXX: LWP What unit? */
cp-cn_dev = makedev(cdevsw_lookup_major(ser_cdevsw), 0);
-#if SERCONSOLE 0
- cp-cn_pri = CN_REMOTE; /* Force a serial port console */
-#else
- cp-cn_pri = CN_NORMAL;
-#endif /* SERCONSOLE 0 */
+ if (serconsole)
+ cp-cn_pri = CN_REMOTE; /* Force a serial port console */
+ else
+ cp-cn_pri = CN_NORMAL;
}
void
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat Nov 20 00:49:21 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1366-1368. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-5.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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.3 src/doc/CHANGES-5.2:1.1.2.4 --- src/doc/CHANGES-5.2:1.1.2.3 Sat Nov 20 00:02:59 2010 +++ src/doc/CHANGES-5.2 Sat Nov 20 00:49:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.3 2010/11/20 00:02:59 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.4 2010/11/20 00:49:20 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -61,3 +61,72 @@ Also BCM5461, BCM5464, BCM5784 and BCM5761, and many bugfixes. [msaitoh, ticket #1359] +usr.bin/passwd/local_passwd.c 1.34 +usr.bin/passwd/pam_passwd.c 1.5 + + Log successful and unsuccessful attempts to change passwords, via -l + or pam, to ease IT audit guideline compliance. Patch from Richard + Hansen of BBN in private mail. + [gdt, ticket #1360] + +sys/dev/pci/agp_i810.c1.67 +sys/dev/pci/agp_intel.c1.35 +sys/dev/pci/pcidevs1.1026 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Add (non-IGP) AGP port support for Intel 82855GM. + [jakllsch, ticket #1362] + +distrib/notes/atari/hardware 1.23 +share/man/man4/we.41.17 +sys/arch/atari/conf/GENERIC.in 1.84 +sys/arch/atari/conf/ATARITT regen +sys/arch/atari/conf/FALCON regen +sys/arch/atari/conf/HADES regen +sys/arch/atari/conf/MILAN-ISAIDE regen +sys/arch/atari/conf/MILAN-PCIIDE regen +sys/arch/atari/conf/SMALL030 regen +sys/arch/atari/conf/files.atari 1.116 +sys/arch/atari/vme/if_we_vme.c 1.1 +sys/arch/atari/vme/if_we_vme.c 1.2 + + Add support for the SMC Elite Ultra Ethernet with the SMC_TT + VME-ISA bridge. + [tsutsui, ticket #1366] + +distrib/notes/atari/hardware 1.24 +sys/arch/atari/atari/autoconf.c 1.57 +sys/arch/atari/conf/GENERIC.in 1.85 +sys/arch/atari/conf/HADES regen +sys/arch/atari/conf/HADES.in 1.10-11 +sys/arch/atari/conf/MILAN-ISAIDE regen +sys/arch/atari/conf/MILAN-PCIIDE regen +sys/arch/atari/conf/MILAN.in 1.24-25 +sys/arch/atari/conf/files.atari 1.117 +sys/arch/atari/dev/if_ne_mb.c 1.1-2 +sys/arch/x68k/dev/if_ne_intio.c 1.16 +sys/arch/x68k/dev/if_ne_neptune.c 1.20 +sys/conf/files 1.980 +sys/dev/ic/dp8390.c1.74-75 +sys/dev/ic/ne2000.c1.62,1.65-66,1.68,1.71-72 +sys/dev/ic/ne2000var.h1.21, 1.25 +sys/dev/isa/if_ne_isa.c1.27 +sys/dev/isapnp/if_ne_isapnp.c 1.27 + + Added NE2000 with 8bit bus width support and EtherNEC Ethernet + support. + [tsutsui, ticket #1367] + +sys/arch/atari/conf/ATARITT regen +sys/arch/atari/conf/FALCON regen +sys/arch/atari/conf/GENERIC.in 1.86 +sys/arch/atari/conf/HADES regen +sys/arch/atari/conf/MILAN-ISAIDE regen +sys/arch/atari/conf/MILAN-PCIIDE regen +sys/arch/atari/conf/SMALL030 regen +sys/arch/atari/dev/ser.c 1.49 via patch + + Allow atari users to change serial console behavior with + binpatch(8), and disable options SERCONSOLE in default kernels. + [tsutsui, ticket #1368]
CVS commit: [netbsd-5] src/usr.bin/ftp
Module Name:src
Committed By: riz
Date: Sat Nov 20 00:54:10 UTC 2010
Modified Files:
src/usr.bin/ftp [netbsd-5]: fetch.c
Log Message:
Pull up following revision(s) (requested by lukem in ticket #1369):
usr.bin/ftp/fetch.c: revision 1.189
avoid NULL dereference in log output if the command line parser
failed to extract a port number from the URL
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.185.6.1 src/usr.bin/ftp/fetch.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/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.185 src/usr.bin/ftp/fetch.c:1.185.6.1
--- src/usr.bin/ftp/fetch.c:1.185 Mon Apr 28 20:24:13 2008
+++ src/usr.bin/ftp/fetch.c Sat Nov 20 00:54:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.185 2008/04/28 20:24:13 martin Exp $ */
+/* $NetBSD: fetch.c,v 1.185.6.1 2010/11/20 00:54:10 riz Exp $ */
/*-
* Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fetch.c,v 1.185 2008/04/28 20:24:13 martin Exp $);
+__RCSID($NetBSD: fetch.c,v 1.185.6.1 2010/11/20 00:54:10 riz Exp $);
#endif /* not lint */
/*
@@ -1491,7 +1491,8 @@
autologin = oautologin;
if ((connected == 0) ||
(connected == 1 !ftp_login(host, user, pass))) {
- warnx(Can't connect or login to host `%s:%s', host, port);
+ warnx(Can't connect or login to host `%s:%s',
+ host, port ? port : ?);
goto cleanup_fetch_ftp;
}
CVS commit: [netbsd-5] src/usr.bin/ftp
Module Name:src
Committed By: riz
Date: Sat Nov 20 01:03:19 UTC 2010
Modified Files:
src/usr.bin/ftp [netbsd-5]: extern.h fetch.c util.c
Log Message:
Pull up following revision(s) (requested by lukem in ticket #1370):
usr.bin/ftp/extern.h: revision 1.78
usr.bin/ftp/fetch.c: revision 1.192
usr.bin/ftp/util.c: revision 1.153
Parse HTTP 'Date' entries in the `C' locale rather than the user's.
Fix from [bin/42917] (with minor changes), from KAMADA Ken'ichi.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.75.4.1 src/usr.bin/ftp/extern.h
cvs rdiff -u -r1.185.6.1 -r1.185.6.2 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.148 -r1.148.4.1 src/usr.bin/ftp/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/usr.bin/ftp/extern.h
diff -u src/usr.bin/ftp/extern.h:1.75 src/usr.bin/ftp/extern.h:1.75.4.1
--- src/usr.bin/ftp/extern.h:1.75 Sat May 10 00:05:31 2008
+++ src/usr.bin/ftp/extern.h Sat Nov 20 01:03:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.75 2008/05/10 00:05:31 skd Exp $ */
+/* $NetBSD: extern.h,v 1.75.4.1 2010/11/20 01:03:18 riz Exp $ */
/*-
* Copyright (c) 1996-2008 The NetBSD Foundation, Inc.
@@ -166,6 +166,7 @@
void opts(int, char **);
void newer(int, char **);
void page(int, char **);
+const char *parse_rfc2616time(struct tm *, const char *);
int parserate(int, char **, int);
char *prompt(void);
void proxabort(int);
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.185.6.1 src/usr.bin/ftp/fetch.c:1.185.6.2
--- src/usr.bin/ftp/fetch.c:1.185.6.1 Sat Nov 20 00:54:10 2010
+++ src/usr.bin/ftp/fetch.c Sat Nov 20 01:03:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.185.6.1 2010/11/20 00:54:10 riz Exp $ */
+/* $NetBSD: fetch.c,v 1.185.6.2 2010/11/20 01:03:18 riz Exp $ */
/*-
* Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fetch.c,v 1.185.6.1 2010/11/20 00:54:10 riz Exp $);
+__RCSID($NetBSD: fetch.c,v 1.185.6.2 2010/11/20 01:03:18 riz Exp $);
#endif /* not lint */
/*
@@ -931,28 +931,18 @@
} else if (match_token(cp, Last-Modified:)) {
struct tm parsed;
-char *t;
+const char *t;
memset(parsed, 0, sizeof(parsed));
- /* RFC1123 */
-if ((t = strptime(cp,
- %a, %d %b %Y %H:%M:%S GMT,
- parsed))
- /* RFC0850 */
-|| (t = strptime(cp,
- %a, %d-%b-%y %H:%M:%S GMT,
- parsed))
- /* asctime */
-|| (t = strptime(cp,
- %a, %b %d %H:%M:%S %Y,
- parsed))) {
+t = parse_rfc2616time(parsed, cp);
+if (t != NULL) {
parsed.tm_isdst = -1;
if (*t == '\0')
mtime = timegm(parsed);
#ifndef NO_DEBUG
if (ftp_debug mtime != -1) {
fprintf(ttyout,
- parsed date as: %s,
+ parsed time as: %s,
rfc2822time(localtime(mtime)));
}
#endif
Index: src/usr.bin/ftp/util.c
diff -u src/usr.bin/ftp/util.c:1.148 src/usr.bin/ftp/util.c:1.148.4.1
--- src/usr.bin/ftp/util.c:1.148 Wed Aug 13 04:59:13 2008
+++ src/usr.bin/ftp/util.c Sat Nov 20 01:03:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.148 2008/08/13 04:59:13 lukem Exp $ */
+/* $NetBSD: util.c,v 1.148.4.1 2010/11/20 01:03:19 riz Exp $ */
/*-
* Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: util.c,v 1.148 2008/08/13 04:59:13 lukem Exp $);
+__RCSID($NetBSD: util.c,v 1.148.4.1 2010/11/20 01:03:19 riz Exp $);
#endif /* not lint */
/*
@@ -85,6 +85,7 @@
#include signal.h
#include libgen.h
#include limits.h
+#include locale.h
#include netdb.h
#include stdio.h
#include stdlib.h
@@ -756,7 +757,7 @@
else
goto cleanup_parse_time;
} else
- DPRINTF(remotemodtime: parsed date `%s' as LLF
+ DPRINTF(remotemodtime: parsed time `%s' as LLF
, %s,
timestr, (LLT)rtime,
rfc2822time(localtime(rtime)));
@@ -791,6 +792,32 @@
}
/*
+ * Parse HTTP-date as per RFC 2616.
+ * Return a pointer to the next character of the consumed date string,
+ * or NULL if failed.
+ */
+const char *
+parse_rfc2616time(struct tm *parsed, const char *httpdate)
+{
+ const char *t;
+ const char *curlocale;
+
+ /* The representation of %a depends on the current locale. */
+ curlocale = setlocale(LC_TIME, NULL);
+ (void)setlocale(LC_TIME, C);
+/* RFC1123 */
+ if ((t = strptime(httpdate, %a, %d %b %Y %H:%M:%S GMT, parsed)) ||
+/* RFC0850 */
+ (t = strptime(httpdate, %a, %d-%b-%y %H:%M:%S GMT, parsed)) ||
+/* asctime */
+ (t = strptime(httpdate, %a, %b %d %H:%M:%S %Y, parsed))) {
+ ; /* do nothing */
+ }
+ (void)setlocale(LC_TIME, curlocale);
+ return t;
+}
+
+/*
* Update global `localcwd', which contains the state of the local cwd
*/
void
CVS commit: [netbsd-5] src/distrib/atari/floppies
Module Name:src Committed By: riz Date: Sat Nov 20 01:06:52 UTC 2010 Modified Files: src/distrib/atari/floppies/install [netbsd-5]: list src/distrib/atari/floppies/prepare [netbsd-5]: list Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1371): distrib/atari/floppies/prepare/list: revision 1.7 distrib/atari/floppies/install/list: revision 1.13 Add dd(1) to install ramdisk binaries to wipe out existing disklabel etc. Per request from David Ross on port-atari. To generate a diff of this commit: cvs rdiff -u -r1.7.20.2 -r1.7.20.3 src/distrib/atari/floppies/install/list cvs rdiff -u -r1.4.28.2 -r1.4.28.3 src/distrib/atari/floppies/prepare/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/atari/floppies/install/list diff -u src/distrib/atari/floppies/install/list:1.7.20.2 src/distrib/atari/floppies/install/list:1.7.20.3 --- src/distrib/atari/floppies/install/list:1.7.20.2 Fri Jan 9 02:07:20 2009 +++ src/distrib/atari/floppies/install/list Sat Nov 20 01:06:52 2010 @@ -1,8 +1,9 @@ -# $NetBSD: list,v 1.7.20.2 2009/01/09 02:07:20 snj Exp $ +# $NetBSD: list,v 1.7.20.3 2010/11/20 01:06:52 riz Exp $ PROG bin/cat PROG bin/chmod PROG bin/cp +PROG bin/dd PROG bin/df PROG bin/expr PROG bin/ln Index: src/distrib/atari/floppies/prepare/list diff -u src/distrib/atari/floppies/prepare/list:1.4.28.2 src/distrib/atari/floppies/prepare/list:1.4.28.3 --- src/distrib/atari/floppies/prepare/list:1.4.28.2 Fri Jan 9 02:07:20 2009 +++ src/distrib/atari/floppies/prepare/list Sat Nov 20 01:06:52 2010 @@ -1,8 +1,9 @@ -# $NetBSD: list,v 1.4.28.2 2009/01/09 02:07:20 snj Exp $ +# $NetBSD: list,v 1.4.28.3 2010/11/20 01:06:52 riz Exp $ PROG bin/cat PROG bin/chmod PROG bin/cp +PROG bin/dd PROG bin/df PROG bin/expr PROG bin/ln
CVS commit: [netbsd-5] src/sys/arch/atari/dev
Module Name:src
Committed By: riz
Date: Sat Nov 20 01:09:27 UTC 2010
Modified Files:
src/sys/arch/atari/dev [netbsd-5]: atari5380.c dma.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1373):
sys/arch/atari/dev/dma.c: revision 1.25
sys/arch/atari/dev/atari5380.c: revision 1.54
Always schedule callback functions via add_sicallback(),
which calls softint_schedule(9).
We cannot use BASEPRI() to check recursive calls any longer
since softint(9) has been reorganized to use kernel thread.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.18 -r1.18.54.1 src/sys/arch/atari/dev/dma.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/atari/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.46 src/sys/arch/atari/dev/atari5380.c:1.46.2.1
--- src/sys/arch/atari/dev/atari5380.c:1.46 Wed Oct 29 14:31:01 2008
+++ src/sys/arch/atari/dev/atari5380.c Sat Nov 20 01:09:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.46 2008/10/29 14:31:01 abs Exp $ */
+/* $NetBSD: atari5380.c,v 1.46.2.1 2010/11/20 01:09:27 riz Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atari5380.c,v 1.46 2008/10/29 14:31:01 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: atari5380.c,v 1.46.2.1 2010/11/20 01:09:27 riz Exp $);
#include opt_atariscsi.h
@@ -1131,14 +1131,7 @@
{
if (GET_5380_REG(NCR5380_DMSTAT) SC_IRQ_SET) {
scsi_idisable();
- if (!BASEPRI(sr))
- add_sicallback((si_farg)ncr_ctrl_intr,
- (void *)cur_softc, 0);
- else {
- spl1();
- ncr_ctrl_intr(cur_softc);
- spl0();
- }
+ add_sicallback((si_farg)ncr_ctrl_intr, (void *)cur_softc, 0);
}
}
@@ -1152,14 +1145,7 @@
if ((reqp = connected) (reqp-dr_flag DRIVER_IN_DMA)) {
scsi_idisable();
- if (!BASEPRI(sr))
- add_sicallback((si_farg)ncr_dma_intr,
- (void *)cur_softc, 0);
- else {
- spl1();
- ncr_dma_intr(cur_softc);
- spl0();
- }
+ add_sicallback((si_farg)ncr_dma_intr, (void *)cur_softc, 0);
}
}
Index: src/sys/arch/atari/dev/dma.c
diff -u src/sys/arch/atari/dev/dma.c:1.18 src/sys/arch/atari/dev/dma.c:1.18.54.1
--- src/sys/arch/atari/dev/dma.c:1.18 Sun Mar 4 05:59:40 2007
+++ src/sys/arch/atari/dev/dma.c Sat Nov 20 01:09:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: dma.c,v 1.18.54.1 2010/11/20 01:09:27 riz Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: dma.c,v 1.18.54.1 2010/11/20 01:09:27 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -232,14 +232,7 @@
*/
int_func = dma_active.tqh_first-int_func;
softc= dma_active.tqh_first-softc;
-
- if(!BASEPRI(sr))
- add_sicallback((si_farg)int_func, softc, 0);
- else {
- spl1();
- (*int_func)(softc);
- spl0();
- }
+ add_sicallback((si_farg)int_func, softc, 0);
return 1;
}
return 0;
CVS commit: [netbsd-5] src
Module Name:src
Committed By: riz
Date: Sat Nov 20 01:14:23 UTC 2010
Modified Files:
src/share/man/man4 [netbsd-5]: udav.4
src/sys/dev/usb [netbsd-5]: if_udav.c usbdevs
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1379):
sys/dev/usb/usbdevs_data.h: revision 1.545
sys/dev/usb/if_udav.c: revision 1.30
sys/dev/usb/usbdevs: revision 1.549
sys/dev/usb/usbdevs.h: revision 1.544
share/man/man4/udav.4: revision 1.4
SUNRISING SR9600 Fast Ethernet
regen for SUNRISING SR9600 Fast Ethernet
match on SUNRISING SR9600 Fast Ethernet
add ShanTou ADM8515 and SUNRISING SR9600 Ethernet to list of supported devices
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.18.1 src/share/man/man4/udav.4
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.519.4.5 -r1.519.4.6 src/sys/dev/usb/usbdevs
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/udav.4
diff -u src/share/man/man4/udav.4:1.2 src/share/man/man4/udav.4:1.2.18.1
--- src/share/man/man4/udav.4:1.2 Thu Jul 12 21:26:03 2007
+++ src/share/man/man4/udav.4 Sat Nov 20 01:14:22 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: udav.4,v 1.2 2007/07/12 21:26:03 xtraeme Exp $
+.\ $NetBSD: udav.4,v 1.2.18.1 2010/11/20 01:14:22 riz Exp $
.\
.\ Copyright (c) 2003
.\ Shingo WATANABE n...@nabechan.org. All rights reserved.
@@ -30,7 +30,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\ THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd July 12, 2007
+.Dd April 19, 2010
.Dt UDAV 4
.Os
.Sh NAME
@@ -47,6 +47,8 @@
.Bl -tag -width Dv -offset indent -compact
.It Tn Corega FEther USB-TXC
.It Tn ShanTou ST268 USB NIC
+.It Tn ShanTou ADM8515
+.It Tn SUNRISING SR9600 Ethernet
.El
.Sh DESCRIPTION
The
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.24 src/sys/dev/usb/if_udav.c:1.24.8.1
--- src/sys/dev/usb/if_udav.c:1.24 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/if_udav.c Sat Nov 20 01:14:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.24 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: if_udav.c,v 1.24.8.1 2010/11/20 01:14:21 riz Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -44,7 +44,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_udav.c,v 1.24 2008/05/24 16:40:58 cube Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_udav.c,v 1.24.8.1 2010/11/20 01:14:21 riz Exp $);
#include opt_inet.h
#include bpfilter.h
@@ -154,6 +154,8 @@
{{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ST268_USB_NIC }, 0},
/* ShanTou ADM8515 */
{{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ADM8515 }, 0},
+ /* SUNRISING SR9600 */
+ {{ USB_VENDOR_SUNRISING, USB_PRODUCT_SUNRISING_SR9600 }, 0 },
#if 0
/* DAVICOM DM9601 Generic? */
/* XXX: The following ids was obtained from the data sheet. */
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.519.4.5 src/sys/dev/usb/usbdevs:1.519.4.6
--- src/sys/dev/usb/usbdevs:1.519.4.5 Tue Mar 9 03:45:43 2010
+++ src/sys/dev/usb/usbdevs Sat Nov 20 01:14:22 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp $
+$NetBSD: usbdevs,v 1.519.4.6 2010/11/20 01:14:22 riz Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -414,6 +414,7 @@
vendor FALCOM 0x0f94 Falcom Wireless Communications GmbH
vendor RIM 0x0fca Research In Motion
vendor DYNASTREAM 0x0fcf Dynastream Innovations
+vendor SUNRISING 0x0fe6 SUNRISING
vendor QUALCOMM 0x1004 Qualcomm
vendor GIGABYTE 0x1044 GIGABYTE
vendor MOTOROLA 0x1063 Motorola
@@ -2195,6 +2196,9 @@
/* XXX The above is a North American PC style keyboard possibly */
product SUN MOUSE 0x0100 Type 6 USB mouse
+/* SUNRISING products */
+product SUNRISING SR9600 0x8101 SR9600 Ethernet
+
/* SuperTop products */
product SUPERTOP IDEBRIDGE 0x6600 SuperTop IDE Bridge
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: riz
Date: Sat Nov 20 01:15:07 UTC 2010
Modified Files:
src/sys/dev/usb [netbsd-5]: usbdevs.h usbdevs_data.h
Log Message:
Regen for ticket 1379.
To generate a diff of this commit:
cvs rdiff -u -r1.515.4.5 -r1.515.4.6 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.516.4.5 -r1.516.4.6 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.515.4.5 src/sys/dev/usb/usbdevs.h:1.515.4.6
--- src/sys/dev/usb/usbdevs.h:1.515.4.5 Tue Mar 9 03:46:24 2010
+++ src/sys/dev/usb/usbdevs.h Sat Nov 20 01:15:06 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.515.4.5 2010/03/09 03:46:24 snj Exp $ */
+/* $NetBSD: usbdevs.h,v 1.515.4.6 2010/11/20 01:15:06 riz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp
+ * NetBSD
*/
/*
@@ -421,6 +421,7 @@
#define USB_VENDOR_FALCOM 0x0f94 /* Falcom Wireless Communications GmbH */
#define USB_VENDOR_RIM 0x0fca /* Research In Motion */
#define USB_VENDOR_DYNASTREAM 0x0fcf /* Dynastream Innovations */
+#define USB_VENDOR_SUNRISING 0x0fe6 /* SUNRISING */
#define USB_VENDOR_QUALCOMM 0x1004 /* Qualcomm */
#define USB_VENDOR_GIGABYTE 0x1044 /* GIGABYTE */
#define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */
@@ -2202,6 +2203,9 @@
/* XXX The above is a North American PC style keyboard possibly */
#define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 USB mouse */
+/* SUNRISING products */
+#define USB_PRODUCT_SUNRISING_SR9600 0x8101 /* SR9600 Ethernet */
+
/* SuperTop products */
#define USB_PRODUCT_SUPERTOP_IDEBRIDGE 0x6600 /* SuperTop IDE Bridge */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.516.4.5 src/sys/dev/usb/usbdevs_data.h:1.516.4.6
--- src/sys/dev/usb/usbdevs_data.h:1.516.4.5 Tue Mar 9 03:46:24 2010
+++ src/sys/dev/usb/usbdevs_data.h Sat Nov 20 01:15:07 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.516.4.5 2010/03/09 03:46:24 snj Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.516.4.6 2010/11/20 01:15:07 riz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp
+ * NetBSD
*/
/*
@@ -1479,6 +1479,10 @@
Dynastream Innovations,
},
{
+ USB_VENDOR_SUNRISING,
+ SUNRISING,
+ },
+ {
USB_VENDOR_QUALCOMM,
Qualcomm,
},
@@ -1859,7 +1863,7 @@
GNU Radio USRP,
},
};
-const int usb_nvendors = 455;
+const int usb_nvendors = 456;
const struct usb_product usb_products[] = {
{
@@ -6363,6 +6367,10 @@
Type 6 USB mouse,
},
{
+ USB_VENDOR_SUNRISING, USB_PRODUCT_SUNRISING_SR9600,
+ SR9600 Ethernet,
+ },
+ {
USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDEBRIDGE,
SuperTop IDE Bridge,
},
@@ -6843,4 +6851,4 @@
Prestige,
},
};
-const int usb_nproducts = 1245;
+const int usb_nproducts = 1246;
CVS commit: [netbsd-5] src/sys/dev/pckbport
Module Name:src
Committed By: riz
Date: Sat Nov 20 01:19:01 UTC 2010
Modified Files:
src/sys/dev/pckbport [netbsd-5]: synaptics.c synapticsreg.h
Log Message:
Pull up following revision(s) (requested by plunky in ticket #1383):
sys/dev/pckbport/synapticsreg.h: revision 1.6
sys/dev/pckbport/synaptics.c: revision 1.22
sys/dev/pckbport/synaptics.c: revision 1.23
sys/dev/pckbport/synaptics.c: revision 1.24
some definitions from the Linux driver (via PR kern/42853)
Extended capability probes can confuse the passthrough device,
reset the touchpad on enable to cure that.
send the SET_SCALE11 command before the 'sliced' command as per the
Linux driver (and elantech(4)), via PR kern/42853
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.10.1 src/sys/dev/pckbport/synaptics.c
cvs rdiff -u -r1.5 -r1.5.56.1 src/sys/dev/pckbport/synapticsreg.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.21 src/sys/dev/pckbport/synaptics.c:1.21.10.1
--- src/sys/dev/pckbport/synaptics.c:1.21 Wed Apr 30 14:07:14 2008
+++ src/sys/dev/pckbport/synaptics.c Sat Nov 20 01:19:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.21 2008/04/30 14:07:14 ad Exp $ */
+/* $NetBSD: synaptics.c,v 1.21.10.1 2010/11/20 01:19:01 riz Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include opt_pms.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.21 2008/04/30 14:07:14 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: synaptics.c,v 1.21.10.1 2010/11/20 01:19:01 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -241,6 +241,10 @@
const char comma[] = , ;
const char *sep = ;
aprint_normal_dev(psc-sc_dev, );
+ if (sc-flags SYN_FLAG_HAS_PASSTHROUGH) {
+ aprint_normal(%sPassthrough, sep);
+ sep = comma;
+ }
if (sc-flags SYN_FLAG_HAS_MIDDLE_BUTTON) {
aprint_normal(%sMiddle button, sep);
sep = comma;
@@ -276,9 +280,19 @@
{
struct pms_softc *psc = vsc;
struct synaptics_softc *sc = psc-u.synaptics;
- u_char cmd[2];
+ u_char cmd[2], resp[2];
int res;
+ if (sc-flags SYN_FLAG_HAS_PASSTHROUGH) {
+ /*
+ * Extended capability probes can confuse the passthrough device;
+ * reset the touchpad now to cure that.
+ */
+ cmd[0] = PMS_RESET;
+ res = pckbport_poll_cmd(psc-sc_kbctag, psc-sc_kbcslot, cmd,
+ 1, 2, resp, 1);
+ }
+
/*
* Enable Absolute mode with W (width) reporting, and set
* the packet rate to maximum (80 packets per second).
@@ -286,7 +300,7 @@
res = pms_synaptics_send_command(psc-sc_kbctag, psc-sc_kbcslot,
SYNAPTICS_MODE_ABSOLUTE | SYNAPTICS_MODE_W | SYNAPTICS_MODE_RATE);
cmd[0] = PMS_SET_SAMPLE;
- cmd[1] = 0x14; /* doit */
+ cmd[1] = SYNAPTICS_CMD_SET_MODE2;
res |= pckbport_enqueue_cmd(psc-sc_kbctag, psc-sc_kbcslot, cmd, 2, 0,
1, NULL);
sc-up_down = 0;
@@ -616,13 +630,16 @@
u_char cmd[2];
int res;
+ cmd[0] = PMS_SET_SCALE11;
+ res = pckbport_poll_cmd(tag, slot, cmd, 1, 0, NULL, 0);
+
/*
* Need to send 4 Set Resolution commands, with the argument
* encoded in the bottom most 2 bits.
*/
cmd[0] = PMS_SET_RES;
cmd[1] = syn_cmd 6;
- res = pckbport_poll_cmd(tag, slot, cmd, 2, 0, NULL, 0);
+ res |= pckbport_poll_cmd(tag, slot, cmd, 2, 0, NULL, 0);
cmd[0] = PMS_SET_RES;
cmd[1] = (syn_cmd 0x30) 4;
Index: src/sys/dev/pckbport/synapticsreg.h
diff -u src/sys/dev/pckbport/synapticsreg.h:1.5 src/sys/dev/pckbport/synapticsreg.h:1.5.56.1
--- src/sys/dev/pckbport/synapticsreg.h:1.5 Wed Jan 17 23:14:03 2007
+++ src/sys/dev/pckbport/synapticsreg.h Sat Nov 20 01:19:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsreg.h,v 1.5 2007/01/17 23:14:03 uwe Exp $ */
+/* $NetBSD: synapticsreg.h,v 1.5.56.1 2010/11/20 01:19:01 riz Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -45,6 +45,10 @@
#define SYNAPTICS_READ_MODEL_ID 0x3
#define SYNAPTICS_EXTENDED_QUERY 0x9
+/* Synaptics special commands */
+#define SYNAPTICS_CMD_SET_MODE2 0x14
+#define SYNAPTICS_CMD_CLIENT_CMD 0x28
+
/* Magic numbers. */
#define SYNAPTICS_MIN_VERSION 45 /* 4.5 */
#define SYNAPTICS_MAGIC_BYTE 0x47
@@ -64,6 +68,7 @@
#define SYNAPTICS_MODE_RATE (1 6)
#define SYNAPTICS_MODE_SLEEP (1 3)
#define SYNAPTICS_MODE_GEST (1 2)
+#define SYNAPTICS_MODE_4BYTE_CLIENT (1 1)
#define SYNAPTICS_MODE_W (1)
/* Extended mode button masks. */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat Nov 20 01:20:17 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: tickets 1369-1371,1373,1379,1383. To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-5.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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.4 src/doc/CHANGES-5.2:1.1.2.5 --- src/doc/CHANGES-5.2:1.1.2.4 Sat Nov 20 00:49:20 2010 +++ src/doc/CHANGES-5.2 Sat Nov 20 01:20:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.4 2010/11/20 00:49:20 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.5 2010/11/20 01:20:17 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -130,3 +130,46 @@ Allow atari users to change serial console behavior with binpatch(8), and disable options SERCONSOLE in default kernels. [tsutsui, ticket #1368] + +usr.bin/ftp/fetch.c1.189 via patch + + avoid NULL dereference in log output if the command line parser + failed to extract a port number from the URL + [lukem, ticket #1369] + +usr.bin/ftp/extern.h1.78 +usr.bin/ftp/fetch.c1.192 +usr.bin/ftp/util.c1.153 via patch + + Parse HTTP 'Date' entries in the `C' locale rather than the user's. + Fix from [bin/42917] (with minor changes), from KAMADA Ken'ichi. + [lukem, ticket #1370] + +distrib/atari/floppies/install/list 1.13 +distrib/atari/floppies/prepare/list 1.7 + + Add dd(1) to install ramdisk binaries. + [tsutsui, ticket #1371] + +sys/arch/atari/dev/atari5380.c 1.54 +sys/arch/atari/dev/dma.c 1.25 + + Always schedule callback functions via add_sicallback(), + which calls softint_schedule(9). + [tsutsui, ticket #1373] + +share/man/man4/udav.41.4 +sys/dev/usb/if_udav.c1.30 +sys/dev/usb/usbdevs1.549 +sys/dev/usb/usbdevs.hregen +sys/dev/usb/usbdevs_data.h regen + + Add support for SUNRISING SR9600 Fast Ethernet. + [jmcneill, ticket #1379] + +sys/dev/pckbport/synaptics.c 1.22-24 +sys/dev/pckbport/synapticsreg.h 1.6 + + Fix the synaptics touchpad passthrough device support. PR#42853. + [plunky, ticket #1383] +
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Sat Nov 20 03:00:42 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Snapshot of getpages BMAP loop merge.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.47 -r1.36.2.48 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.47 src/sys/miscfs/genfs/genfs_io.c:1.36.2.48
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.47 Fri Nov 19 15:25:37 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sat Nov 20 03:00:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.47 2010/11/19 15:25:37 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.48 2010/11/20 03:00:42 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.47 2010/11/19 15:25:37 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.48 2010/11/20 03:00:42 uebayasi Exp $);
#include opt_xip.h
@@ -585,6 +585,7 @@
ap-a_advice,
ap-a_flags,
orignmempages);
+if (0)
goto loopdone;
}
#endif
@@ -614,6 +615,9 @@
*/
pidx = (offset - startoffset) PAGE_SHIFT;
+#ifdef XIP
+ if ((ap-a_vp-v_vflag VV_XIP) == 0) {
+#endif
while ((pgs[pidx]-flags PG_FAKE) == 0) {
size_t b;
@@ -632,6 +636,9 @@
goto loopdone;
}
}
+#ifdef XIP
+ }
+#endif
/*
* bmap the file to find out the blkno to read from and
@@ -661,10 +668,16 @@
int pcount;
pcount = 1;
+#ifdef XIP
+ if ((ap-a_vp-v_vflag VV_XIP) == 0) {
+#endif
while (pidx + pcount npages
pgs[pidx + pcount]-flags PG_FAKE) {
pcount++;
}
+#ifdef XIP
+ }
+#endif
iobytes = MIN(iobytes, (pcount PAGE_SHIFT) -
(offset - trunc_page(offset)));
}
@@ -676,10 +689,15 @@
*/
if (blkno == (daddr_t)-1) {
+#ifdef XIP
+ if ((ap-a_vp-v_vflag VV_XIP) == 0) {
+#endif
int holepages = (round_page(offset + iobytes) -
trunc_page(offset)) PAGE_SHIFT;
UVMHIST_LOG(ubchist, lbn 0x%x - HOLE, lbn,0,0,0);
+ KASSERT((ap-a_vp-v_vflag VV_XIP) == 0);
+
sawhole = true;
memset((char *)kva + (offset - startoffset), 0,
iobytes);
@@ -693,15 +711,25 @@
pgs[pidx + i]-flags |= PG_RDONLY;
}
}
+#ifdef XIP
+ } else {
+ panic(XIP hole page is not supported yet);
+ }
+#endif
continue;
}
+#ifdef XIP
+ if ((ap-a_vp-v_vflag VV_XIP) == 0) {
+#endif
/*
* allocate a sub-buf for this piece of the i/o
* (or just use mbp if there's only 1 piece),
* and start it going.
*/
+ KASSERT((ap-a_vp-v_vflag VV_XIP) == 0);
+
if (offset == startoffset iobytes == bytes) {
bp = mbp;
} else {
@@ -721,12 +749,47 @@
bp, offset, bp-b_bcount, bp-b_blkno);
VOP_STRATEGY(devvp, bp);
+#ifdef XIP
+ } else {
+ /*
+ * XIP page metadata assignment
+ * - Unallocated block is redirected to the dedicated zero'ed
+ * page.
+ */
+ const int npgs = MIN(
+ iobytes PAGE_SHIFT,
+ ((1 + run) fs_bshift) PAGE_SHIFT);
+ const daddr_t blk_off = blkno dev_bshift;
+ const daddr_t fs_off = ap-a_offset - (lbn fs_bshift);
+
+ UVMHIST_LOG(ubchist,
+ xip npgs=%d _blk_off=0x%lx _fs_off=0x%lx,
+ npgs, (long)blk_off, (long)fs_off, 0);
+
+ for (i = 0; i npgs; i++) {
+ const daddr_t pg_off = pidx PAGE_SHIFT;
+ struct vm_page *pg;
+
+ pg = uvn_findpage_xip(devvp, vp-v_uobj,
+ blk_off + fs_off + pg_off);
+ KASSERT(pg != NULL);
+ UVMHIST_LOG(ubchist,
+xip pgs %d = phys_addr=0x%lx (%p),
+pidx + i,
+(long)pg-phys_addr,
+pg,
+0);
+ pgs[pidx + i] = pg;
+ }
+ }
+#endif
}
loopdone:
#if 1
- if ((ap-a_vp-v_vflag VV_XIP) != 0)
+ if ((ap-a_vp-v_vflag VV_XIP) != 0) {
goto genfs_getpages_biodone_done;
+ }
#endif
#if 0
@@ -903,6 +966,7 @@
genfs_markdirty(vp);
}
mutex_exit(uobj-vmobjlock);
+
#if 1
genfs_getpages_generic_io_done_done:
{}
@@ -968,17 +1032,22 @@
off = origoffset;
for (i = ridx; i ridx + orignmempages; i++) {
- daddr_t lbn, blkno;
+ daddr_t blkno;
int run;
struct vnode *devvp;
- lbn = (off ~(fs_bsize - 1)) fs_bshift;
+ KASSERT((off - origoffset) PAGE_SHIFT == i - ridx);
+
+ const daddr_t lbn = (off ~(fs_bsize - 1)) fs_bshift;
error = VOP_BMAP(vp, lbn, devvp, blkno, run);
KASSERT(error == 0);
UVMHIST_LOG(ubchist, xip VOP_BMAP: lbn=%ld blkno=%ld run=%d,
(long)lbn, (long)blkno, run, 0);
+ const daddr_t blk_off = blkno dev_bshift;
+ const daddr_t fs_off = origoffset - (lbn fs_bshift);
+
/*
* XIP page metadata assignment
* - Unallocated block is redirected to the dedicated zero'ed
@@ -987,13 +1056,12 @@
if (blkno 0) {
panic(XIP hole is not supported yet!);
} else {
- daddr_t blk_off, fs_off;
+ KASSERT(off -
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Sat Nov 20 04:26:16 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Fix a bug (offset calculation) in the previous.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.48 -r1.36.2.49 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.48 src/sys/miscfs/genfs/genfs_io.c:1.36.2.49
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.48 Sat Nov 20 03:00:42 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sat Nov 20 04:26:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.48 2010/11/20 03:00:42 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.49 2010/11/20 04:26:12 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.48 2010/11/20 03:00:42 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.49 2010/11/20 04:26:12 uebayasi Exp $);
#include opt_xip.h
@@ -749,8 +749,9 @@
bp, offset, bp-b_bcount, bp-b_blkno);
VOP_STRATEGY(devvp, bp);
+ }
#ifdef XIP
- } else {
+ else {
/*
* XIP page metadata assignment
* - Unallocated block is redirected to the dedicated zero'ed
@@ -760,10 +761,10 @@
iobytes PAGE_SHIFT,
((1 + run) fs_bshift) PAGE_SHIFT);
const daddr_t blk_off = blkno dev_bshift;
- const daddr_t fs_off = ap-a_offset - (lbn fs_bshift);
+ const daddr_t fs_off = ap-a_offset - startoffset;
UVMHIST_LOG(ubchist,
- xip npgs=%d _blk_off=0x%lx _fs_off=0x%lx,
+ xip npgs=%d blk_off=0x%lx fs_off=0x%lx,
npgs, (long)blk_off, (long)fs_off, 0);
for (i = 0; i npgs; i++) {
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Sat Nov 20 07:47:35 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
XIP has no fake (== unitinialized) pages, because pages are
already initialized when mounted. Adjust getpages loop again.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.50 -r1.36.2.51 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.50 src/sys/miscfs/genfs/genfs_io.c:1.36.2.51
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.50 Sat Nov 20 05:15:59 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sat Nov 20 07:47:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.50 2010/11/20 05:15:59 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.51 2010/11/20 07:47:34 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.50 2010/11/20 05:15:59 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.51 2010/11/20 07:47:34 uebayasi Exp $);
#include opt_xip.h
@@ -668,16 +668,19 @@
int pcount;
pcount = 1;
+ while ((pidx + pcount npages) (
#ifdef XIP
- if ((ap-a_vp-v_vflag VV_XIP) == 0) {
+ /*
+ * in XIP case, we don't know what page to read
+ * at this point!
+ */
+ ((ap-a_vp-v_vflag VV_XIP) != 0) ||
+#else
+ 0 ||
#endif
- while (pidx + pcount npages
- pgs[pidx + pcount]-flags PG_FAKE) {
+ (pgs[pidx + pcount]-flags PG_FAKE))) {
pcount++;
}
-#ifdef XIP
- }
-#endif
iobytes = MIN(iobytes, (pcount PAGE_SHIFT) -
(offset - trunc_page(offset)));
}
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src Committed By: uebayasi Date: Sat Nov 20 07:52:31 UTC 2010 Modified Files: src/sys/uvm [uebayasi-xip]: uvm_page.c Log Message: Don't set PG_FAKE for device pages. XXX PG_FAKE should be renamed as PG_UNINITED! To generate a diff of this commit: cvs rdiff -u -r1.153.2.65 -r1.153.2.66 src/sys/uvm/uvm_page.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/uvm_page.c diff -u src/sys/uvm/uvm_page.c:1.153.2.65 src/sys/uvm/uvm_page.c:1.153.2.66 --- src/sys/uvm/uvm_page.c:1.153.2.65 Mon Nov 15 17:32:01 2010 +++ src/sys/uvm/uvm_page.c Sat Nov 20 07:52:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_page.c,v 1.153.2.65 2010/11/15 17:32:01 uebayasi Exp $ */ +/* $NetBSD: uvm_page.c,v 1.153.2.66 2010/11/20 07:52:30 uebayasi Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.65 2010/11/15 17:32:01 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.66 2010/11/20 07:52:30 uebayasi Exp $); #include opt_ddb.h #include opt_uvmhist.h @@ -862,7 +862,7 @@ paddr_t paddr = (start + i) PAGE_SHIFT; pg-phys_addr = paddr; - pg-flags |= PG_FAKE | PG_CLEAN | PG_DEVICE; + pg-flags |= PG_CLEAN | PG_DEVICE; if (prot == VM_PROT_READ) pg-flags |= PG_RDONLY; #ifdef __HAVE_VM_PAGE_MD
