CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: mrg
Date: Sun Nov 21 07:45:36 UTC 2010
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
update this for fontconfig 2.8.0. ugh.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/fontconfig/src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.5 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.6
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.5 Sat Nov 1 21:38:14 2008
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Nov 21 07:45:36 2010
@@ -1,14 +1,32 @@
-# $NetBSD: Makefile,v 1.5 2008/11/01 21:38:14 cube Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/21 07:45:36 mrg Exp $
.include bsd.own.mk
LIB= fontconfig
.PATH: ${X11SRCDIR.${LIB}}/src
-SRCS= fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
- fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c \
- fclist.c fcmatch.c fcmatrix.c fcname.c fcpat.c fcserialize.c \
- fcstr.c fcxml.c ftglue.h ftglue.c
+SRCS= fcatomic.c \
+ fcblanks.c \
+ fccache.c \
+ fccfg.c \
+ fccharset.c \
+ fcdbg.c \
+ fcdefault.c \
+ fcdir.c \
+ fcformat.c \
+ fcfreetype.c \
+ fcfs.c \
+ fcinit.c \
+ fclang.c \
+ fclist.c \
+ fcmatch.c \
+ fcmatrix.c \
+ fcname.c \
+ fcpat.c \
+ fcserialize.c \
+ fcstr.c \
+ fcxml.c \
+ ftglue.c
.PATH: ${X11SRCDIR.${LIB}}/doc
MAN= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 FcAtomicLock.3 \
@@ -98,5 +116,8 @@
# fontconfig uses VERSION and not PACKAGE_VERSION
PKGCONFIG_VERSION.fontconfig= 2.6.0
+# XXX
+CPPFLAGS.fcxml.c= -Wno-error
+
.include bsd.x11.mk
.include bsd.lib.mk
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: mrg
Date: Sun Nov 21 09:01:35 UTC 2010
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
update for pixman 0.21.2. we really need __thread, it seems.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.11 src/external/mit/xorg/lib/pixman/Makefile:1.12
--- src/external/mit/xorg/lib/pixman/Makefile:1.11 Sun May 23 04:26:19 2010
+++ src/external/mit/xorg/lib/pixman/Makefile Sun Nov 21 09:01:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/05/23 04:26:19 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2010/11/21 09:01:35 mrg Exp $
NOLINT= 1 # defined
@@ -62,6 +62,9 @@
-I${X11SRCDIR.pixman}/../combine \
-I${X11SRCDIR.pixman}/pixman
+# XXX! wants __thread
+CPPFLAGS+= -DPIXMAN_NO_TLS
+
LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm
PKGCONFIG= pixman-1
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sun Nov 21 10:11:59 UTC 2010
Modified Files:
src/sys/dev/usb [netbsd-5]: usbdevs.h usbdevs_data.h
Log Message:
Regen (accidently mssing form [pullup-5 #1407])
To generate a diff of this commit:
cvs rdiff -u -r1.515.4.6 -r1.515.4.7 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.516.4.6 -r1.516.4.7 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.6 src/sys/dev/usb/usbdevs.h:1.515.4.7
--- src/sys/dev/usb/usbdevs.h:1.515.4.6 Sat Nov 20 01:15:06 2010
+++ src/sys/dev/usb/usbdevs.h Sun Nov 21 10:11:58 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.515.4.6 2010/11/20 01:15:06 riz Exp $ */
+/* $NetBSD: usbdevs.h,v 1.515.4.7 2010/11/21 10:11:58 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.7 2010/11/21 03:05:04 riz Exp
*/
/*
@@ -688,6 +688,7 @@
#define USB_PRODUCT_APPLE_EXT_KBD 0x020c /* Apple Extended USB Keyboard */
#define USB_PRODUCT_APPLE_OPTMOUSE 0x0302 /* Optical mouse */
#define USB_PRODUCT_APPLE_MIGHTYMOUSE 0x0304 /* Mighty Mouse */
+#define USB_PRODUCT_APPLE_MAGICMOUSE 0x030d /* Magic Mouse */
#define USB_PRODUCT_APPLE_EXT_KBD_HUB 0x1003 /* Hub in Apple Extended USB Keyboard */
#define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */
#define USB_PRODUCT_APPLE_IPHONE 0x1290 /* iPhone */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.516.4.6 src/sys/dev/usb/usbdevs_data.h:1.516.4.7
--- src/sys/dev/usb/usbdevs_data.h:1.516.4.6 Sat Nov 20 01:15:07 2010
+++ src/sys/dev/usb/usbdevs_data.h Sun Nov 21 10:11:58 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.516.4.6 2010/11/20 01:15:07 riz Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.516.4.7 2010/11/21 10:11:58 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.7 2010/11/21 03:05:04 riz Exp
*/
/*
@@ -2271,6 +2271,10 @@
Mighty Mouse,
},
{
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_MAGICMOUSE,
+ Magic Mouse,
+ },
+ {
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_EXT_KBD_HUB,
Hub in Apple Extended USB Keyboard,
},
@@ -6851,4 +6855,4 @@
Prestige,
},
};
-const int usb_nproducts = 1246;
+const int usb_nproducts = 1247;
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 11:57:16 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c
Log Message:
uvm_pglistalloc(9) returns 0 on success, not # of pages.
To generate a diff of this commit:
cvs rdiff -u -r1.153.2.66 -r1.153.2.67 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.66 src/sys/uvm/uvm_page.c:1.153.2.67
--- src/sys/uvm/uvm_page.c:1.153.2.66 Sat Nov 20 07:52:30 2010
+++ src/sys/uvm/uvm_page.c Sun Nov 21 11:57:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.153.2.66 2010/11/20 07:52:30 uebayasi Exp $ */
+/* $NetBSD: uvm_page.c,v 1.153.2.67 2010/11/21 11:57:15 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.66 2010/11/20 07:52:30 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.67 2010/11/21 11:57:15 uebayasi Exp $);
#include opt_ddb.h
#include opt_uvmhist.h
@@ -2254,11 +2254,11 @@
{
struct pglist mlist;
struct vm_page *pg;
- int n;
+ int error;
- n = uvm_pglistalloc(PAGE_SIZE, 0, -1, PAGE_SIZE, PAGE_SIZE,
+ error = uvm_pglistalloc(PAGE_SIZE, 0, -1, PAGE_SIZE, PAGE_SIZE,
mlist, 1, 1);
- KASSERT(n == 1);
+ KASSERT(error == 0);
pg = TAILQ_FIRST(mlist);
KASSERT(pg != NULL);
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src Committed By: uebayasi Date: Sun Nov 21 12:02:06 UTC 2010 Modified Files: src/sys/uvm [uebayasi-xip]: uvm_vnode.c Log Message: uvm_findpage_xip: A few UVMHIST logs. To generate a diff of this commit: cvs rdiff -u -r1.93.2.5 -r1.93.2.6 src/sys/uvm/uvm_vnode.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_vnode.c diff -u src/sys/uvm/uvm_vnode.c:1.93.2.5 src/sys/uvm/uvm_vnode.c:1.93.2.6 --- src/sys/uvm/uvm_vnode.c:1.93.2.5 Sat Nov 20 08:00:53 2010 +++ src/sys/uvm/uvm_vnode.c Sun Nov 21 12:02:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_vnode.c,v 1.93.2.5 2010/11/20 08:00:53 uebayasi Exp $ */ +/* $NetBSD: uvm_vnode.c,v 1.93.2.6 2010/11/21 12:02:06 uebayasi Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_vnode.c,v 1.93.2.5 2010/11/20 08:00:53 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_vnode.c,v 1.93.2.6 2010/11/21 12:02:06 uebayasi Exp $); #include opt_uvmhist.h #include opt_xip.h @@ -420,6 +420,9 @@ struct vm_physseg *seg; struct vm_page *pg; + UVMHIST_FUNC(uvn_findpage_xip); UVMHIST_CALLED(ubchist); + UVMHIST_LOG(ubchist, called devvp=%p uobj=%p off=%lx,devvp,uobj,(long)off,0); + #if defined(XIP) #if !defined(XIP_CDEV_MMAP) KASSERT((vp-v_vflag VV_XIP) != 0); @@ -475,5 +478,7 @@ pg-flags |= PG_BUSY; + UVMHIST_LOG(ubchist, done pa=%lx seg=%p pg=%p off=%lx,(long)pa,seg,pg,(long)off); + return pg; }
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 12:14:15 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_pglist.c
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.45.2.4 -r1.45.2.5 src/sys/uvm/uvm_pglist.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_pglist.c
diff -u src/sys/uvm/uvm_pglist.c:1.45.2.4 src/sys/uvm/uvm_pglist.c:1.45.2.5
--- src/sys/uvm/uvm_pglist.c:1.45.2.4 Fri Nov 12 19:00:00 2010
+++ src/sys/uvm/uvm_pglist.c Sun Nov 21 12:14:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pglist.c,v 1.45.2.4 2010/11/12 19:00:00 uebayasi Exp $ */
+/* $NetBSD: uvm_pglist.c,v 1.45.2.5 2010/11/21 12:14:15 uebayasi Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.45.2.4 2010/11/12 19:00:00 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_pglist.c,v 1.45.2.5 2010/11/21 12:14:15 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -59,6 +59,20 @@
#define STAT_DECR(v)
#endif
+#ifdef DEBUG
+static int
+vm_physmem_index(struct vm_physseg *ps)
+{
+ int i;
+
+ for (i = 0; i vm_nphysmem; i++) {
+ if (VM_PHYSMEM_PTR(i) == ps)
+ return i;
+ }
+ return -1;
+}
+#endif
+
/*
* uvm_pglistalloc: allocate a list of pages
*
@@ -133,7 +147,7 @@
#endif
#ifdef PGALLOC_VERBOSE
printf(pgalloc: contig %d pgs from psi %ld\n, num,
- (long)(ps - vm_physmem_ptrs[0]));
+ (long)(ps - VM_PHYSMEM_PTR(0)));
#endif
KASSERT(mutex_owned(uvm_fpageqlock));
@@ -164,11 +178,11 @@
* Make sure this is a managed physical page.
*/
- if (vm_physseg_find(try, cidx) != ps - vm_physmem_ptrs[0])
+ if (vm_physseg_find(try, cidx) != vm_physmem_index(ps))
panic(pgalloc contig: botch1);
if (cidx != try - ps-start)
panic(pgalloc contig: botch2);
- if (vm_physseg_find(try + num - 1, cidx) != ps - vm_physmem_ptrs[0])
+ if (vm_physseg_find(try + num - 1, cidx) != vm_physmem_index(ps))
panic(pgalloc contig: botch3);
if (cidx != try - ps-start + num - 1)
panic(pgalloc contig: botch4);
@@ -251,7 +265,7 @@
for (psi = 0 ; psi vm_nphysmem ; psi++)
#endif
{
- ps = vm_physmem_ptrs[psi];
+ ps = VM_PHYSMEM_PTR(psi);
if (ps-free_list != fl)
continue;
@@ -292,7 +306,7 @@
#endif
#ifdef PGALLOC_VERBOSE
printf(pgalloc: simple %d pgs from psi %ld\n, num,
- (long)(ps - vm_physmem_ptrs[0]));
+ (long)(ps - VM_PHYSMEM_PTR(0)));
#endif
KASSERT(mutex_owned(uvm_fpageqlock));
@@ -303,7 +317,7 @@
for (try = max(atop(low), ps-avail_start);
try limit; try ++) {
#ifdef DEBUG
- if (vm_physseg_find(try, cidx) != ps - vm_physmem_ptrs[0])
+ if (vm_physseg_find(try, cidx) != vm_physmem_index(ps))
panic(pgalloc simple: botch1);
if (cidx != (try - ps-start))
panic(pgalloc simple: botch2);
@@ -350,7 +364,7 @@
for (psi = 0 ; psi vm_nphysmem ; psi++)
#endif
{
- ps = vm_physmem_ptrs[psi];
+ ps = VM_PHYSMEM_PTR(psi);
if (ps-free_list != fl)
continue;
CVS commit: [uebayasi-xip] src/sys
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 12:43:00 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
src/sys/uvm [uebayasi-xip]: uvm_bio.c uvm_fault.c uvm_pager.h
Log Message:
Resurrect PGO_ZERO support.
When vnode pager encounters hole pages in XIP'ed vnodes, it fills
page slots with PGO_ZERO and returns them back to the caller (fault
handler). Fault handlers are responsible to check page slots and
redirect PGO_ZERO to the single zero page allocated by calling
uvm_page_zeropage_alloc(9).
The zero page is wired, read-only (PG_RDONLY) page. It's shared
by multiple vnodes, it has no single owner.
XIP'ed vnodes are supposed to be stable during I/O (unlocked).
Because XIP'ed mounts are always read-only. There's no chance to
change mappings of XIP'ed vnodes and their XIP'ed pages. Thus the
cached uobj is reused after pgo_get() for PGO_ZERO.
(Do we need a new concept of read-only UVM object?)
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.59 -r1.36.2.60 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.68.2.12 -r1.68.2.13 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.166.2.23 -r1.166.2.24 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.38.14.1 -r1.38.14.2 src/sys/uvm/uvm_pager.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.59 src/sys/miscfs/genfs/genfs_io.c:1.36.2.60
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.59 Sun Nov 21 07:41:49 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sun Nov 21 12:42:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.59 2010/11/21 07:41:49 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.60 2010/11/21 12:42:59 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.59 2010/11/21 07:41:49 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.60 2010/11/21 12:42:59 uebayasi Exp $);
#include opt_xip.h
@@ -652,13 +652,11 @@
*/
if (blkno == (daddr_t)-1) {
- if (!xip) {
int holepages = (round_page(offset + iobytes) -
trunc_page(offset)) PAGE_SHIFT;
UVMHIST_LOG(ubchist, lbn 0x%x - HOLE, lbn,0,0,0);
- KASSERT(!xip);
-
+ if (!xip) {
sawhole = true;
memset((char *)kva + (offset - startoffset), 0,
iobytes);
@@ -673,7 +671,11 @@
}
}
} else {
- panic(XIP hole page is not supported yet);
+ for (i = 0; i holepages; i++) {
+pgs[ridx + pidx + i] = PGO_ZERO;
+ }
+ UVMHIST_LOG(ubchist, xip HOLE pgs %d .. %d,
+ pidx, pidx + holepages - 1, 0, 0);
}
continue;
}
@@ -899,6 +901,7 @@
for (i = ridx; i ridx + npages; i++) {
struct vm_page *pg = pgs[i];
+ if (pg != PGO_ZERO) {
KASSERT(pg != NULL);
KASSERT((pg-flags PG_RDONLY) != 0);
KASSERT((pg-flags PG_BUSY) != 0);
@@ -908,10 +911,18 @@
/*
* XXXUEBS
- * Actually this is not necessary, because device pages are
- * stateless, and they have no owner.
+ * Actually this is not necessary, because device
+ * pages are stateless, and they have no owner.
*/
pg-uobject = vp-v_uobj;
+ } else {
+ /*
+ * XIP hole pages are passed as a magic pointer
+ * back to fault handlers. Fault handlers are
+ * respoinsible to check it and redirect the VA to
+ * a single zero page.
+ */
+ }
}
} /* xip */
mutex_exit(uobj-vmobjlock);
Index: src/sys/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.68.2.12 src/sys/uvm/uvm_bio.c:1.68.2.13
--- src/sys/uvm/uvm_bio.c:1.68.2.12 Thu Nov 4 08:47:38 2010
+++ src/sys/uvm/uvm_bio.c Sun Nov 21 12:42:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.68.2.12 2010/11/04 08:47:38 uebayasi Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.68.2.13 2010/11/21 12:42:59 uebayasi Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.68.2.12 2010/11/04 08:47:38 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.68.2.13 2010/11/21 12:42:59 uebayasi Exp $);
#include opt_uvmhist.h
#include opt_ubc.h
@@ -224,16 +224,20 @@
static inline int
ubc_fault_page(const struct uvm_faultinfo *ufi, const struct ubc_map *umap,
-struct vm_page *pg, vm_prot_t prot, vm_prot_t access_type, vaddr_t va)
+struct uvm_object *uobj, struct vm_page *pg, vm_prot_t prot,
+vm_prot_t access_type, vaddr_t va)
{
- struct uvm_object *uobj;
vm_prot_t mask;
int error;
bool rdonly;
- uobj = pg-uobject;
+ UVMHIST_FUNC(ubc_fault_page); UVMHIST_CALLED(ubchist);
+
+ KASSERT(pg != NULL);
+ KASSERT(pg == PGO_ZERO || uobj == pg-uobject);
KASSERT(mutex_owned(uobj-vmobjlock));
+if (__predict_true(pg != PGO_ZERO)) {
if (pg-flags PG_WANTED) {
wakeup(pg);
}
@@ -264,17 +268,29 @@
pg = newpg;
}
}
+}
/*
* Note that a page whose
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 14:52:23 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Assert.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.60 -r1.36.2.61 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.60 src/sys/miscfs/genfs/genfs_io.c:1.36.2.61
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.60 Sun Nov 21 12:42:59 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sun Nov 21 14:52:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.60 2010/11/21 12:42:59 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.61 2010/11/21 14:52:23 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.60 2010/11/21 12:42:59 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.61 2010/11/21 14:52:23 uebayasi Exp $);
#include opt_xip.h
@@ -1050,6 +1050,7 @@
flags = origflags;
KASSERT((vp-v_iflag VI_ONWORKLST) != 0 ||
(vp-v_iflag VI_WRMAPDIRTY) == 0);
+ KASSERT((vp-v_vflag VV_XIP) == 0 || uobj-uo_npages == 0);
if (uobj-uo_npages == 0) {
if (vp-v_iflag VI_ONWORKLST) {
vp-v_iflag = ~VI_WRMAPDIRTY;
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 14:52:49 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_fault.c
Log Message:
UVMHIST log for XIP hole COW.
To generate a diff of this commit:
cvs rdiff -u -r1.166.2.24 -r1.166.2.25 src/sys/uvm/uvm_fault.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_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.166.2.24 src/sys/uvm/uvm_fault.c:1.166.2.25
--- src/sys/uvm/uvm_fault.c:1.166.2.24 Sun Nov 21 12:42:59 2010
+++ src/sys/uvm/uvm_fault.c Sun Nov 21 14:52:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.166.2.24 2010/11/21 12:42:59 uebayasi Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.166.2.25 2010/11/21 14:52:48 uebayasi Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_fault.c,v 1.166.2.24 2010/11/21 12:42:59 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_fault.c,v 1.166.2.25 2010/11/21 14:52:48 uebayasi Exp $);
#include opt_uvmhist.h
#include opt_xip.h
@@ -568,7 +568,7 @@
/* object-backed COW */
opg = uobjpage;
} else {
- /* ZFOD */
+ /* ZFOD or XIP hole */
opg = NULL;
}
if (opg != NULL) {
@@ -2131,8 +2131,8 @@
* uvmfault_promote().
*/
- UVMHIST_LOG(maphist, zero fill anon/page 0x%x/0%x,
- anon, pg, 0, 0);
+ UVMHIST_LOG(maphist, zero fill anon/page 0x%x/0%x%s,
+ anon, pg, (pg == PGO_ZERO) ? (xip hole) : , 0);
}
return uvm_fault_lower_enter(ufi, flt, uobj, anon, pg, uobjpage);
CVS commit: [uebayasi-xip] src/sys
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 15:00:13 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
src/sys/uvm [uebayasi-xip]: uvm_bio.c uvm_fault.c uvm_pager.h
Log Message:
Rename PGO_ZERO as PGO_HOLE, and s/uvm_page_zeropage/uvm_page_holepage/.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.61 -r1.36.2.62 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.68.2.13 -r1.68.2.14 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.166.2.25 -r1.166.2.26 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.38.14.2 -r1.38.14.3 src/sys/uvm/uvm_pager.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.36.2.61 src/sys/miscfs/genfs/genfs_io.c:1.36.2.62
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.61 Sun Nov 21 14:52:23 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sun Nov 21 15:00:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.61 2010/11/21 14:52:23 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.62 2010/11/21 15:00: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.61 2010/11/21 14:52:23 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.62 2010/11/21 15:00:12 uebayasi Exp $);
#include opt_xip.h
@@ -672,7 +672,7 @@
}
} else {
for (i = 0; i holepages; i++) {
-pgs[ridx + pidx + i] = PGO_ZERO;
+pgs[ridx + pidx + i] = PGO_HOLE;
}
UVMHIST_LOG(ubchist, xip HOLE pgs %d .. %d,
pidx, pidx + holepages - 1, 0, 0);
@@ -901,7 +901,7 @@
for (i = ridx; i ridx + npages; i++) {
struct vm_page *pg = pgs[i];
- if (pg != PGO_ZERO) {
+ if (pg != PGO_HOLE) {
KASSERT(pg != NULL);
KASSERT((pg-flags PG_RDONLY) != 0);
KASSERT((pg-flags PG_BUSY) != 0);
@@ -920,7 +920,7 @@
* XIP hole pages are passed as a magic pointer
* back to fault handlers. Fault handlers are
* respoinsible to check it and redirect the VA to
- * a single zero page.
+ * a single zero'ed hole page.
*/
}
}
Index: src/sys/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.68.2.13 src/sys/uvm/uvm_bio.c:1.68.2.14
--- src/sys/uvm/uvm_bio.c:1.68.2.13 Sun Nov 21 12:42:59 2010
+++ src/sys/uvm/uvm_bio.c Sun Nov 21 15:00:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.68.2.13 2010/11/21 12:42:59 uebayasi Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.68.2.14 2010/11/21 15:00:12 uebayasi Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.68.2.13 2010/11/21 12:42:59 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.68.2.14 2010/11/21 15:00:12 uebayasi Exp $);
#include opt_uvmhist.h
#include opt_ubc.h
@@ -234,10 +234,10 @@
UVMHIST_FUNC(ubc_fault_page); UVMHIST_CALLED(ubchist);
KASSERT(pg != NULL);
- KASSERT(pg == PGO_ZERO || uobj == pg-uobject);
+ KASSERT(pg == PGO_HOLE || uobj == pg-uobject);
KASSERT(mutex_owned(uobj-vmobjlock));
-if (__predict_true(pg != PGO_ZERO)) {
+if (__predict_true(pg != PGO_HOLE)) {
if (pg-flags PG_WANTED) {
wakeup(pg);
}
@@ -275,17 +275,17 @@
* is marked as PG_RDONLY.
*/
- KASSERT(pg == PGO_ZERO ||
+ KASSERT(pg == PGO_HOLE ||
(pg-flags PG_RDONLY) == 0 ||
(access_type VM_PROT_WRITE) == 0 ||
pg-offset umap-writeoff ||
pg-offset + PAGE_SIZE umap-writeoff + umap-writelen);
- if (__predict_false(pg == PGO_ZERO)) {
- UVMHIST_LOG(ubchist, replacing PGO_ZERO with zeropage,0,0,0,0);
- pg = uvm_page_zeropage_alloc();
+ if (__predict_false(pg == PGO_HOLE)) {
+ UVMHIST_LOG(ubchist, replacing PGO_HOLE with holepage,0,0,0,0);
+ pg = uvm_page_holepage_alloc();
UVMHIST_LOG(ubchist,
- PGO_ZERO replaced with pg %p (phys_addr=0x%lx),
+ PGO_HOLE replaced with pg %p (phys_addr=0x%lx),
pg, VM_PAGE_TO_PHYS(pg), 0, 0);
KASSERT(pg != NULL);
KASSERT((pg-flags PG_RDONLY) != 0);
@@ -299,7 +299,7 @@
error = pmap_enter(ufi-orig_map-pmap, va, VM_PAGE_TO_PHYS(pg),
prot mask, PMAP_CANFAIL | (access_type mask));
-if (__predict_true(pg != uvm_page_zeropage)) {
+if (__predict_true(pg != uvm_page_holepage)) {
if (__predict_true((pg-flags PG_DEVICE) == 0)) {
mutex_enter(uvm_pageqlock);
uvm_pageactivate(pg);
@@ -440,7 +440,7 @@
if (pg == NULL || pg == PGO_DONTCARE) {
continue;
}
- if (__predict_true(pg != PGO_ZERO)) {
+ if (__predict_true(pg != PGO_HOLE)) {
if (__predict_false(pg-uobject != uobj)) {
/* Check for the first iteration and error cases. */
if (uobj != NULL) {
@@ -457,7 +457,7 @@
mutex_enter(uobj-vmobjlock);
}
}
- KASSERT(pg == PGO_ZERO || uobj == pg-uobject);
+ KASSERT(pg == PGO_HOLE || uobj == pg-uobject);
error = ubc_fault_page(ufi, umap, uobj, pg, prot, access_type, va);
if
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 15:27:36 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c uvm_page.h
Log Message:
Rename PGO_ZERO as PGO_HOLE, and s/uvm_page_zeropage/uvm_page_holepage/.
To generate a diff of this commit:
cvs rdiff -u -r1.153.2.67 -r1.153.2.68 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.36 -r1.59.2.37 src/sys/uvm/uvm_page.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/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.67 src/sys/uvm/uvm_page.c:1.153.2.68
--- src/sys/uvm/uvm_page.c:1.153.2.67 Sun Nov 21 11:57:15 2010
+++ src/sys/uvm/uvm_page.c Sun Nov 21 15:27:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.153.2.67 2010/11/21 11:57:15 uebayasi Exp $ */
+/* $NetBSD: uvm_page.c,v 1.153.2.68 2010/11/21 15:27:36 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.67 2010/11/21 11:57:15 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_page.c,v 1.153.2.68 2010/11/21 15:27:36 uebayasi Exp $);
#include opt_ddb.h
#include opt_uvmhist.h
@@ -2235,22 +2235,22 @@
return (VM_PHYSMEM_PTR(lcv)-free_list);
}
-static int uvm_page_zeropage_init(void);
+static int uvm_page_holepage_init(void);
-struct vm_page *uvm_page_zeropage;
+struct vm_page *uvm_page_holepage;
struct vm_page *
-uvm_page_zeropage_alloc(void)
+uvm_page_holepage_alloc(void)
{
static ONCE_DECL(inited);
- (void)RUN_ONCE(inited, uvm_page_zeropage_init);
- KASSERT(uvm_page_zeropage != NULL);
- return uvm_page_zeropage;
+ (void)RUN_ONCE(inited, uvm_page_holepage_init);
+ KASSERT(uvm_page_holepage != NULL);
+ return uvm_page_holepage;
}
static int
-uvm_page_zeropage_init(void)
+uvm_page_holepage_init(void)
{
struct pglist mlist;
struct vm_page *pg;
@@ -2271,7 +2271,7 @@
uvm_pagewire(pg);
mutex_exit(uvm_pageqlock);
- uvm_page_zeropage = pg;
+ uvm_page_holepage = pg;
return 0;
}
Index: src/sys/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.59.2.36 src/sys/uvm/uvm_page.h:1.59.2.37
--- src/sys/uvm/uvm_page.h:1.59.2.36 Mon Nov 15 17:32:01 2010
+++ src/sys/uvm/uvm_page.h Sun Nov 21 15:27:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.h,v 1.59.2.36 2010/11/15 17:32:01 uebayasi Exp $ */
+/* $NetBSD: uvm_page.h,v 1.59.2.37 2010/11/21 15:27:36 uebayasi Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -311,8 +311,8 @@
int uvm_page_lookup_freelist(struct vm_page *);
-extern struct vm_page *uvm_page_zeropage;
-struct vm_page *uvm_page_zeropage_alloc(void);
+extern struct vm_page *uvm_page_holepage;
+struct vm_page *uvm_page_holepage_alloc(void);
int vm_physseg_find(paddr_t, int *);
struct vm_page *uvm_phys_to_vm_page(paddr_t);
CVS commit: src/sys/arch/dreamcast/dev/g2
Module Name:src
Committed By: tsutsui
Date: Sun Nov 21 16:11:32 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dev/g2: aica.c g2bus.c g2busvar.h gapspci.c
gapspci_pci.c gapspcivar.h
Log Message:
Split softc/device_t.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/dreamcast/dev/g2/aica.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/dreamcast/dev/g2/g2bus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/dreamcast/dev/g2/g2busvar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/dreamcast/dev/g2/gapspci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/dreamcast/dev/g2/gapspci_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/dreamcast/dev/g2/gapspcivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/dreamcast/dev/g2/aica.c
diff -u src/sys/arch/dreamcast/dev/g2/aica.c:1.19 src/sys/arch/dreamcast/dev/g2/aica.c:1.20
--- src/sys/arch/dreamcast/dev/g2/aica.c:1.19 Sat Nov 20 16:12:23 2010
+++ src/sys/arch/dreamcast/dev/g2/aica.c Sun Nov 21 16:11:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: aica.c,v 1.19 2010/11/20 16:12:23 tsutsui Exp $ */
+/* $NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $ */
/*
* Copyright (c) 2003 SHIMIZU Ryo r...@misakimix.org
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aica.c,v 1.19 2010/11/20 16:12:23 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -56,7 +56,7 @@
#define AICA_TIMEOUT 0x1800
struct aica_softc {
- struct device sc_dev; /* base device */
+ device_t sc_dev; /* base device */
bus_space_tag_t sc_memt;
bus_space_handle_t sc_aica_regh;
bus_space_handle_t sc_aica_memh;
@@ -113,11 +113,11 @@
2, AUFMT_STEREO, 0, {1, 65536}},
};
-int aica_match(struct device *, struct cfdata *, void *);
-void aica_attach(struct device *, struct device *, void *);
+int aica_match(device_t, cfdata_t, void *);
+void aica_attach(device_t, device_t, void *);
int aica_print(void *, const char *);
-CFATTACH_DECL(aica, sizeof(struct aica_softc), aica_match, aica_attach,
+CFATTACH_DECL_NEW(aica, sizeof(struct aica_softc), aica_match, aica_attach,
NULL, NULL);
const struct audio_device aica_device = {
@@ -194,7 +194,7 @@
};
int
-aica_match(struct device *parent, struct cfdata *cf, void *aux)
+aica_match(device_t parent, cfdata_t cf, void *aux)
{
static int aica_matched = 0;
@@ -206,29 +206,30 @@
}
void
-aica_attach(struct device *parent, struct device *self, void *aux)
+aica_attach(device_t parent, device_t self, void *aux)
{
struct aica_softc *sc;
struct g2bus_attach_args *ga;
int i;
- sc = (struct aica_softc *)self;
+ sc = device_private(self);
ga = aux;
+ sc-sc_dev = self;
sc-sc_memt = ga-ga_memt;
if (bus_space_map(sc-sc_memt, AICA_REG_ADDR, 0x3000, 0,
sc-sc_aica_regh) != 0) {
- printf(: can't map AICA register space\n);
+ aprint_error(: can't map AICA register space\n);
return;
}
if (bus_space_map(sc-sc_memt, AICA_RAM_START, AICA_RAM_SIZE, 0,
sc-sc_aica_memh) != 0) {
- printf(: can't map AICA memory space\n);
+ aprint_error(: can't map AICA memory space\n);
return;
}
- printf(: ARM7 Sound Processing Unit\n);
+ aprint_normal(: ARM7 Sound Processing Unit\n);
aica_disable(sc);
@@ -245,12 +246,12 @@
aica_enable(sc);
- printf(%s: interrupting at %s\n, sc-sc_dev.dv_xname,
+ aprint_normal_dev(self, interrupting at %s\n,
sysasic_intr_string(SYSASIC_IRL9));
sysasic_intr_establish(SYSASIC_EVENT_AICA, IPL_BIO, SYSASIC_IRL9,
aica_intr, sc);
- audio_attach_mi(aica_hw_if, sc, sc-sc_dev);
+ audio_attach_mi(aica_hw_if, sc, self);
/* init parameters */
sc-sc_output_master = 255;
Index: src/sys/arch/dreamcast/dev/g2/g2bus.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus.c:1.13 src/sys/arch/dreamcast/dev/g2/g2bus.c:1.14
--- src/sys/arch/dreamcast/dev/g2/g2bus.c:1.13 Mon Aug 7 17:36:53 2006
+++ src/sys/arch/dreamcast/dev/g2/g2bus.c Sun Nov 21 16:11:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: g2bus.c,v 1.13 2006/08/07 17:36:53 tsutsui Exp $ */
+/* $NetBSD: g2bus.c,v 1.14 2010/11/21 16:11:32 tsutsui Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: g2bus.c,v 1.13 2006/08/07 17:36:53 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: g2bus.c,v 1.14 2010/11/21 16:11:32 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -46,29 +46,29 @@
#include dreamcast/dev/g2/g2busvar.h
-int g2busmatch(struct device *, struct cfdata *, void *);
-void g2busattach(struct device *, struct device *, void *);
+int g2busmatch(device_t, cfdata_t, void *);
+void g2busattach(device_t, device_t, void *);
int g2busprint(void *, const char *);
-CFATTACH_DECL(g2bus, sizeof(struct g2bus_softc),
+CFATTACH_DECL_NEW(g2bus, sizeof(struct g2bus_softc),
g2busmatch, g2busattach, NULL,
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Sun Nov 21 16:19:19 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs.c
Log Message:
I can't think of any reason why a rump kernel has to allow vfsusermount
by default, nor do I remember why i originally added it in 2008
== remove.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/rump/librump/rumpvfs/rump_vfs.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/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.59 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.60
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.59 Fri Nov 19 06:44:33 2010
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Sun Nov 21 16:19:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.59 2010/11/19 06:44:33 dholland Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.60 2010/11/21 16:19:19 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.59 2010/11/19 06:44:33 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.60 2010/11/21 16:19:19 pooka Exp $);
#include sys/param.h
#include sys/buf.h
@@ -82,9 +82,6 @@
char buf[64];
int error;
int rv, i;
- extern int dovfsusermount; /* XXX */
-
- dovfsusermount = 1; /* XXX */
if (rumpuser_getenv(RUMP_NVNODES, buf, sizeof(buf), error) == 0) {
desiredvnodes = strtoul(buf, NULL, 10);
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 17:06:13 UTC 2010 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13101 Log Message: Imported openssh-5.6 Status: Vendor Tag: OPENSSH Release Tags: v56-20101121 C src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-chall.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/auth-options.c C src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c C src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c C src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth-rsa.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h C src/crypto/external/bsd/openssh/dist/auth1.c U src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/auth2-gss.c C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c U src/crypto/external/bsd/openssh/dist/auth2-jpake.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c C src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c C src/crypto/external/bsd/openssh/dist/authfd.c C src/crypto/external/bsd/openssh/dist/authfd.h C src/crypto/external/bsd/openssh/dist/authfile.c C src/crypto/external/bsd/openssh/dist/authfile.h C src/crypto/external/bsd/openssh/dist/bufaux.c U src/crypto/external/bsd/openssh/dist/bufbn.c C src/crypto/external/bsd/openssh/dist/buffer.c C src/crypto/external/bsd/openssh/dist/buffer.h C src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/channels.c C src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/cipher-3des1.c U src/crypto/external/bsd/openssh/dist/cipher-bf1.c U src/crypto/external/bsd/openssh/dist/cipher-ctr.c U src/crypto/external/bsd/openssh/dist/cipher.c U src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c C src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/compress.c U src/crypto/external/bsd/openssh/dist/compress.h U src/crypto/external/bsd/openssh/dist/crc32.c U src/crypto/external/bsd/openssh/dist/crc32.h U src/crypto/external/bsd/openssh/dist/deattack.c U src/crypto/external/bsd/openssh/dist/deattack.h C src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h C src/crypto/external/bsd/openssh/dist/dns.c C src/crypto/external/bsd/openssh/dist/dns.h U src/crypto/external/bsd/openssh/dist/fatal.c U src/crypto/external/bsd/openssh/dist/groupaccess.c U src/crypto/external/bsd/openssh/dist/groupaccess.h U src/crypto/external/bsd/openssh/dist/gss-genr.c U src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c U src/crypto/external/bsd/openssh/dist/gss-serv.c C src/crypto/external/bsd/openssh/dist/hostfile.c C src/crypto/external/bsd/openssh/dist/hostfile.h C src/crypto/external/bsd/openssh/dist/jpake.c U src/crypto/external/bsd/openssh/dist/jpake.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h U src/crypto/external/bsd/openssh/dist/kexdh.c U src/crypto/external/bsd/openssh/dist/kexdhc.c C src/crypto/external/bsd/openssh/dist/kexdhs.c U src/crypto/external/bsd/openssh/dist/kexgex.c U src/crypto/external/bsd/openssh/dist/kexgexc.c C src/crypto/external/bsd/openssh/dist/kexgexs.c C src/crypto/external/bsd/openssh/dist/key.c C src/crypto/external/bsd/openssh/dist/key.h U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/log.c U src/crypto/external/bsd/openssh/dist/log.h U src/crypto/external/bsd/openssh/dist/mac.c U src/crypto/external/bsd/openssh/dist/mac.h U src/crypto/external/bsd/openssh/dist/match.c C src/crypto/external/bsd/openssh/dist/match.h C src/crypto/external/bsd/openssh/dist/misc.c C src/crypto/external/bsd/openssh/dist/misc.h U src/crypto/external/bsd/openssh/dist/moduli.c C src/crypto/external/bsd/openssh/dist/monitor.c U src/crypto/external/bsd/openssh/dist/monitor.h C src/crypto/external/bsd/openssh/dist/monitor_fdpass.c U src/crypto/external/bsd/openssh/dist/monitor_fdpass.h U src/crypto/external/bsd/openssh/dist/monitor_mm.c U src/crypto/external/bsd/openssh/dist/monitor_mm.h C src/crypto/external/bsd/openssh/dist
CVS commit: [netbsd-5] src/bin/date
Module Name:src
Committed By: riz
Date: Sun Nov 21 17:26:36 UTC 2010
Modified Files:
src/bin/date [netbsd-5]: date.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1411):
bin/date/date.c: revision 1.53
Don't blow up on date +''. Patch from Robert Elz in followup to PR 39392.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.4.1 src/bin/date/date.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/date/date.c
diff -u src/bin/date/date.c:1.52 src/bin/date/date.c:1.52.4.1
--- src/bin/date/date.c:1.52 Sun Jul 20 00:52:39 2008
+++ src/bin/date/date.c Sun Nov 21 17:26:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: date.c,v 1.52 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: date.c,v 1.52.4.1 2010/11/21 17:26:36 riz Exp $ */
/*
* Copyright (c) 1985, 1987, 1988, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = @(#)date.c 8.2 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: date.c,v 1.52 2008/07/20 00:52:39 lukem Exp $);
+__RCSID($NetBSD: date.c,v 1.52.4.1 2010/11/21 17:26:36 riz Exp $);
#endif
#endif /* not lint */
@@ -118,11 +118,11 @@
if (!rflag time(tval) == -1)
err(EXIT_FAILURE, time);
- format = %a %b %e %H:%M:%S %Z %Y;
+ format = +%a %b %e %H:%M:%S %Z %Y;
/* allow the operands in any order */
if (*argv **argv == '+') {
- format = *argv + 1;
+ format = *argv;
++argv;
}
@@ -132,14 +132,14 @@
}
if (*argv **argv == '+')
- format = *argv + 1;
+ format = *argv;
if ((buf = malloc(bufsiz = 1024)) == NULL)
goto bad;
while (strftime(buf, bufsiz, format, localtime(tval)) == 0)
if ((buf = realloc(buf, bufsiz = 1)) == NULL)
goto bad;
- (void)printf(%s\n, buf);
+ (void)printf(%s\n, buf+1);
free(buf);
return 0;
bad:
CVS commit: [netbsd-5] src
Module Name:src
Committed By: riz
Date: Sun Nov 21 17:32:53 UTC 2010
Modified Files:
src/lib/libpam [netbsd-5]: Makefile
src/lib/libpam/modules [netbsd-5]: mod.mk
src/share/mk [netbsd-5]: bsd.own.mk
Added Files:
src/lib/libpam/staticmodules [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by christos in ticket #1414):
lib/libpam/Makefile: revision 1.3
share/mk/bsd.own.mk: revision 1.612
lib/libpam/modules/mod.mk: revision 1.8
lib/libpam/modules/mod.mk: revision 1.9
lib/libpam/staticmodules/Makefile: revision 1.1
make the dependency to libpam, explicit. Fixes afpd in pkgsrc. From Mark Davies
XXX: Should be pulled up to 4.x and 5.x.
Build the modules in two phases:
1. build the static modules first, before libpam so that the static
libpam can link against the module .a files.
2. build the modules after the dynamic libpam is build, so that the
dynamic modules can link against the dynamic libpam.
enable MAKEDIRTARGET to be called with a separate environment,
called $MAKEDIRTARGETENV, defaulting to nothing.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.32.1 src/lib/libpam/Makefile
cvs rdiff -u -r1.6 -r1.6.2.1 src/lib/libpam/modules/mod.mk
cvs rdiff -u -r0 -r1.1.2.2 src/lib/libpam/staticmodules/Makefile
cvs rdiff -u -r1.542.2.11 -r1.542.2.12 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/Makefile
diff -u src/lib/libpam/Makefile:1.2 src/lib/libpam/Makefile:1.2.32.1
--- src/lib/libpam/Makefile:1.2 Sun Dec 12 08:18:42 2004
+++ src/lib/libpam/Makefile Sun Nov 21 17:32:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:42 christos Exp $
+# $NetBSD: Makefile,v 1.2.32.1 2010/11/21 17:32:52 riz Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -27,6 +27,6 @@
# The modules must be built first, because they are built into the
# static version of libpam.
-SUBDIR= modules .WAIT libpam
+SUBDIR= staticmodules .WAIT libpam .WAIT modules
.include bsd.subdir.mk
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.6 src/lib/libpam/modules/mod.mk:1.6.2.1
--- src/lib/libpam/modules/mod.mk:1.6 Mon Oct 27 07:48:27 2008
+++ src/lib/libpam/modules/mod.mk Sun Nov 21 17:32:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.6 2008/10/27 07:48:27 mrg Exp $
+# $NetBSD: mod.mk,v 1.6.2.1 2010/11/21 17:32:52 riz Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -16,6 +16,7 @@
WARNS=3
.if ${MKPIC} != no
+LIBDPLIBS+= pam ${.CURDIR}/../../libpam
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.542.2.11 src/share/mk/bsd.own.mk:1.542.2.12
--- src/share/mk/bsd.own.mk:1.542.2.11 Tue Oct 20 01:28:59 2009
+++ src/share/mk/bsd.own.mk Sun Nov 21 17:32:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.542.2.11 2009/10/20 01:28:59 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.542.2.12 2010/11/21 17:32:52 riz Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -888,8 +888,9 @@
#
# MAKEDIRTARGET dir target [extra make(1) params]
-# run cd $${dir} ${MAKE} [params] $${target}, with a pretty message
+# run cd $${dir} ${MAKEDIRTARGETENV} ${MAKE} [params] $${target}, with a pretty message
#
+MAKEDIRTARGETENV?=
MAKEDIRTARGET=\
@_makedirtarget() { \
dir=$$1; shift; \
@@ -905,7 +906,7 @@
show=$${this:-.}; \
echo $${target} === $${show%/}$${1:+ (with: $$@)}; \
cd $${real} \
- ${MAKE} _THISDIR_=$${this} $$@ $${target}; \
+ ${MAKEDIRTARGETENV} ${MAKE} _THISDIR_=$${this} $$@ $${target}; \
}; \
_makedirtarget
Added files:
Index: src/lib/libpam/staticmodules/Makefile
diff -u /dev/null src/lib/libpam/staticmodules/Makefile:1.1.2.2
--- /dev/null Sun Nov 21 17:32:53 2010
+++ src/lib/libpam/staticmodules/Makefile Sun Nov 21 17:32:53 2010
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1.2.2 2010/11/21 17:32:53 riz Exp $
+
+MAKEDIRTARGETENV=MKPIC=no
+.include bsd.own.mk
+
+SUBDIR=${.CURDIR}/../modules
+
+.include bsd.subdir.mk
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Nov 21 17:34:11 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c rump.c
rumpkern.ifspec
Log Message:
Realize the 1yo comment above rump_reboot and retire them to make
room for sys_reboot.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.146 -r1.147 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.202 -r1.203 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/rumpkern.ifspec
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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.98 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.99
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.98 Wed Oct 27 20:37:11 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Nov 21 17:34:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.98 2010/10/27 20:37:11 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.99 2010/11/21 17:34:11 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -68,6 +68,7 @@
kern_tc.c \
kern_timeout.c \
kern_uidinfo.c \
+ kern_xxx.c \
param.c \
subr_devsw.c \
subr_callback.c \
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.146 src/sys/rump/librump/rumpkern/emul.c:1.147
--- src/sys/rump/librump/rumpkern/emul.c:1.146 Fri Oct 15 15:55:53 2010
+++ src/sys/rump/librump/rumpkern/emul.c Sun Nov 21 17:34:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.146 2010/10/15 15:55:53 tsutsui Exp $ */
+/* $NetBSD: emul.c,v 1.147 2010/11/21 17:34:11 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.146 2010/10/15 15:55:53 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.147 2010/11/21 17:34:11 pooka Exp $);
#include sys/param.h
#include sys/null.h
@@ -263,16 +263,6 @@
/* done */
}
-void
-cpu_reboot(int howto, char *bootstr)
-{
-
- rump_reboot(howto);
-
- /* this function is __dead, we must exit */
- rumpuser_exit(0);
-}
-
#ifdef __HAVE_SYSCALL_INTERN
void
syscall_intern(struct proc *p)
@@ -289,3 +279,17 @@
/* I'll think about the implementation if this is ever used */
panic(not implemented);
}
+
+int
+trace_enter(register_t code, const register_t *args, int narg)
+{
+
+ return 0;
+}
+
+void
+trace_exit(register_t code, register_t rval[], int error)
+{
+
+ /* nada */
+}
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.202 src/sys/rump/librump/rumpkern/rump.c:1.203
--- src/sys/rump/librump/rumpkern/rump.c:1.202 Fri Nov 19 17:11:20 2010
+++ src/sys/rump/librump/rumpkern/rump.c Sun Nov 21 17:34:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.202 2010/11/19 17:11:20 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.203 2010/11/21 17:34:11 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.202 2010/11/19 17:11:20 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.203 2010/11/21 17:34:11 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -439,9 +439,8 @@
return 0;
}
-/* maybe support sys_reboot some day for remote shutdown */
void
-rump_reboot(int howto)
+cpu_reboot(int howto, char *bootstr)
{
/* dump means we really take the dive here */
@@ -457,6 +456,7 @@
/* your wish is my command */
if (howto RB_HALT) {
+ printf(rump kernel halted\n);
for (;;) {
uint64_t sec = 5, nsec = 0;
int error;
@@ -464,7 +464,9 @@
rumpuser_nanosleep(sec, nsec, error);
}
}
- rump_inited = -1;
+
+ /* this function is __dead, we must exit */
+ rumpuser_exit(0);
}
struct uio *
Index: src/sys/rump/librump/rumpkern/rumpkern.ifspec
diff -u src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.8 src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.9
--- src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.8 Wed Nov 17 21:49:52 2010
+++ src/sys/rump/librump/rumpkern/rumpkern.ifspec Sun Nov 21 17:34:11 2010
@@ -1,4 +1,4 @@
-; $NetBSD: rumpkern.ifspec,v 1.8 2010/11/17 21:49:52 pooka Exp $
+; $NetBSD: rumpkern.ifspec,v 1.9 2010/11/21 17:34:11 pooka Exp $
NAME|kern
PUBHDR|include/rump/rumpkern_if_pub.h
@@ -8,7 +8,6 @@
; type | name | args
;
-void |reboot |int
int |getversion |void
int |module_init |const struct modinfo * const *, size_t
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Sun Nov 21 17:35:20 UTC 2010
Modified Files:
src/sys/rump/include/rump: rumpkern_if_pub.h
src/sys/rump/librump/rumpkern: rumpkern_if_priv.h
rumpkern_if_wrappers.c
Log Message:
regen: rump_reboot is gone
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/include/rump/rumpkern_if_pub.h
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \
src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.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/rumpkern_if_pub.h
diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.11 src/sys/rump/include/rump/rumpkern_if_pub.h:1.12
--- src/sys/rump/include/rump/rumpkern_if_pub.h:1.11 Wed Nov 17 21:50:34 2010
+++ src/sys/rump/include/rump/rumpkern_if_pub.h Sun Nov 21 17:35:19 2010
@@ -1,12 +1,11 @@
-/* $NetBSD: rumpkern_if_pub.h,v 1.11 2010/11/17 21:50:34 pooka Exp $ */
+/* $NetBSD: rumpkern_if_pub.h,v 1.12 2010/11/21 17:35:19 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.8 2010/11/17 21:49:52 pooka Exp
+ * from: NetBSD: rumpkern.ifspec,v 1.9 2010/11/21 17:34:11 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp
*/
-void rump_pub_reboot(int);
int rump_pub_getversion(void);
int rump_pub_module_init(const struct modinfo * const *, size_t);
int rump_pub_module_fini(const struct modinfo *);
Index: src/sys/rump/librump/rumpkern/rumpkern_if_priv.h
diff -u src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.10 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.11
--- src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.10 Wed Nov 17 21:50:34 2010
+++ src/sys/rump/librump/rumpkern/rumpkern_if_priv.h Sun Nov 21 17:35:20 2010
@@ -1,12 +1,11 @@
-/* $NetBSD: rumpkern_if_priv.h,v 1.10 2010/11/17 21:50:34 pooka Exp $ */
+/* $NetBSD: rumpkern_if_priv.h,v 1.11 2010/11/21 17:35:20 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.8 2010/11/17 21:49:52 pooka Exp
+ * from: NetBSD: rumpkern.ifspec,v 1.9 2010/11/21 17:34:11 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp
*/
-void rump_reboot(int);
int rump_getversion(void);
int rump_module_init(const struct modinfo * const *, size_t);
int rump_module_fini(const struct modinfo *);
Index: src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
diff -u src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.10 src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.11
--- src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.10 Wed Nov 17 21:50:34 2010
+++ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c Sun Nov 21 17:35:20 2010
@@ -1,8 +1,8 @@
-/* $NetBSD: rumpkern_if_wrappers.c,v 1.10 2010/11/17 21:50:34 pooka Exp $ */
+/* $NetBSD: rumpkern_if_wrappers.c,v 1.11 2010/11/21 17:35:20 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.8 2010/11/17 21:49:52 pooka Exp
+ * from: NetBSD: rumpkern.ifspec,v 1.9 2010/11/21 17:34:11 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp
*/
@@ -23,15 +23,6 @@
panic(kern interface unavailable);
}
-void
-rump_pub_reboot(int arg1)
-{
-
- rump_schedule();
- rump_reboot(arg1);
- rump_unschedule();
-}
-
int
rump_pub_getversion(void)
{
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 17:44:16 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1411, 1414, 1415, 1419 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 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.12 src/doc/CHANGES-5.2:1.1.2.13 --- src/doc/CHANGES-5.2:1.1.2.12 Sun Nov 21 03:06:55 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 17:44:15 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.12 2010/11/21 03:06:55 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.13 2010/11/21 17:44:15 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -289,3 +289,28 @@ Add Apple Magic Mouse driver btmagic(4). [plunky, ticket #1407] +bin/date/date.c 1.53 + + Don't blow up on date +''. From Robert Elz in followup to PR 39392. + [dholland, ticket #1411] + +lib/libpam/Makefile1.3 +lib/libpam/modules/mod.mk 1.8-9 +lib/libpam/staticmodules/Makefile 1.1 +share/mk/bsd.own.mk1.612 + + Make the dependency to libpam explicit. Fixes afpd in pkgsrc. + [christos, ticket #1414] + +sys/kern/sys_lwp.c1.50 + + Follow the correct locking protocol when creating an LWP and the + process is stopping. + [skrll, ticket #1415] + +sys/arch/amd64/conf/XEN3_DOM0 1.55 +sys/arch/i386/conf/XEN2_DOM0 patch + + Sync DKWEDGE options with GENERIC + [bouyer, ticket #1419] +
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: riz
Date: Sun Nov 21 17:36:45 UTC 2010
Modified Files:
src/sys/kern [netbsd-5]: sys_lwp.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1415):
sys/kern/sys_lwp.c: revision 1.50
Follow the correct locking protocol when creating an LWP and the process
is stopping.
Problem found by running the gdb testsuite (gdb didn't have pthreads
support)
Thanks to rmind for help with this.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.4.1 src/sys/kern/sys_lwp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_lwp.c
diff -u src/sys/kern/sys_lwp.c:1.43 src/sys/kern/sys_lwp.c:1.43.4.1
--- src/sys/kern/sys_lwp.c:1.43 Thu Oct 16 08:47:07 2008
+++ src/sys/kern/sys_lwp.c Sun Nov 21 17:36:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_lwp.c,v 1.43 2008/10/16 08:47:07 ad Exp $ */
+/* $NetBSD: sys_lwp.c,v 1.43.4.1 2010/11/21 17:36:45 riz Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_lwp.c,v 1.43 2008/10/16 08:47:07 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_lwp.c,v 1.43.4.1 2010/11/21 17:36:45 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -81,6 +81,7 @@
} */
struct proc *p = l-l_proc;
struct lwp *l2;
+ struct schedstate_percpu *spc;
vaddr_t uaddr;
bool inmem;
ucontext_t *newuc;
@@ -134,20 +135,23 @@
*/
mutex_enter(p-p_lock);
lwp_lock(l2);
+ spc = l2-l_cpu-ci_schedstate;
if ((SCARG(uap, flags) LWP_SUSPENDED) == 0
(l-l_flag (LW_WREBOOT | LW_WSUSPEND | LW_WEXIT)) == 0) {
- if (p-p_stat == SSTOP || (p-p_sflag PS_STOPPING) != 0)
+ if (p-p_stat == SSTOP || (p-p_sflag PS_STOPPING) != 0) {
+ KASSERT(l2-l_wchan == NULL);
l2-l_stat = LSSTOP;
- else {
- KASSERT(lwp_locked(l2, l2-l_cpu-ci_schedstate.spc_mutex));
+ lwp_unlock_to(l2, spc-spc_lwplock);
+ } else {
+ KASSERT(lwp_locked(l2, spc-spc_mutex));
p-p_nrlwps++;
l2-l_stat = LSRUN;
sched_enqueue(l2, false);
+ lwp_unlock(l2);
}
- lwp_unlock(l2);
} else {
l2-l_stat = LSSUSPENDED;
- lwp_unlock_to(l2, l2-l_cpu-ci_schedstate.spc_lwplock);
+ lwp_unlock_to(l2, spc-spc_lwplock);
}
mutex_exit(p-p_lock);
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Sun Nov 21 17:57:25 UTC 2010 Modified Files: src/sys/kern: kern_xxx.c Log Message: _KERNEL_OPT To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/kern/kern_xxx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_xxx.c diff -u src/sys/kern/kern_xxx.c:1.70 src/sys/kern/kern_xxx.c:1.71 --- src/sys/kern/kern_xxx.c:1.70 Fri Apr 25 11:23:42 2008 +++ src/sys/kern/kern_xxx.c Sun Nov 21 17:57:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_xxx.c,v 1.70 2008/04/25 11:23:42 ad Exp $ */ +/* $NetBSD: kern_xxx.c,v 1.71 2010/11/21 17:57:24 pooka Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -32,9 +32,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_xxx.c,v 1.70 2008/04/25 11:23:42 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_xxx.c,v 1.71 2010/11/21 17:57:24 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_syscall_debug.h +#endif #include sys/param.h #include sys/systm.h
CVS commit: [netbsd-5] src/sys/uvm
Module Name:src
Committed By: riz
Date: Sun Nov 21 18:09:00 UTC 2010
Modified Files:
src/sys/uvm [netbsd-5]: uvm_bio.c uvm_fault.c uvm_map.c uvm_pager.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1421):
sys/uvm/uvm_bio.c: revision 1.70
sys/uvm/uvm_map.c: revision 1.292
sys/uvm/uvm_pager.c: revision 1.98
sys/uvm/uvm_fault.c: revision 1.175
sys/uvm/uvm_bio.c: revision 1.69
ubc_fault: split-off code part handling a single page into ubc_fault_page().
Keep the lock around pmap_update() where required. While fixing this
in ubc_fault(), rework logic to quot;rememberquot; the last object of page and
reduce locking overhead, since in common case pages belong to one and
the same UVM object (but not always, therefore add a comment).
Unlocks before pmap_update(), on removal of mappings, might cause TLB
coherency issues, since on architectures like x86 and mips64 invalidation
IPIs are deferred to pmap_update(). Hence, VA space might be globally
visible before IPIs are sent or while they are still in-flight.
OK a...@.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.65.10.1 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.125.6.1 -r1.125.6.2 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.263.4.3 -r1.263.4.4 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.92 -r1.92.14.1 src/sys/uvm/uvm_pager.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_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.65 src/sys/uvm/uvm_bio.c:1.65.10.1
--- src/sys/uvm/uvm_bio.c:1.65 Mon May 5 17:11:17 2008
+++ src/sys/uvm/uvm_bio.c Sun Nov 21 18:09:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.65 2008/05/05 17:11:17 ad Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.65.10.1 2010/11/21 18:09:00 riz Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.65 2008/05/05 17:11:17 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.65.10.1 2010/11/21 18:09:00 riz Exp $);
#include opt_uvmhist.h
#include opt_ubc.h
@@ -215,6 +215,82 @@
}
/*
+ * ubc_fault_page: helper of ubc_fault to handle a single page.
+ *
+ * = Caller has UVM object locked.
+ */
+
+static inline int
+ubc_fault_page(const struct uvm_faultinfo *ufi, const struct ubc_map *umap,
+struct vm_page *pg, vm_prot_t prot, vm_prot_t access_type, vaddr_t va)
+{
+ struct uvm_object *uobj;
+ vm_prot_t mask;
+ int error;
+ bool rdonly;
+
+ uobj = pg-uobject;
+ KASSERT(mutex_owned(uobj-vmobjlock));
+
+ if (pg-flags PG_WANTED) {
+ wakeup(pg);
+ }
+ KASSERT((pg-flags PG_FAKE) == 0);
+ if (pg-flags PG_RELEASED) {
+ mutex_enter(uvm_pageqlock);
+ uvm_pagefree(pg);
+ mutex_exit(uvm_pageqlock);
+ return 0;
+ }
+ if (pg-loan_count != 0) {
+
+ /*
+ * Avoid unneeded loan break, if possible.
+ */
+
+ if ((access_type VM_PROT_WRITE) == 0) {
+ prot = ~VM_PROT_WRITE;
+ }
+ if (prot VM_PROT_WRITE) {
+ struct vm_page *newpg;
+
+ newpg = uvm_loanbreak(pg);
+ if (newpg == NULL) {
+uvm_page_unbusy(pg, 1);
+return ENOMEM;
+ }
+ pg = newpg;
+ }
+ }
+
+ /*
+ * Note that a page whose backing store is partially allocated
+ * is marked as PG_RDONLY.
+ */
+
+ KASSERT((pg-flags PG_RDONLY) == 0 ||
+ (access_type VM_PROT_WRITE) == 0 ||
+ pg-offset umap-writeoff ||
+ pg-offset + PAGE_SIZE umap-writeoff + umap-writelen);
+
+ rdonly = ((access_type VM_PROT_WRITE) == 0
+ (pg-flags PG_RDONLY) != 0) ||
+ UVM_OBJ_NEEDS_WRITEFAULT(uobj);
+ mask = rdonly ? ~VM_PROT_WRITE : VM_PROT_ALL;
+
+ error = pmap_enter(ufi-orig_map-pmap, va, VM_PAGE_TO_PHYS(pg),
+ prot mask, PMAP_CANFAIL | (access_type mask));
+
+ mutex_enter(uvm_pageqlock);
+ uvm_pageactivate(pg);
+ mutex_exit(uvm_pageqlock);
+ pg-flags = ~(PG_BUSY|PG_WANTED);
+ UVM_PAGE_OWN(pg, NULL);
+
+ return error;
+}
+
+/*
* ubc_fault: fault routine for ubc mapping
*/
@@ -225,10 +301,11 @@
struct uvm_object *uobj;
struct ubc_map *umap;
vaddr_t va, eva, ubc_offset, slot_offset;
+ struct vm_page *pgs[ubc_winsize PAGE_SHIFT];
int i, error, npages;
- struct vm_page *pgs[ubc_winsize PAGE_SHIFT], *pg;
vm_prot_t prot;
- UVMHIST_FUNC(ubc_fault); UVMHIST_CALLED(ubchist);
+
+ UVMHIST_FUNC(ubc_fault); UVMHIST_CALLED(ubchist);
/*
* no need to try with PGO_LOCKED...
@@ -299,106 +376,75 @@
0);
if (error == EAGAIN) {
- kpause(ubc_fault, false, hz, NULL);
+ kpause(ubc_fault, false, hz 2, NULL);
goto again;
}
if (error) {
return error;
}
+ /*
+ * For virtually-indexed, virtually-tagged caches we should avoid
+ * creating writable mappings when we do not absolutely need them,
+ * since the compatible alias trick does not work on such caches.
+ * Otherwise, we can always map the pages writable.
+ */
+
+#ifdef PMAP_CACHE_VIVT
+ prot = VM_PROT_READ | access_type;
+#else
+ prot = VM_PROT_READ | VM_PROT_WRITE;
+#endif
+
CVS commit: src/sys/arch/dreamcast/dreamcast
Module Name:src
Committed By: tsutsui
Date: Sun Nov 21 17:59:36 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dreamcast: mainbus.c
Log Message:
Use CFATTACH_DECL_NEW() (no softc).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/dreamcast/dreamcast/mainbus.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/dreamcast/dreamcast/mainbus.c
diff -u src/sys/arch/dreamcast/dreamcast/mainbus.c:1.9 src/sys/arch/dreamcast/dreamcast/mainbus.c:1.10
--- src/sys/arch/dreamcast/dreamcast/mainbus.c:1.9 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/dreamcast/dreamcast/mainbus.c Sun Nov 21 17:59:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.9 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: mainbus.c,v 1.10 2010/11/21 17:59:36 tsutsui Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,15 +27,15 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.9 2008/04/28 20:23:16 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.10 2010/11/21 17:59:36 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/device.h
#include machine/autoconf.h
-int mainbus_match(struct device *, struct cfdata *, void *);
-void mainbus_attach(struct device *, struct device *, void *);
+int mainbus_match(device_t, cfdata_t, void *);
+void mainbus_attach(device_t, device_t, void *);
int mainbus_print(void *, const char *);
struct mainbus_attach_args mainbusdevs[] = {
@@ -44,22 +44,22 @@
{ NULL } /* terminator */
};
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
mainbus_match, mainbus_attach, NULL, NULL);
int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
{
return 1;
}
void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
{
struct mainbus_attach_args *ma;
- printf(\n);
+ aprint_normal(\n);
for (ma = mainbusdevs; ma-ma_name != NULL; ma++)
config_found(self, ma, mainbus_print);
CVS commit: [netbsd-5] src/external/bsd/top/dist
Module Name:src
Committed By: riz
Date: Sun Nov 21 18:12:25 UTC 2010
Modified Files:
src/external/bsd/top/dist [netbsd-5]: display.c
Log Message:
Pull up following revision(s) (requested by is in ticket #1422):
external/bsd/top/dist/display.c: revision 1.8
Avoid steps and other artefacts in head for more than 9 CPUs.
To generate a diff of this commit:
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/external/bsd/top/dist/display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/top/dist/display.c
diff -u src/external/bsd/top/dist/display.c:1.3.8.1 src/external/bsd/top/dist/display.c:1.3.8.2
--- src/external/bsd/top/dist/display.c:1.3.8.1 Mon Mar 2 20:11:27 2009
+++ src/external/bsd/top/dist/display.c Sun Nov 21 18:12:24 2010
@@ -849,7 +849,8 @@
*ip++ = cpustate_total_length;
if ((i = strlen(*pp++)) 0)
{
- cpustate_total_length += i + 8;
+ cpustate_total_length += i + 7;
+ /* strlen( 100% ) is 6, strlen( 99.9% ) is 7. Never 8. */
}
}
}
@@ -1146,28 +1147,29 @@
{
register char *use;
+unsigned width, u;
static char fmttag[100];
-char *short_tag = ncpu 1 multi ? CPU%d: : CPU: ;
-char *long_tag = ncpu 1 multi ? CPU%d states: : CPU states: ;
+char *short_tag = !multi || ncpu = 1 ? CPU: : CPU%0*d;
+char *long_tag = !multi || ncpu = 1 ? CPU states: : CPU%0*d states: ;
-/* if length + strlen(long_tag) = screen_width, then we have to
- use the shorter tag (we subtract 2 to account for : ) */
-if (cpustate_total_length + (int)strlen(long_tag) - 2 - ((ncpu 1) ? 1 : 0)
- = screen_width)
-{
- use = short_tag;
-}
-else
-{
- use = long_tag;
+for (width=0, u=ncpu; u0; u /= 10) {
+ ++width;
}
-snprintf(fmttag, sizeof(fmttag), use, c);
+/* if length + strlen(long_tag) screen_width, then we have to
+ use the shorter tag */
+
+snprintf(fmttag, sizeof(fmttag), long_tag, width, c);
+
+if (cpustate_total_length + strlen(fmttag) screen_width) {
+ snprintf(fmttag, sizeof(fmttag), short_tag, width, c);
+}
/* set x_cpustates accordingly then return result */
x_cpustates = strlen(fmttag);
+
return(fmttag);
}
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 17:07:38 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Put back XIP putpages, but slightly modifed to be called from the
generic putpages, and to call pgo_get() than a specific function.
Without this, UVM went mad after unmount (vinval, etc.).
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.62 -r1.36.2.63 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.62 src/sys/miscfs/genfs/genfs_io.c:1.36.2.63
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.62 Sun Nov 21 15:00:12 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sun Nov 21 17:07:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.62 2010/11/21 15:00:12 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.63 2010/11/21 17:07:38 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.62 2010/11/21 15:00:12 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.63 2010/11/21 17:07:38 uebayasi Exp $);
#include opt_xip.h
@@ -993,6 +993,12 @@
* range by an estimate of the relatively higher cost of the hash lookup.
*/
+#ifdef XIP
+static int
+genfs_do_putpages_xip_free(struct vnode *vp, off_t startoff, off_t endoff,
+int origflags);
+#endif
+
int
genfs_putpages(void *v)
{
@@ -1062,6 +1068,15 @@
WAPBL_END(vp-v_mount);
fstrans_done(vp-v_mount);
}
+#ifdef XIP
+ if ((vp-v_vflag VV_XIP) != 0) {
+ if (flags PGO_FREE) {
+error = genfs_do_putpages_xip_free(vp,
+startoff, endoff, origflags);
+KASSERT(error == 0);
+ }
+ }
+#endif
mutex_exit(slock);
return (0);
}
@@ -1469,6 +1484,83 @@
return (error);
}
+#ifdef XIP
+static int
+genfs_do_putpages_xip_free(struct vnode *vp, off_t startoff, off_t endoff,
+int origflags)
+{
+ struct uvm_object * const uobj = vp-v_uobj;
+
+ KASSERT(uobj-uo_npages == 0);
+
+ /*
+ * For PGO_FREE (or (PGO_CLEANIT | PGO_FREE)), we invalidate MMU
+ * mappings of both XIP pages and XIP zero pages.
+ *
+ * Hole page is freed when one of its mapped offset is freed, even if
+ * one file (vnode) has many holes and mapping its zero page to all
+ * of those hole pages.
+ *
+ * We don't know which pages are currently mapped in the given vnode,
+ * because XIP pages are not added to vnode. What we can do is to
+ * locate pages by querying the filesystem as done in getpages. Call
+ * genfs_do_getpages_xip_io().
+ */
+
+ off_t off, eof;
+
+ off = trunc_page(startoff);
+ if (endoff == 0 || (origflags PGO_ALLPAGES))
+ GOP_SIZE(vp, vp-v_size, eof, GOP_SIZE_MEM);
+ else
+ eof = endoff;
+
+ while (off eof) {
+ int npages, orignpages, error, i;
+ struct vm_page *pgs[maxpages], *pg;
+
+ npages = round_page(eof - off) PAGE_SHIFT;
+ if (npages maxpages)
+ npages = maxpages;
+
+ orignpages = npages;
+ KASSERT(mutex_owned(uobj-vmobjlock));
+ error = (*uobj-pgops-pgo_get)(uobj, off, pgs, npages, 0,
+ VM_PROT_ALL, 0, PGO_SYNCIO);
+ KASSERT(error == 0);
+ KASSERT(npages == orignpages);
+ mutex_enter(uobj-vmobjlock);
+ for (i = 0; i npages; i++) {
+ pg = pgs[i];
+ if (pg == NULL || pg == PGO_DONTCARE)
+continue;
+ if (pg == PGO_HOLE) {
+pg = uvm_page_holepage;
+KASSERT(pg != NULL);
+/*
+ * XXXUEBS
+ * Invalidating hole pages may be unnecessary,
+ * but just for safety.
+ */
+ } else {
+/*
+ * Freeing normal XIP pages; nothing to do.
+ */
+KASSERT((pg-flags PG_RDONLY) != 0);
+KASSERT((pg-flags PG_CLEAN) != 0);
+KASSERT((pg-flags PG_FAKE) == 0);
+KASSERT((pg-flags PG_DEVICE) != 0);
+pg-flags = ~PG_BUSY;
+ }
+ pmap_page_protect(pg, VM_PROT_NONE);
+ }
+ off += npages PAGE_SHIFT;
+ }
+
+ return 0;
+}
+#endif
+
int
genfs_gop_write(struct vnode *vp, struct vm_page **pgs, int npages, int flags)
{
CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Sun Nov 21 18:22:33 UTC 2010
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Clarify things a bit in XIP putpages.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.63 -r1.36.2.64 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.63 src/sys/miscfs/genfs/genfs_io.c:1.36.2.64
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.63 Sun Nov 21 17:07:38 2010
+++ src/sys/miscfs/genfs/genfs_io.c Sun Nov 21 18:22:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.63 2010/11/21 17:07:38 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.64 2010/11/21 18:22:32 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.63 2010/11/21 17:07:38 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.64 2010/11/21 18:22:32 uebayasi Exp $);
#include opt_xip.h
@@ -1532,16 +1532,10 @@
mutex_enter(uobj-vmobjlock);
for (i = 0; i npages; i++) {
pg = pgs[i];
- if (pg == NULL || pg == PGO_DONTCARE)
-continue;
+ KASSERT(pg != NULL pg != PGO_DONTCARE);
if (pg == PGO_HOLE) {
pg = uvm_page_holepage;
KASSERT(pg != NULL);
-/*
- * XXXUEBS
- * Invalidating hole pages may be unnecessary,
- * but just for safety.
- */
} else {
/*
* Freeing normal XIP pages; nothing to do.
CVS commit: src/sbin/mount
Module Name:src Committed By: pooka Date: Sun Nov 21 18:33:09 UTC 2010 Modified Files: src/sbin/mount: mount.8 Log Message: xref rump_smbfs To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.69 src/sbin/mount/mount.8:1.70 --- src/sbin/mount/mount.8:1.69 Sat Oct 3 07:38:22 2009 +++ src/sbin/mount/mount.8 Sun Nov 21 18:33:08 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.8,v 1.69 2009/10/03 07:38:22 wiz Exp $ +.\ $NetBSD: mount.8,v 1.70 2010/11/21 18:33:08 pooka Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -510,6 +510,7 @@ .Xr rump_msdos 8 , .Xr rump_nfs 8 , .Xr rump_ntfs 8 , +.Xr rump_smbfs 8 , .Xr rump_sysvbfs 8 , .Xr rump_tmpfs 8 , .Xr rump_udf 8 ,
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 18:32:34 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1425. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 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.14 src/doc/CHANGES-5.2:1.1.2.15 --- src/doc/CHANGES-5.2:1.1.2.14 Sun Nov 21 18:13:12 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 18:32:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.14 2010/11/21 18:13:12 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.15 2010/11/21 18:32:33 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -327,3 +327,322 @@ Avoid steps and other artefacts in head for more than 9 CPUs. [is, ticket #1422] +doc/3RDPARTY 1.768 +external/ibm-public/postfix/dist/HISTORY patch +external/ibm-public/postfix/dist/RELEASE_NOTES patch +external/ibm-public/postfix/dist/makedefs patch +external/ibm-public/postfix/dist/README_FILES/ADDRESS_REWRITING_README patch +external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README patch +external/ibm-public/postfix/dist/README_FILES/CONNECTION_CACHE_README patch +external/ibm-public/postfix/dist/README_FILES/DATABASE_README patch +external/ibm-public/postfix/dist/README_FILES/FILTER_README patch +external/ibm-public/postfix/dist/README_FILES/MAILDROP_README patch +external/ibm-public/postfix/dist/README_FILES/MILTER_README patch +external/ibm-public/postfix/dist/README_FILES/OVERVIEW patch +external/ibm-public/postfix/dist/README_FILES/RELEASE_NOTES patch +external/ibm-public/postfix/dist/README_FILES/SASL_README patch +external/ibm-public/postfix/dist/README_FILES/SMTPD_PROXY_README patch +external/ibm-public/postfix/dist/README_FILES/SOHO_README patch +external/ibm-public/postfix/dist/README_FILES/STANDARD_CONFIGURATION_README patch +external/ibm-public/postfix/dist/README_FILES/TLS_README patch +external/ibm-public/postfix/dist/conf/access patch +external/ibm-public/postfix/dist/conf/header_checks patch +external/ibm-public/postfix/dist/conf/master.cf patch +external/ibm-public/postfix/dist/conf/postfix-script patch +external/ibm-public/postfix/dist/conf/transport patch +external/ibm-public/postfix/dist/html/ADDRESS_REWRITING_README.html patch +external/ibm-public/postfix/dist/html/ADDRESS_VERIFICATION_README.html patch +external/ibm-public/postfix/dist/html/CONNECTION_CACHE_README.html patch +external/ibm-public/postfix/dist/html/DATABASE_README.html patch +external/ibm-public/postfix/dist/html/FILTER_README.html patch +external/ibm-public/postfix/dist/html/MAILDROP_README.html patch +external/ibm-public/postfix/dist/html/MILTER_README.html patch +external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html patch +external/ibm-public/postfix/dist/html/Makefile.in patch +external/ibm-public/postfix/dist/html/OVERVIEW.html patch +external/ibm-public/postfix/dist/html/SASL_README.html patch +external/ibm-public/postfix/dist/html/SMTPD_PROXY_README.html patch +external/ibm-public/postfix/dist/html/SOHO_README.html patch +external/ibm-public/postfix/dist/html/STANDARD_CONFIGURATION_README.html patch +external/ibm-public/postfix/dist/html/TLS_README.html patch +external/ibm-public/postfix/dist/html/VIRTUAL_README.html patch +external/ibm-public/postfix/dist/html/access.5.html patch +external/ibm-public/postfix/dist/html/bounce.8.html patch +external/ibm-public/postfix/dist/html/cleanup.8.html patch +external/ibm-public/postfix/dist/html/defer.8.html patch +external/ibm-public/postfix/dist/html/header_checks.5.html patch +external/ibm-public/postfix/dist/html/lmtp.8.html patch +external/ibm-public/postfix/dist/html/oqmgr.8.html patch +external/ibm-public/postfix/dist/html/pcre_table.5.html patch +external/ibm-public/postfix/dist/html/pickup.8.html patch +external/ibm-public/postfix/dist/html/pipe.8.html patch +external/ibm-public/postfix/dist/html/postcat.1.html patch +external/ibm-public/postfix/dist/html/postconf.1.html patch +external/ibm-public/postfix/dist/html/postconf.5.html patch +external/ibm-public/postfix/dist/html/postfix-wrapper.5.html patch +external/ibm-public/postfix/dist/html/postmulti.1.html patch +external/ibm-public/postfix/dist/html/postqueue.1.html patch +external/ibm-public/postfix/dist/html/qmgr.8.html patch +external/ibm-public/postfix/dist/html/qmqpd.8.html patch +external/ibm-public/postfix/dist/html/regexp_table.5.html patch +external/ibm-public/postfix/dist/html/smtp.8.html patch +external/ibm-public/postfix/dist/html/smtpd.8.html patch +external/ibm-public/postfix/dist/html/trace.8.html patch +external/ibm-public/postfix/dist/html/transport.5.html patch +external/ibm-public/postfix/dist/html/trivial-rewrite.8.html patch +external/ibm-public/postfix/dist/html/verify.8.html patch
CVS commit: [netbsd-5] src/usr.bin/progress
Module Name:src
Committed By: riz
Date: Sun Nov 21 18:40:45 UTC 2010
Modified Files:
src/usr.bin/progress [netbsd-5]: progress.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #1429):
usr.bin/progress/progress.c: revision 1.18
Fix argument handling of the -b option on 64bit platforms. Using
-b 1024k would previously fail with this error message:
progress: buffer size 1048576 is greater than -1.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.4.1 src/usr.bin/progress/progress.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/progress/progress.c
diff -u src/usr.bin/progress/progress.c:1.17 src/usr.bin/progress/progress.c:1.17.4.1
--- src/usr.bin/progress/progress.c:1.17 Mon May 26 04:53:11 2008
+++ src/usr.bin/progress/progress.c Sun Nov 21 18:40:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.17 2008/05/26 04:53:11 dholland Exp $ */
+/* $NetBSD: progress.c,v 1.17.4.1 2010/11/21 18:40:44 riz Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: progress.c,v 1.17 2008/05/26 04:53:11 dholland Exp $);
+__RCSID($NetBSD: progress.c,v 1.17.4.1 2010/11/21 18:40:44 riz Exp $);
#endif/* not lint */
#include sys/types.h
@@ -112,7 +112,7 @@
switch (ch) {
case 'b':
buffersize = (size_t) strsuftoll(buffer size, optarg,
- 0, SIZE_T_MAX);
+ 0, SSIZE_MAX);
break;
case 'e':
eflag++;
CVS commit: [netbsd-5] src/gnu/lib/libstdc++-v3_4
Module Name:src
Committed By: riz
Date: Sun Nov 21 18:42:13 UTC 2010
Modified Files:
src/gnu/lib/libstdc++-v3_4 [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1432):
gnu/lib/libstdc++-v3_4/Makefile: revision 1.5
Explicitly link libstdc++ against libm as found by Arnaud Lacombe.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.24.1 src/gnu/lib/libstdc++-v3_4/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/libstdc++-v3_4/Makefile
diff -u src/gnu/lib/libstdc++-v3_4/Makefile:1.3 src/gnu/lib/libstdc++-v3_4/Makefile:1.3.24.1
--- src/gnu/lib/libstdc++-v3_4/Makefile:1.3 Thu Nov 9 20:07:15 2006
+++ src/gnu/lib/libstdc++-v3_4/Makefile Sun Nov 21 18:42:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/09 20:07:15 christos Exp $
+# $NetBSD: Makefile,v 1.3.24.1 2010/11/21 18:42:13 riz Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -6,6 +6,9 @@
.include bsd.own.mk
LIB= stdc++
+LDADD= -lgcc_s
+
+LIBDPLIBS+= m ${.CURDIR}/../../../lib/libm
.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) ${MKGCC} != no
.include ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 18:47:39 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1429, 1432-1434 To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 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.15 src/doc/CHANGES-5.2:1.1.2.16 --- src/doc/CHANGES-5.2:1.1.2.15 Sun Nov 21 18:32:33 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 18:47:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.15 2010/11/21 18:32:33 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.16 2010/11/21 18:47:39 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -646,3 +646,25 @@ and mail delivery transports in master.cf with unique smtp_bind_address values. [tron, ticket #1425] + +usr.bin/progress/progress.c 1.18 + + Fix argument handling of the -b option on 64bit platforms. + [tron, ticket #1429] + +gnu/lib/libstdc++-v3_4/Makefile 1.5 + + Explicitly link libstdc++ against libm as found by Arnaud Lacombe. + [joerg, ticket #1432] + +usr.bin/make/job.c1.152 via patch + + PR/43643: David A. Holland: dash prefix broken with make -j + [dholland, ticket #1433] + +sys/fs/msdosfs/msdosfs_lookup.c 1.22 + + Return EINVAL for rename and delete operations to the + root directory instead of the erroneous EROFS. + [mlelstv, ticket #1434] +
CVS commit: [netbsd-5] src/sys/fs/msdosfs
Module Name:src Committed By: riz Date: Sun Nov 21 18:46:40 UTC 2010 Modified Files: src/sys/fs/msdosfs [netbsd-5]: msdosfs_lookup.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1434): sys/fs/msdosfs/msdosfs_lookup.c: revision 1.22 Return EINVAL for rename and delete operations to the root directory instead of the erroneous EROFS. To generate a diff of this commit: cvs rdiff -u -r1.16.8.1 -r1.16.8.2 src/sys/fs/msdosfs/msdosfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/msdosfs/msdosfs_lookup.c diff -u src/sys/fs/msdosfs/msdosfs_lookup.c:1.16.8.1 src/sys/fs/msdosfs/msdosfs_lookup.c:1.16.8.2 --- src/sys/fs/msdosfs/msdosfs_lookup.c:1.16.8.1 Mon Feb 2 20:42:44 2009 +++ src/sys/fs/msdosfs/msdosfs_lookup.c Sun Nov 21 18:46:40 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_lookup.c,v 1.16.8.1 2009/02/02 20:42:44 snj Exp $ */ +/* $NetBSD: msdosfs_lookup.c,v 1.16.8.2 2010/11/21 18:46:40 riz Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: msdosfs_lookup.c,v 1.16.8.1 2009/02/02 20:42:44 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: msdosfs_lookup.c,v 1.16.8.2 2010/11/21 18:46:40 riz Exp $); #include sys/param.h #include sys/systm.h @@ -462,7 +462,7 @@ * Don't allow deleting the root. */ if (blkoff == MSDOSFSROOT_OFS) - return EROFS; /* really? XXX */ + return EINVAL; /* * Write access to directory required to delete files. @@ -498,7 +498,7 @@ return (EROFS); if (blkoff == MSDOSFSROOT_OFS) - return EROFS;/* really? XXX */ + return EINVAL; error = VOP_ACCESS(vdp, VWRITE, cnp-cn_cred); if (error)
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Sun Nov 21 18:31:38 UTC 2010 Modified Files: src/doc [netbsd-5]: 3RDPARTY src/external/ibm-public/postfix/dist [netbsd-5]: HISTORY RELEASE_NOTES makedefs src/external/ibm-public/postfix/dist/README_FILES [netbsd-5]: ADDRESS_REWRITING_README ADDRESS_VERIFICATION_README CONNECTION_CACHE_README DATABASE_README FILTER_README MAILDROP_README MILTER_README OVERVIEW RELEASE_NOTES SASL_README SMTPD_PROXY_README SOHO_README STANDARD_CONFIGURATION_README TLS_README src/external/ibm-public/postfix/dist/conf [netbsd-5]: access header_checks master.cf postfix-script transport src/external/ibm-public/postfix/dist/html [netbsd-5]: ADDRESS_REWRITING_README.html ADDRESS_VERIFICATION_README.html CONNECTION_CACHE_README.html DATABASE_README.html FILTER_README.html MAILDROP_README.html MILTER_README.html MULTI_INSTANCE_README.html Makefile.in OVERVIEW.html SASL_README.html SMTPD_PROXY_README.html SOHO_README.html STANDARD_CONFIGURATION_README.html TLS_README.html VIRTUAL_README.html access.5.html bounce.8.html cleanup.8.html defer.8.html header_checks.5.html lmtp.8.html oqmgr.8.html pcre_table.5.html pickup.8.html pipe.8.html postcat.1.html postconf.1.html postconf.5.html postfix-wrapper.5.html postmulti.1.html postqueue.1.html qmgr.8.html qmqpd.8.html regexp_table.5.html smtp.8.html smtpd.8.html trace.8.html transport.5.html trivial-rewrite.8.html verify.8.html virtual.5.html virtual.8.html src/external/ibm-public/postfix/dist/man [netbsd-5]: Makefile.in src/external/ibm-public/postfix/dist/man/man1 [netbsd-5]: postcat.1 postconf.1 postmulti.1 postqueue.1 src/external/ibm-public/postfix/dist/man/man5 [netbsd-5]: access.5 header_checks.5 pcre_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 transport.5 src/external/ibm-public/postfix/dist/man/man8 [netbsd-5]: bounce.8 cleanup.8 oqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 smtp.8 smtpd.8 trivial-rewrite.8 verify.8 virtual.8 src/external/ibm-public/postfix/dist/mantools [netbsd-5]: make-relnotes make_soho_readme postlink src/external/ibm-public/postfix/dist/proto [netbsd-5]: ADDRESS_REWRITING_README.html ADDRESS_VERIFICATION_README.html CONNECTION_CACHE_README.html DATABASE_README.html FILTER_README.html MAILDROP_README.html MILTER_README.html OVERVIEW.html SASL_README.html SMTPD_PROXY_README.html STANDARD_CONFIGURATION_README.html TLS_README.html access header_checks pcre_table postconf.proto postfix-wrapper regexp_table transport src/external/ibm-public/postfix/dist/src/bounce [netbsd-5]: bounce.c src/external/ibm-public/postfix/dist/src/cleanup [netbsd-5]: Makefile.in cleanup.c cleanup.h cleanup_bounce.c cleanup_envelope.c cleanup_extracted.c cleanup_init.c cleanup_milter.c cleanup_state.c src/external/ibm-public/postfix/dist/src/dns [netbsd-5]: dns.h dns_lookup.c src/external/ibm-public/postfix/dist/src/global [netbsd-5]: Makefile.in cleanup_user.h db_common.c dict_ldap.c mail_copy.c mail_params.c mail_params.h mail_queue.h mail_version.h record.c record.h sys_exits.c src/external/ibm-public/postfix/dist/src/local [netbsd-5]: Makefile.in command.c file.c local.h recipient.c src/external/ibm-public/postfix/dist/src/master [netbsd-5]: Makefile.in mail_server.h master_avail.c master_ent.c multi_server.c single_server.c trigger_server.c src/external/ibm-public/postfix/dist/src/milter [netbsd-5]: milter.c milter8.c test-milter.c src/external/ibm-public/postfix/dist/src/oqmgr [netbsd-5]: qmgr.c qmgr_message.c src/external/ibm-public/postfix/dist/src/pickup [netbsd-5]: pickup.c src/external/ibm-public/postfix/dist/src/pipe [netbsd-5]: pipe.c src/external/ibm-public/postfix/dist/src/postcat [netbsd-5]: Makefile.in postcat.c src/external/ibm-public/postfix/dist/src/postconf [netbsd-5]: Makefile.in postconf.c src/external/ibm-public/postfix/dist/src/postdrop [netbsd-5]: postdrop.c src/external/ibm-public/postfix/dist/src/postmulti [netbsd-5]: postmulti.c src/external/ibm-public/postfix/dist/src/postqueue [netbsd-5]: postqueue.c src/external/ibm-public/postfix/dist/src/proxymap [netbsd-5]: proxymap.c src/external/ibm-public/postfix/dist/src/qmgr [netbsd-5]: qmgr.c qmgr_message.c
CVS commit: src/crypto/external/bsd/openssh
Module Name:src
Committed By: adam
Date: Sun Nov 21 19:19:23 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc
src/crypto/external/bsd/openssh/bin: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile shlib_version
Added Files:
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper: Makefile
Log Message:
Updated custom makefiles for OpenSSH 5.6
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/lib/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/Makefile.inc
diff -u src/crypto/external/bsd/openssh/Makefile.inc:1.1 src/crypto/external/bsd/openssh/Makefile.inc:1.2
--- src/crypto/external/bsd/openssh/Makefile.inc:1.1 Sat Dec 19 18:00:26 2009
+++ src/crypto/external/bsd/openssh/Makefile.inc Sun Nov 21 19:19:21 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/12/19 18:00:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2010/11/21 19:19:21 adam Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual
@@ -8,7 +8,10 @@
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
-CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
+CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY -DENABLE_PKCS11
+.if !defined(NOPIC)
+CPPFLAGS+=-DHAVE_DLOPEN
+.endif
.PATH: ${SSHDIST}
.if (${USE_PAM} != no)
@@ -24,6 +27,10 @@
CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
.endif
+.if (${USE_LDAP} != no)
+CPPFLAGS+=-DWITH_LDAP_PUBKEY
+.endif
+
.if ${X11FLAVOUR} == Xorg
CPPFLAGS+=-DX11BASE=\/usr/X11R7\
.endif
Index: src/crypto/external/bsd/openssh/bin/Makefile
diff -u src/crypto/external/bsd/openssh/bin/Makefile:1.2 src/crypto/external/bsd/openssh/bin/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/Makefile:1.2 Tue Jul 21 00:47:23 2009
+++ src/crypto/external/bsd/openssh/bin/Makefile Sun Nov 21 19:19:21 2010
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2009/07/21 00:47:23 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:21 adam Exp $
.include bsd.own.mk
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
SUBDIR= ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
- ssh-keysign ssh-keyscan sftp
-#SUBDIR+=scard
+ ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper
.PATH: ${SSHDIST}
.MADE: moduli
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.2 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.2 Wed Feb 3 15:34:37 2010
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Sun Nov 21 19:19:22 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/02/03 15:34:37 roy Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:22 adam Exp $
BINDIR= /usr/bin
PROG= sftp
-SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c misc.c fmt_scaled.c
+SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c
MAN= sftp.1
LDADD+= -ledit -lterminfo
@@ -12,5 +12,6 @@
.include bsd.prog.mk
.if (defined(HAVE_GCC) ${HAVE_GCC} == 4) || defined(HAVE_PCC)
-COPTS.sftp-client.c+= -Wno-pointer-sign
+COPTS.sftp.c+= -Wno-pointer-sign
+COPTS.sftp-client.c+= -Wno-pointer-sign
.endif
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.1 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.2
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.1 Sun Jun 7 22:38:45 2009
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Sun Nov 21 19:19:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/07 22:38:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/21 19:19:22 adam Exp $
.include bsd.own.mk
@@ -6,10 +6,12 @@
PROG= ssh
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
- sshconnect.c sshconnect1.c sshconnect2.c mux.c
+ sshconnect.c sshconnect1.c
CVS commit: src/usr.sbin/puffs
Module Name:src Committed By: pooka Date: Sun Nov 21 19:29:01 UTC 2010 Modified Files: src/usr.sbin/puffs: makerumpmanpages.sh Log Message: * document disk.img%DISKLABEL:p% * tweaks To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/makerumpmanpages.sh 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/puffs/makerumpmanpages.sh diff -u src/usr.sbin/puffs/makerumpmanpages.sh:1.9 src/usr.sbin/puffs/makerumpmanpages.sh:1.10 --- src/usr.sbin/puffs/makerumpmanpages.sh:1.9 Wed Mar 31 14:45:59 2010 +++ src/usr.sbin/puffs/makerumpmanpages.sh Sun Nov 21 19:29:01 2010 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: makerumpmanpages.sh,v 1.9 2010/03/31 14:45:59 pooka Exp $ +# $NetBSD: makerumpmanpages.sh,v 1.10 2010/11/21 19:29:01 pooka Exp $ # IFS=' ' @@ -9,7 +9,7 @@ .\ WARNING: GENERATED FILE, DO NOT EDIT .\ INSTEAD, EDIT makerumpmanpages.sh AND REGEN .\ -.\ Copyright (c) 2008 Antti Kantee. All rights reserved. +.\ Copyright (c) 2008-2010 Antti Kantee. All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without .\ modification, are permitted provided that the following conditions @@ -32,7 +32,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd March 31, 2010 +.Dd November 21, 2010 .Dt RUMP_XXXFSXXX 8 .Os .Sh NAME @@ -44,8 +44,8 @@ .Pp .Nm .Op options -.Ar special -.Ar node +.Ar image +.Ar mountpoint .Sh DESCRIPTION .Em NOTE! This manual page has been generated from a common source shared between all @@ -69,19 +69,37 @@ does not use file system code within the kernel and therefore does not require kernel support except .Xr puffs 4 . -Apart from a minor speed penalty (starting from 10% and depending -on the workload and file system in question), there is no difference -to using in-kernel code. +Apart from a minor speed penalty there is no downside with respect to +in-kernel code. .Pp -In case mounting a file system image from a regular file, .Nm -does not require the use of +does not require using .Xr vnconfig 8 -unlike kernel file systems. -Instead, the image path can be directly passed as the special file path. -The exception is if the image contains a disklabel. -In this case vnconfig is required to resolve the start offset for the -correct partition within the image. +for mounts from regular files and the file path can be passed +directly as the +.Ar image +parameter. +In fact, the use of +.Xr vnconfig 8 +is discouraged, since it is unable to properly deal with images on +sparse files. +.Pp +In case the image contains multiple partitions, the desired partition +must be indicated by appending the token +.Dq %DISKLABEL:p% +to the +.Ar image +path. +The letter +.Dq p +specifies the partition as obtained via +.Xr disklabel 8 . +For example, to mount partition +.Dq e +from image +.Pa /tmp/wd0.img , +use +.Dq /tmp/wd0.img%DISKLABEL:e% . .Pp It is recommended that untrusted file system images be mounted with .Nm @@ -122,8 +140,7 @@ The .Nm utility first appeared in -.Nx 5.0 . -It is currently considered experimental.' +.Nx 5.0 .' # generate the manual pages #
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Sun Nov 21 19:29:31 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5]: ahcisata_pci.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1437):
sys/dev/pci/ahcisata_pci.c: revision 1.22
Add NVIDIA MCP77 to the quirk table, so ahcisata will attach when the
BIOS is set to 'RAID' mode.
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 src/sys/dev/pci/ahcisata_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/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.12.4.2 src/sys/dev/pci/ahcisata_pci.c:1.12.4.3
--- src/sys/dev/pci/ahcisata_pci.c:1.12.4.2 Mon Mar 30 16:49:25 2009
+++ src/sys/dev/pci/ahcisata_pci.c Sun Nov 21 19:29:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.12.4.2 2009/03/30 16:49:25 snj Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.12.4.3 2010/11/21 19:29:30 riz Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.12.4.2 2009/03/30 16:49:25 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.12.4.3 2010/11/21 19:29:30 riz Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -64,6 +64,30 @@
AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_AHCI_1,
AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_1,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_2,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_3,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_4,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_5,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_6,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_7,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_8,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_9,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_10,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_11,
+ AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_12,
+ AHCI_PCI_QUIRK_FORCE },
};
struct ahci_pci_softc {
CVS commit: src/sys/arch/dreamcast/dreamcast
Module Name:src
Committed By: tsutsui
Date: Sun Nov 21 18:53:57 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dreamcast: mainbus.c
Log Message:
Make local functions/variable static.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/dreamcast/dreamcast/mainbus.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/dreamcast/dreamcast/mainbus.c
diff -u src/sys/arch/dreamcast/dreamcast/mainbus.c:1.10 src/sys/arch/dreamcast/dreamcast/mainbus.c:1.11
--- src/sys/arch/dreamcast/dreamcast/mainbus.c:1.10 Sun Nov 21 17:59:36 2010
+++ src/sys/arch/dreamcast/dreamcast/mainbus.c Sun Nov 21 18:53:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.10 2010/11/21 17:59:36 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.11 2010/11/21 18:53:56 tsutsui Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,18 +27,18 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.10 2010/11/21 17:59:36 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.11 2010/11/21 18:53:56 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/device.h
#include machine/autoconf.h
-int mainbus_match(device_t, cfdata_t, void *);
-void mainbus_attach(device_t, device_t, void *);
-int mainbus_print(void *, const char *);
+static int mainbus_match(device_t, cfdata_t, void *);
+static void mainbus_attach(device_t, device_t, void *);
+static int mainbus_print(void *, const char *);
-struct mainbus_attach_args mainbusdevs[] = {
+static struct mainbus_attach_args mainbusdevs[] = {
{ cpu },
{ shb },
{ NULL } /* terminator */
CVS commit: src/usr.sbin/puffs
Module Name:src Committed By: pooka Date: Sun Nov 21 19:32:20 UTC 2010 Modified Files: src/usr.sbin/puffs/rump_cd9660: rump_cd9660.8 src/usr.sbin/puffs/rump_efs: rump_efs.8 src/usr.sbin/puffs/rump_ext2fs: rump_ext2fs.8 src/usr.sbin/puffs/rump_fdesc: rump_fdesc.8 src/usr.sbin/puffs/rump_ffs: rump_ffs.8 src/usr.sbin/puffs/rump_hfs: rump_hfs.8 src/usr.sbin/puffs/rump_kernfs: rump_kernfs.8 src/usr.sbin/puffs/rump_lfs: rump_lfs.8 src/usr.sbin/puffs/rump_msdos: rump_msdos.8 src/usr.sbin/puffs/rump_nfs: rump_nfs.8 src/usr.sbin/puffs/rump_ntfs: rump_ntfs.8 src/usr.sbin/puffs/rump_smbfs: rump_smbfs.8 src/usr.sbin/puffs/rump_sysvbfs: rump_sysvbfs.8 src/usr.sbin/puffs/rump_tmpfs: rump_tmpfs.8 src/usr.sbin/puffs/rump_udf: rump_udf.8 Added Files: src/usr.sbin/puffs/rump_au-naturel: rump_au-naturel.8 src/usr.sbin/puffs/rump_nqmfs: rump_nqmfs.8 Log Message: regen To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/usr.sbin/puffs/rump_au-naturel/rump_au-naturel.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_efs/rump_efs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.8 cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_fdesc/rump_fdesc.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_ffs/rump_ffs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_hfs/rump_hfs.8 cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_kernfs/rump_kernfs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_lfs/rump_lfs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_msdos/rump_msdos.8 cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/rump_nfs/rump_nfs.8 cvs rdiff -u -r0 -r1.1 src/usr.sbin/puffs/rump_nqmfs/rump_nqmfs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_ntfs/rump_ntfs.8 cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_tmpfs/rump_tmpfs.8 cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_udf/rump_udf.8 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/puffs/rump_cd9660/rump_cd9660.8 diff -u src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8:1.9 src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8:1.10 --- src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8:1.9 Wed Mar 31 14:49:46 2010 +++ src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8 Sun Nov 21 19:32:16 2010 @@ -1,9 +1,9 @@ -.\ $NetBSD: rump_cd9660.8,v 1.9 2010/03/31 14:49:46 pooka Exp $ +.\ $NetBSD: rump_cd9660.8,v 1.10 2010/11/21 19:32:16 pooka Exp $ .\ .\ WARNING: GENERATED FILE, DO NOT EDIT .\ INSTEAD, EDIT makerumpmanpages.sh AND REGEN .\ -.\ Copyright (c) 2008 Antti Kantee. All rights reserved. +.\ Copyright (c) 2008-2010 Antti Kantee. All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without .\ modification, are permitted provided that the following conditions @@ -26,7 +26,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd March 31, 2010 +.Dd November 21, 2010 .Dt RUMP_CD9660 8 .Os .Sh NAME @@ -38,8 +38,8 @@ .Pp .Nm .Op options -.Ar special -.Ar node +.Ar image +.Ar mountpoint .Sh DESCRIPTION .Em NOTE! This manual page has been generated from a common source shared between all @@ -63,19 +63,37 @@ does not use file system code within the kernel and therefore does not require kernel support except .Xr puffs 4 . -Apart from a minor speed penalty (starting from 10% and depending -on the workload and file system in question), there is no difference -to using in-kernel code. +Apart from a minor speed penalty there is no downside with respect to +in-kernel code. .Pp -In case mounting a file system image from a regular file, .Nm -does not require the use of +does not require using .Xr vnconfig 8 -unlike kernel file systems. -Instead, the image path can be directly passed as the special file path. -The exception is if the image contains a disklabel. -In this case vnconfig is required to resolve the start offset for the -correct partition within the image. +for mounts from regular files and the file path can be passed +directly as the +.Ar image +parameter. +In fact, the use of +.Xr vnconfig 8 +is discouraged, since it is unable to properly deal with images on +sparse files. +.Pp +In case the image contains multiple partitions, the desired partition +must be indicated by appending the token +.Dq %DISKLABEL:p% +to the +.Ar image +path. +The letter +.Dq p +specifies the partition as obtained via +.Xr disklabel 8 . +For example, to mount partition +.Dq e +from image +.Pa /tmp/wd0.img , +use +.Dq /tmp/wd0.img%DISKLABEL:e% . .Pp It is recommended that untrusted file system images be mounted with .Nm @@
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 19:41:32 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1437, 1438 To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 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.17 src/doc/CHANGES-5.2:1.1.2.18 --- src/doc/CHANGES-5.2:1.1.2.17 Sun Nov 21 18:50:49 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 19:41:32 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.17 2010/11/21 18:50:49 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.18 2010/11/21 19:41:32 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -673,3 +673,14 @@ Avoid a lockdebug panic for dk(4) on raid(4). [bouyer, ticket #1435] +sys/dev/pci/ahcisata_pci.c 1.22 via patch + + Add NVIDIA MCP77 to the quirk table, so ahcisata will attach when the + BIOS is set to 'RAID' mode. + [jmcneill, ticket #1437] + +share/man/man4/ath.41.28 via patch + + Remove AR9280 and AR9285 from the supported chips list. + [jmcneill, ticket #1438] +
CVS commit: [netbsd-5] src/share/man/man4
Module Name:src Committed By: riz Date: Sun Nov 21 19:40:41 UTC 2010 Modified Files: src/share/man/man4 [netbsd-5]: ath.4 Log Message: Pull up following revision(s) (requested by jmcneill in ticket #1438): share/man/man4/ath.4: revision 1.28 Remove AR9280 and AR9285 from the supported chips list. To generate a diff of this commit: cvs rdiff -u -r1.20.12.4 -r1.20.12.5 src/share/man/man4/ath.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ath.4 diff -u src/share/man/man4/ath.4:1.20.12.4 src/share/man/man4/ath.4:1.20.12.5 --- src/share/man/man4/ath.4:1.20.12.4 Fri Aug 7 06:55:02 2009 +++ src/share/man/man4/ath.4 Sun Nov 21 19:40:41 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ath.4,v 1.20.12.4 2009/08/07 06:55:02 snj Exp $ +.\ $NetBSD: ath.4,v 1.20.12.5 2010/11/21 19:40:41 riz Exp $ .\ .\ Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting .\ All rights reserved. @@ -41,7 +41,7 @@ .\ $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath.4,v 1.16 2004/02/18 08:30:08 maxim Exp $ .\ parts from $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath_hal.4,v 1.7 2004/01/07 20:49:51 blackend Exp $ .\ -.Dd July 22, 2009 +.Dd August 7, 2010 .Dt ATH 4 .Os .Sh NAME @@ -55,7 +55,7 @@ .Nm driver provides support for wireless network adapters based on the Atheros AR2413, AR2417, AR5210, AR5211, AR5212, AR5413, AR5424, AR5416, -AR9160, AR9280 and AR9285 and AR5213 chips. +AR9160, and AR5213 chips. Chip-specific support is provided by the Atheros Hardware Access Layer (HAL). .Pp
CVS commit: [netbsd-5] src/sys/netinet6
Module Name:src
Committed By: riz
Date: Sun Nov 21 20:13:02 UTC 2010
Modified Files:
src/sys/netinet6 [netbsd-5]: esp_aesctr.c esp_core.c
Log Message:
Pull up following revision(s) (requested by jym in ticket #1440):
sys/netinet6/esp_core.c: revision 1.46
sys/netinet6/esp_aesctr.c: revision 1.13
Fix some code paths where pointers are dereferenced after checking that
they are NULL (oops?)
XXX pull-ups for NetBSD-4 and NetBSD-5.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.20.1 src/sys/netinet6/esp_aesctr.c
cvs rdiff -u -r1.40 -r1.40.44.1 src/sys/netinet6/esp_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/esp_aesctr.c
diff -u src/sys/netinet6/esp_aesctr.c:1.8 src/sys/netinet6/esp_aesctr.c:1.8.20.1
--- src/sys/netinet6/esp_aesctr.c:1.8 Tue Dec 25 18:33:47 2007
+++ src/sys/netinet6/esp_aesctr.c Sun Nov 21 20:13:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_aesctr.c,v 1.8 2007/12/25 18:33:47 perry Exp $ */
+/* $NetBSD: esp_aesctr.c,v 1.8.20.1 2010/11/21 20:13:01 riz Exp $ */
/* $KAME: esp_aesctr.c,v 1.2 2003/07/20 00:29:37 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esp_aesctr.c,v 1.8 2007/12/25 18:33:47 perry Exp $);
+__KERNEL_RCSID(0, $NetBSD: esp_aesctr.c,v 1.8.20.1 2010/11/21 20:13:01 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -79,10 +79,10 @@
const struct esp_algorithm *algo;
algo = esp_algorithm_lookup(sav-alg_enc);
- if (!algo) {
+ if (algo == NULL) {
ipseclog((LOG_ERR,
- esp_aeesctr_mature %s: unsupported algorithm.\n,
- algo-name));
+ esp_aesctr_mature: unsupported encryption algorithm %d\n,
+ sav-alg_enc));
return 1;
}
Index: src/sys/netinet6/esp_core.c
diff -u src/sys/netinet6/esp_core.c:1.40 src/sys/netinet6/esp_core.c:1.40.44.1
--- src/sys/netinet6/esp_core.c:1.40 Wed May 23 17:15:00 2007
+++ src/sys/netinet6/esp_core.c Sun Nov 21 20:13:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_core.c,v 1.40 2007/05/23 17:15:00 christos Exp $ */
+/* $NetBSD: esp_core.c,v 1.40.44.1 2010/11/21 20:13:01 riz Exp $ */
/* $KAME: esp_core.c,v 1.53 2001/11/27 09:47:30 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esp_core.c,v 1.40 2007/05/23 17:15:00 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: esp_core.c,v 1.40.44.1 2010/11/21 20:13:01 riz Exp $);
#include opt_inet.h
@@ -404,9 +404,10 @@
}
algo = esp_algorithm_lookup(sav-alg_enc);
- if (!algo) {
+ if (algo == NULL) {
ipseclog((LOG_ERR,
- esp_cbc_mature %s: unsupported algorithm.\n, algo-name));
+ esp_cbc_mature: unsupported encryption algorithm %d\n,
+ sav-alg_enc));
return 1;
}
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: adam Date: Sun Nov 21 19:58:04 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/man: mi Log Message: setlists updated for OpenSSH 5.6 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.887 -r1.888 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.554 -r1.555 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1524 -r1.1525 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1252 -r1.1253 src/distrib/sets/lists/man/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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.26 src/distrib/sets/lists/base/ad.mips64eb:1.27 --- src/distrib/sets/lists/base/ad.mips64eb:1.26 Sat Nov 6 09:40:31 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Sun Nov 21 19:58:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.26 2010/11/06 09:40:31 plunky Exp $ +# $NetBSD: ad.mips64eb,v 1.27 2010/11/21 19:58:03 adam Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -196,7 +196,7 @@ ./usr/lib/64/libss.so.6base-compat-shlib compat,pic,kerberos ./usr/lib/64/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx @@ -437,7 +437,7 @@ ./usr/lib/o32/libss.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.24 src/distrib/sets/lists/base/ad.mips64el:1.25 --- src/distrib/sets/lists/base/ad.mips64el:1.24 Sat Nov 6 09:40:31 2010 +++ src/distrib/sets/lists/base/ad.mips64el Sun Nov 21 19:58:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.24 2010/11/06 09:40:31 plunky Exp $ +# $NetBSD: ad.mips64el,v 1.25 2010/11/21 19:58:03 adam Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -196,7 +196,7 @@ ./usr/lib/64/libss.so.6base-compat-shlib compat,pic,kerberos ./usr/lib/64/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx @@ -437,7 +437,7 @@ ./usr/lib/o32/libss.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.98 src/distrib/sets/lists/base/md.amd64:1.99 --- src/distrib/sets/lists/base/md.amd64:1.98 Thu Nov 4 21:15:54 2010 +++ src/distrib/sets/lists/base/md.amd64 Sun Nov 21 19:58:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.98 2010/11/04 21:15:54 pooka Exp $ +# $NetBSD: md.amd64,v 1.99 2010/11/21 19:58:03 adam Exp $
CVS commit: [netbsd-5] src/lib/libutil
Module Name:src
Committed By: riz
Date: Sun Nov 21 20:38:38 UTC 2010
Modified Files:
src/lib/libutil [netbsd-5]: parsedate.3 parsedate.y
Log Message:
Pull up following revision(s) (requested by tron in ticket #1443):
lib/libutil/parsedate.3: revision 1.7
lib/libutil/parsedate.y: revision 1.5
Add support for parsing the data format @seconds since epoch e.g.
@735275209 for Tue Apr 20 03:06:49 UTC 1993. This change was inspired
by coreutil's date utility.
Mention recent enhancement and not that this function is neither
re-entrant nor thread-safe.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/lib/libutil/parsedate.3
cvs rdiff -u -r1.3 -r1.3.4.1 src/lib/libutil/parsedate.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libutil/parsedate.3
diff -u src/lib/libutil/parsedate.3:1.4 src/lib/libutil/parsedate.3:1.4.6.1
--- src/lib/libutil/parsedate.3:1.4 Wed Apr 30 13:10:52 2008
+++ src/lib/libutil/parsedate.3 Sun Nov 21 20:38:38 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: parsedate.3,v 1.4 2008/04/30 13:10:52 martin Exp $
+.\ $NetBSD: parsedate.3,v 1.4.6.1 2010/11/21 20:38:38 riz Exp $
.\
.\ Copyright (c) 2006 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd November 17, 2006
+.Dd Aug 28, 2010
.Dt PARSEDATE 3
.Os
.Sh NAME
@@ -228,6 +228,12 @@
.It next sunday
.It +2 years
.El
+.Pp
+Seconds since epoch (also known as UNIX time) are also supported:
+.Bl -tag -compact -width @735275209
+.It @735275209
+Tue Apr 20 03:06:49 UTC 1993
+.El
.Sh RETURN VALUES
.Fn parsedate
returns the number of seconds passed since the Epoch, or
@@ -236,6 +242,8 @@
.Sh SEE ALSO
.Xr date 1 ,
.Xr eeprom 8
+.Sh BUGS
+The parsedate function is not re-entrant or thread-safe.
.Sh HISTORY
The parser used in
.Fn parsedate
Index: src/lib/libutil/parsedate.y
diff -u src/lib/libutil/parsedate.y:1.3 src/lib/libutil/parsedate.y:1.3.4.1
--- src/lib/libutil/parsedate.y:1.3 Thu Jul 17 16:24:55 2008
+++ src/lib/libutil/parsedate.y Sun Nov 21 20:38:38 2010
@@ -100,7 +100,7 @@
}
%token tAGO tDAY tDAYZONE tID tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT
-%token tSEC_UNIT tSNUMBER tUNUMBER tZONE tDST
+%token tSEC_UNIT tSNUMBER tUNUMBER tZONE tDST AT_SIGN
%type Number tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT
%type Number tSEC_UNIT tSNUMBER tUNUMBER tZONE
@@ -132,6 +132,11 @@
yyHaveDate++;
yyHaveZone++;
}
+ | epochdate {
+ yyHaveTime++;
+ yyHaveDate++;
+ yyHaveZone++;
+ }
| number
;
@@ -148,6 +153,31 @@
}
;
+epochdate: AT_SIGN tUNUMBER {
+time_twhen = $2;
+struct tm tmbuf;
+if (gmtime_r(when, tmbuf) != NULL) {
+ yyYear = tmbuf.tm_year + 1900;
+ yyMonth = tmbuf.tm_mon + 1;
+ yyDay = tmbuf.tm_mday;
+
+ yyHour = tmbuf.tm_hour;
+ yyMinutes = tmbuf.tm_min;
+ yySeconds = tmbuf.tm_sec;
+ } else {
+ yyYear = 1970;
+ yyMonth = 1;
+ yyDay = 1;
+
+ yyHour = 0;
+ yyMinutes = 0;
+ yySeconds = 0;
+ }
+ yyDSTmode = DSToff;
+ yyTimezone = 0;
+ }
+ ;
+
time : tUNUMBER tMERIDIAN {
yyHour = $1;
yyMinutes = 0;
@@ -821,6 +851,10 @@
yyInput--;
return LookupWord(buff);
}
+ if (c == '@') {
+ yyInput++;
+ return AT_SIGN;
+ }
if (c != '(')
return *yyInput++;
Count = 0;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 20:24:59 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1440-1442. To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 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.18 src/doc/CHANGES-5.2:1.1.2.19 --- src/doc/CHANGES-5.2:1.1.2.18 Sun Nov 21 19:41:32 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 20:24:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.18 2010/11/21 19:41:32 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.19 2010/11/21 20:24:59 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -684,3 +684,23 @@ Remove AR9280 and AR9285 from the supported chips list. [jmcneill, ticket #1438] +sys/netinet6/esp_aesctr.c 1.13 +sys/netinet6/esp_core.c1.46 + + Fix some code paths where pointers are dereferenced after checking that + they are NULL. + [jym, ticket #1440] + +sys/dev/pci/hdaudio/hdaudio.c 1.7 +sys/dev/pci/hdaudio/hdaudio_afg.c 1.23 +sys/dev/pci/hdaudio/hdaudio_pci.c 1.6 +sys/dev/pci/hdaudio/hdaudio_pci.h 1.1 + + Add support for nvidia hdaudio controllers. + [jmcneill, ticket #1441] + +sys/dev/pci/hdaudio/hdaudio_afg.c 1.25 + + Fix kern/43542: 32kHz playback sounds like hissing analog TV snow. + [jmcneill, ticket #1442] +
CVS commit: [netbsd-5] src/sys/netinet6
Module Name:src
Committed By: riz
Date: Sun Nov 21 20:45:39 UTC 2010
Modified Files:
src/sys/netinet6 [netbsd-5]: in6_proto.c ip6_etherip.c ip6_etherip.h
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1445):
sys/netinet6/ip6_etherip.h: revision 1.2
sys/netinet6/in6_proto.c: revision 1.89
sys/netinet6/ip6_etherip.c: revision 1.14
Make the EtherIP in IPv6 input path work.
XXX: Figure out if we really need a separate protosw for IPv6.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.82.12.1 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/netinet6/ip6_etherip.c
cvs rdiff -u -r1.1 -r1.1.70.1 src/sys/netinet6/ip6_etherip.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/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.82 src/sys/netinet6/in6_proto.c:1.82.12.1
--- src/sys/netinet6/in6_proto.c:1.82 Thu Apr 24 11:38:38 2008
+++ src/sys/netinet6/in6_proto.c Sun Nov 21 20:45:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.82 2008/04/24 11:38:38 ad Exp $ */
+/* $NetBSD: in6_proto.c,v 1.82.12.1 2010/11/21 20:45:39 riz Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6_proto.c,v 1.82 2008/04/24 11:38:38 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6_proto.c,v 1.82.12.1 2010/11/21 20:45:39 riz Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -128,7 +128,7 @@
#endif
#include etherip.h
-#if NETHERIP 1
+#if NETHERIP 0
#include netinet6/ip6_etherip.h
#endif
@@ -333,7 +333,7 @@
.pr_usrreq = rip6_usrreq,
.pr_init = encap_init,
},
-#if NETHERIP 1
+#if NETHERIP 0
{ .pr_type = SOCK_RAW,
.pr_domain = inet6domain,
.pr_protocol = IPPROTO_ETHERIP,
Index: src/sys/netinet6/ip6_etherip.c
diff -u src/sys/netinet6/ip6_etherip.c:1.11 src/sys/netinet6/ip6_etherip.c:1.11.4.1
--- src/sys/netinet6/ip6_etherip.c:1.11 Sun Oct 19 23:28:31 2008
+++ src/sys/netinet6/ip6_etherip.c Sun Nov 21 20:45:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_etherip.c,v 1.11 2008/10/19 23:28:31 hans Exp $*/
+/* $NetBSD: ip6_etherip.c,v 1.11.4.1 2010/11/21 20:45:39 riz Exp $*/
/*
* Copyright (c) 2006, Hans Rosenfeld rosenf...@grumpf.hope-2000.org
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip6_etherip.c,v 1.11 2008/10/19 23:28:31 hans Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip6_etherip.c,v 1.11.4.1 2010/11/21 20:45:39 riz Exp $);
#include opt_inet.h
#include bpfilter.h
@@ -191,19 +191,15 @@
}
int
-ip6_etherip_input(struct mbuf *m, ...)
+ip6_etherip_input(struct mbuf **mp, int *offp, int proto)
{
+ struct mbuf *m = *mp;
+ int off = *offp;
struct etherip_softc *sc;
const struct ip6_hdr *ip6;
struct sockaddr_in6 *src6, *dst6;
struct ifnet *ifp = NULL;
- int off, proto, s;
- va_list ap;
-
- va_start(ap, m);
- off = va_arg(ap, int);
- proto = va_arg(ap, int);
- va_end(ap);
+ int s;
if (proto != IPPROTO_ETHERIP) {
m_freem(m);
Index: src/sys/netinet6/ip6_etherip.h
diff -u src/sys/netinet6/ip6_etherip.h:1.1 src/sys/netinet6/ip6_etherip.h:1.1.70.1
--- src/sys/netinet6/ip6_etherip.h:1.1 Thu Nov 23 04:07:07 2006
+++ src/sys/netinet6/ip6_etherip.h Sun Nov 21 20:45:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_etherip.h,v 1.1 2006/11/23 04:07:07 rpaulo Exp $*/
+/* $NetBSD: ip6_etherip.h,v 1.1.70.1 2010/11/21 20:45:39 riz Exp $*/
/*
* Copyright (c) 2006, Hans Rosenfeld rosenf...@grumpf.hope-2000.org
@@ -33,6 +33,6 @@
#define _NETINET6_IP6_ETHERIP_H_
int ip6_etherip_output(struct ifnet *, struct mbuf *);
-int ip6_etherip_input(struct mbuf *, ...);
+int ip6_etherip_input(struct mbuf **, int *, int);
#endif /* !_NETINET6_IP6_ETHERIP_H_ */
CVS commit: xsrc/external/mit/pixman/dist/pixman
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 20:49:26 UTC 2010 Modified Files: xsrc/external/mit/pixman/dist/pixman: pixman-bits-image.c Log Message: use _LP64 instead of a (broken) configure test. To generate a diff of this commit: cvs rdiff -u -r1.1.1.7 -r1.2 \ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c diff -u xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.1.1.7 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.2 --- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.1.1.7 Sun Nov 21 07:57:25 2010 +++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c Sun Nov 21 20:49:26 2010 @@ -142,7 +142,7 @@ } } -#if SIZEOF_LONG 4 +#ifdef _LP64 static force_inline uint32_t bilinear_interpolation (uint32_t tl, uint32_t tr,
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 20:49:46 UTC 2010 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: ... and pull over our changes so this builds on non-amd64. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/pixman/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/pixman/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.11 xsrc/external/mit/pixman/include/config.h:1.12 --- xsrc/external/mit/pixman/include/config.h:1.11 Sun Nov 21 09:01:16 2010 +++ xsrc/external/mit/pixman/include/config.h Sun Nov 21 20:49:46 2010 @@ -92,8 +92,10 @@ /* enable TIMER_BEGIN/TIMER_END macros */ /* #undef PIXMAN_TIMERS */ +#if 0 /* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 8 +#endif /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -113,14 +115,18 @@ /* use GNU-style inline assembler */ #define USE_GCC_INLINE_ASM 1 +#if defined(__i386__) || defined(__x86_64__) /* use MMX compiler intrinsics */ #define USE_MMX 1 +#endif /* use OpenMP in the test suite */ #define USE_OPENMP 1 +#if defined(__x86_64__) /* use SSE2 compiler intrinsics */ #define USE_SSE2 1 +#endif /* use VMX compiler intrinsics */ /* #undef USE_VMX */ @@ -130,14 +136,9 @@ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif +#include sys/endian.h +#if _BYTE_ORDER == _BIG_ENDIAN +#define WORDS_BIGENDIAN 1 #endif /* Define to `__inline__' or `__inline' if that's what the C compiler
CVS commit: [netbsd-5] src/usr.sbin/sa
Module Name:src
Committed By: riz
Date: Sun Nov 21 20:51:53 UTC 2010
Modified Files:
src/usr.sbin/sa [netbsd-5]: usrdb.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1446):
usr.sbin/sa/usrdb.c: revision 1.14
On LP64 platforms, uid_t is not the same size as u_long, so the key
comparison function being given to db was comparing 4 extra bytes of
rubbish.
This may or may not be the *only* source of the corrupted
/var/account/usracct files I've been seeing occasionally on amd64, but
it's clearly *a* source.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.38.1 src/usr.sbin/sa/usrdb.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/sa/usrdb.c
diff -u src/usr.sbin/sa/usrdb.c:1.11 src/usr.sbin/sa/usrdb.c:1.11.38.1
--- src/usr.sbin/sa/usrdb.c:1.11 Wed Nov 12 13:31:08 2003
+++ src/usr.sbin/sa/usrdb.c Sun Nov 21 20:51:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usrdb.c,v 1.11 2003/11/12 13:31:08 grant Exp $ */
+/* $NetBSD: usrdb.c,v 1.11.38.1 2010/11/21 20:51:52 riz Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: usrdb.c,v 1.11 2003/11/12 13:31:08 grant Exp $);
+__RCSID($NetBSD: usrdb.c,v 1.11.38.1 2010/11/21 20:51:52 riz Exp $);
#endif
#include sys/types.h
@@ -294,7 +294,7 @@
uid_compare(k1, k2)
const DBT *k1, *k2;
{
- u_long d1, d2;
+ uid_t d1, d2;
memcpy(d1, k1-data, sizeof(d1));
memcpy(d2, k2-data, sizeof(d2));
CVS commit: [netbsd-5] src/sys/dev/pci/hdaudio
Module Name:src
Committed By: riz
Date: Sun Nov 21 20:18:41 UTC 2010
Modified Files:
src/sys/dev/pci/hdaudio [netbsd-5]: hdaudio.c hdaudio_afg.c
hdaudio_pci.c
Added Files:
src/sys/dev/pci/hdaudio [netbsd-5]: hdaudio_pci.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1441):
sys/dev/pci/hdaudio/hdaudio_afg.c: revision 1.23
sys/dev/pci/hdaudio/hdaudio.c: revision 1.7
sys/dev/pci/hdaudio/hdaudio_pci.h: revision 1.1
sys/dev/pci/hdaudio/hdaudio_pci.c: revision 1.6
Reject invalid vendor IDs (say if there was a RIRB timeout while reading the
VID registers)
add support for nvidia hdaudio controllers
properly round block and buffer sizes -- nvidia HDA controllers work now
To generate a diff of this commit:
cvs rdiff -u -r1.4.4.3 -r1.4.4.4 src/sys/dev/pci/hdaudio/hdaudio.c
cvs rdiff -u -r1.14.2.6 -r1.14.2.7 src/sys/dev/pci/hdaudio/hdaudio_afg.c
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/sys/dev/pci/hdaudio/hdaudio_pci.c
cvs rdiff -u -r0 -r1.1.6.2 src/sys/dev/pci/hdaudio/hdaudio_pci.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/hdaudio/hdaudio.c
diff -u src/sys/dev/pci/hdaudio/hdaudio.c:1.4.4.3 src/sys/dev/pci/hdaudio/hdaudio.c:1.4.4.4
--- src/sys/dev/pci/hdaudio/hdaudio.c:1.4.4.3 Sun Oct 18 16:50:13 2009
+++ src/sys/dev/pci/hdaudio/hdaudio.c Sun Nov 21 20:18:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.4.4.3 2009/10/18 16:50:13 bouyer Exp $ */
+/* $NetBSD: hdaudio.c,v 1.4.4.4 2010/11/21 20:18:41 riz Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.4.4.3 2009/10/18 16:50:13 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.4.4.4 2010/11/21 20:18:41 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -668,6 +668,10 @@
snc = hdaudio_command(co, 0, CORB_GET_PARAMETER,
COP_SUBORDINATE_NODE_COUNT);
+ /* make sure the vendor and product IDs are valid */
+ if (vid == 0x || vid == 0x)
+ return;
+
#ifdef HDAUDIO_DEBUG
hda_print(sc, Codec%02X: %04X:%04X HDA %d.%d rev %d stepping %d\n,
co-co_addr, vid 16, vid 0x,
Index: src/sys/dev/pci/hdaudio/hdaudio_afg.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.14.2.6 src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.14.2.7
--- src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.14.2.6 Thu Jan 21 08:38:45 2010
+++ src/sys/dev/pci/hdaudio/hdaudio_afg.c Sun Nov 21 20:18:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_afg.c,v 1.14.2.6 2010/01/21 08:38:45 snj Exp $ */
+/* $NetBSD: hdaudio_afg.c,v 1.14.2.7 2010/11/21 20:18:41 riz Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio_afg.c,v 1.14.2.6 2010/01/21 08:38:45 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio_afg.c,v 1.14.2.7 2010/11/21 20:18:41 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -3330,7 +3330,7 @@
}
/* Multiple of 128 */
- blksize = ~128;
+ blksize = ~127;
if (blksize = 0)
blksize = 128;
@@ -3338,7 +3338,7 @@
if (bufsize HDAUDIO_BDL_MAX * blksize) {
blksize = bufsize / HDAUDIO_BDL_MAX;
if (blksize 128)
- blksize = (blksize + 128) ~128;
+ blksize = (blksize + 128) ~127;
}
return blksize;
@@ -3552,7 +3552,7 @@
hdaudio_afg_round_buffersize(void *opaque, int direction, size_t bufsize)
{
/* Multiple of 128 */
- bufsize = ~128;
+ bufsize = ~127;
if (bufsize = 0)
bufsize = 128;
return bufsize;
Index: src/sys/dev/pci/hdaudio/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.2.4.2 src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.2.4.3
--- src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.2.4.2 Sat Sep 26 19:52:10 2009
+++ src/sys/dev/pci/hdaudio/hdaudio_pci.c Sun Nov 21 20:18:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.2.4.2 2009/09/26 19:52:10 snj Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.2.4.3 2010/11/21 20:18:41 riz Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio_pci.c,v 1.2.4.2 2009/09/26 19:52:10 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio_pci.c,v 1.2.4.3 2010/11/21 20:18:41 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -49,6 +49,7 @@
#include dev/pci/hdaudio/hdaudioreg.h
#include dev/pci/hdaudio/hdaudiovar.h
+#include dev/pci/hdaudio/hdaudio_pci.h
struct hdaudio_pci_softc {
struct hdaudio_softc sc_hdaudio; /* must be first */
@@ -153,6 +154,18 @@
if (!pmf_device_register(self, NULL, hdaudio_pci_resume))
aprint_error_dev(self, couldn't establish power handler\n);
+ switch (PCI_VENDOR(pa-pa_id)) {
+ case PCI_VENDOR_NVIDIA:
+ /* enable snooping */
+ csr = pci_conf_read(sc-sc_pc, sc-sc_tag,
+
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: mrg Date: Sun Nov 21 20:45:02 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: obsolete lbx.h, lbxstr.h and lbximage.h To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/xcomp/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/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.115 src/distrib/sets/lists/xcomp/mi:1.116 --- src/distrib/sets/lists/xcomp/mi:1.115 Sun Nov 21 06:01:49 2010 +++ src/distrib/sets/lists/xcomp/mi Sun Nov 21 20:45:02 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.115 2010/11/21 06:01:49 mrg Exp $ +# $NetBSD: mi,v 1.116 2010/11/21 20:45:02 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5607,10 +5607,10 @@ ./usr/X11R7/include/X11/extensions/ge.h -unknown- xorg ./usr/X11R7/include/X11/extensions/geproto.h -unknown- xorg ./usr/X11R7/include/X11/extensions/lbx.h -unknown- xorg -./usr/X11R7/include/X11/extensions/lbxbuf.h -unknown- xorg -./usr/X11R7/include/X11/extensions/lbxbufstr.h -unknown- xorg +./usr/X11R7/include/X11/extensions/lbxbuf.h -unknown- obsolete +./usr/X11R7/include/X11/extensions/lbxbufstr.h -unknown- obsolete ./usr/X11R7/include/X11/extensions/lbxdeltastr.h -unknown- obsolete -./usr/X11R7/include/X11/extensions/lbximage.h -unknown- xorg +./usr/X11R7/include/X11/extensions/lbximage.h -unknown- obsolete ./usr/X11R7/include/X11/extensions/lbxopts.h -unknown- obsolete ./usr/X11R7/include/X11/extensions/lbxproto.h -unknown- xorg ./usr/X11R7/include/X11/extensions/lbxstr.h -unknown- obsolete
CVS commit: [netbsd-5] src/sys/dev/pci/hdaudio
Module Name:src
Committed By: riz
Date: Sun Nov 21 20:22:46 UTC 2010
Modified Files:
src/sys/dev/pci/hdaudio [netbsd-5]: hdaudio_afg.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1442):
sys/dev/pci/hdaudio/hdaudio_afg.c: revision 1.25
kern/43542: 32kHz playback sounds like hissing analog TV snow
Instead of specifying a range of supported sample rates based on the lowest
and highest available frequencies, only advertise rates that the codec reports
as working. Let aurateconv take care of the rest.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.7 -r1.14.2.8 src/sys/dev/pci/hdaudio/hdaudio_afg.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/hdaudio/hdaudio_afg.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.14.2.7 src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.14.2.8
--- src/sys/dev/pci/hdaudio/hdaudio_afg.c:1.14.2.7 Sun Nov 21 20:18:41 2010
+++ src/sys/dev/pci/hdaudio/hdaudio_afg.c Sun Nov 21 20:22:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_afg.c,v 1.14.2.7 2010/11/21 20:18:41 riz Exp $ */
+/* $NetBSD: hdaudio_afg.c,v 1.14.2.8 2010/11/21 20:22:46 riz Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio_afg.c,v 1.14.2.7 2010/11/21 20:18:41 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio_afg.c,v 1.14.2.8 2010/11/21 20:22:46 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -108,6 +108,11 @@
#define HDAUDIO_HP_SENSE_PERIOD hz
+const u_int hdaudio_afg_possible_rates[] = {
+ 8000, 11025, 16000, 22050, 32000, 44100,
+ 48000, 88200, 96000, 176500, 192000, /* 384000, */
+};
+
static const char *hdaudio_afg_mixer_names[] = HDAUDIO_DEVICE_NAMES;
static const char *hdaudio_afg_port_connectivity[] = {
@@ -2845,9 +2850,10 @@
static bool
hdaudio_afg_probe_encoding(struct hdaudio_afg_softc *sc,
-u_int minrate, u_int maxrate, u_int validbits, u_int precision, bool force)
+u_int validbits, u_int precision, bool force)
{
struct audio_format f;
+ int i;
if (!force hdaudio_afg_bits_supported(sc, validbits) == false)
return false;
@@ -2861,8 +2867,11 @@
f.channels = 0;
f.channel_mask = 0;
f.frequency_type = 0;
- f.frequency[0] = minrate;
- f.frequency[1] = maxrate;
+ for (i = 0; i __arraycount(hdaudio_afg_possible_rates); i++) {
+ u_int rate = hdaudio_afg_possible_rates[i];
+ if (hdaudio_afg_rate_supported(sc, rate))
+ f.frequency[f.frequency_type++] = rate;
+ }
#define HDAUDIO_INITFMT(ch, chmask) \
do { \
@@ -2895,17 +2904,11 @@
static void
hdaudio_afg_configure_encodings(struct hdaudio_afg_softc *sc)
{
- const u_int possible_rates[] = {
- 8000, 11025, 16000, 22050, 32000, 44100,
- 48000, 88200, 96000, 176500, 192000, /* 384000, */
- };
struct hdaudio_assoc *as = sc-sc_assocs;
struct audio_format f;
- u_int minrate, maxrate;
int nchan, i;
sc-sc_pchan = sc-sc_rchan = 0;
- minrate = maxrate = 0;
for (nchan = 0, i = 0; i sc-sc_nassocs; i++) {
nchan = hdaudio_afg_assoc_count_channels(sc, as[i],
@@ -2921,34 +2924,24 @@
}
hda_print(sc, %dch/%dch, sc-sc_pchan, sc-sc_rchan);
- for (i = 0; __arraycount(possible_rates); i++)
- if (hdaudio_afg_rate_supported(sc, possible_rates[i])) {
- minrate = possible_rates[i];
- break;
- }
- for (i = __arraycount(possible_rates) - 1; i = 0; i--)
- if (hdaudio_afg_rate_supported(sc, possible_rates[i])) {
- maxrate = possible_rates[i];
- break;
- }
- KASSERT(minrate 0 maxrate 0); /* impossible */
- hda_print1(sc, %uHz, minrate);
- if (minrate != maxrate)
- hda_print1(sc, -%uHz, maxrate);
+ for (i = 0; i __arraycount(hdaudio_afg_possible_rates); i++)
+ if (hdaudio_afg_rate_supported(sc,
+ hdaudio_afg_possible_rates[i]))
+ hda_print1(sc, %uHz, hdaudio_afg_possible_rates[i]);
- if (hdaudio_afg_probe_encoding(sc, minrate, maxrate, 8, 16, false))
+ if (hdaudio_afg_probe_encoding(sc, 8, 16, false))
hda_print1(sc, 8/16);
- if (hdaudio_afg_probe_encoding(sc, minrate, maxrate, 16, 16, false))
+ if (hdaudio_afg_probe_encoding(sc, 16, 16, false))
hda_print1(sc, 16/16);
- if (hdaudio_afg_probe_encoding(sc, minrate, maxrate, 20, 32, false))
+ if (hdaudio_afg_probe_encoding(sc, 20, 32, false))
hda_print1(sc, 20/32);
- if (hdaudio_afg_probe_encoding(sc, minrate, maxrate, 24, 32, false))
+ if (hdaudio_afg_probe_encoding(sc, 24, 32, false))
hda_print1(sc, 24/32);
- if (hdaudio_afg_probe_encoding(sc, minrate, maxrate, 32, 32, false))
+ if (hdaudio_afg_probe_encoding(sc, 32, 32, false))
hda_print1(sc, 32/32);
if (sc-sc_audiodev.ad_nformats == 0) {
- hdaudio_afg_probe_encoding(sc, minrate, maxrate, 16, 16, true);
+ hdaudio_afg_probe_encoding(sc, 16, 16, true);
hda_print1(sc, 16/16*);
}
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src
Committed By: adam
Date: Sun Nov 21 20:41:36 UTC 2010
Modified Files:
src/lib/libpam/modules/pam_ssh: pam_ssh.c
Log Message:
Use ssh_add_identity_constrained() instead of ssh_add_identity()
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libpam/modules/pam_ssh/pam_ssh.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/libpam/modules/pam_ssh/pam_ssh.c
diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.15 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.16
--- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.15 Sun Jan 27 01:23:20 2008
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Sun Nov 21 20:41:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ssh.c,v 1.15 2008/01/27 01:23:20 christos Exp $ */
+/* $NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $);
#else
-__RCSID($NetBSD: pam_ssh.c,v 1.15 2008/01/27 01:23:20 christos Exp $);
+__RCSID($NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam Exp $);
#endif
#include sys/param.h
@@ -376,7 +376,7 @@
pam_err = pam_get_data(pamh, *kfn, vp);
psk = vp;
if (pam_err == PAM_SUCCESS psk != NULL) {
- if (ssh_add_identity(ac, psk-key, psk-comment))
+ if (ssh_add_identity_constrained(ac, psk-key, psk-comment, 0, 0))
openpam_log(PAM_LOG_DEBUG,
added %s to ssh agent, psk-comment);
else
CVS commit: [netbsd-5] src/sys/dev/ic
Module Name:src
Committed By: riz
Date: Sun Nov 21 21:02:49 UTC 2010
Modified Files:
src/sys/dev/ic [netbsd-5]: ciss.c
Log Message:
Pull up following revision(s) (requested by pettai in ticket #1452):
sys/dev/ic/ciss.c: revision 1.23
Fix a performance problem with the ciss(4) driver. NetBSD does common
queueing at the scsipi midlayer, and if the midlayer is not requested to
enable tagged queueing, the midlayer will only queue one command to the
adapter driver for each device. The SmartArray adapter is capable of
handling multiple commands, and in the rather common case where there is
no battery backup and no write cache, doing single write commands is very
slow. The SmartArray adapter runs much better when several commands can
be issued to a device.
This has been observed and discussed in several list threads, notably:
http://mail-index.NetBSD.org/netbsd-users/2008/10/01/msg002083.html
http://mail-index.NetBSD.org/tech-kern/2008/11/30/msg003704.html
This also addresses PR kern/39686.
To enable tagged queueing, the adapter driver responds to the midlayer
request to set the transfer mode. However, the SmartArray does not respond
to the SCSI INQUIRY command with an ANSII field of 2 or more, so the
scsipi midlayer will ignore the CmdQue bit in the flags3 field of the
inquiry data. This fix will patch the inquiry data so set the ANSII field
to 2, and responds to the midlayer request to set the transfer mode by
requesting tagged queueing.
In addition, the original port of the driver did not set up the adapter
parameters correctly as mentioned in the second list thread mentioned
above. The adapt_openings is the total number of commands that the
adapter will accept rather than the number of commands divided by the
number of logical drives. Also, the adapt_max_periph is the maximum number
of commands which can be queued per peripheral device, not the number of
logical drives [which in the case of a single logical drive limited the
number of commands queued to 1].
I'm also suppressing an error message for invalid commands if the error
was due to the SCSI_SYNCHRONIZE_CACHE_10 command, since that command is
not supported by the SmartArray adapter, but used with wapbl(4) meta-data
journaling. Setting the ANSII version to 2 to allow enabling tagged queueing
also enables the use of the SCSI_SYNCHRONIZE_CACHE_10 command.
To generate a diff of this commit:
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 src/sys/dev/ic/ciss.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/ic/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.14.4.1 src/sys/dev/ic/ciss.c:1.14.4.2
--- src/sys/dev/ic/ciss.c:1.14.4.1 Sun Jul 26 18:33:35 2009
+++ src/sys/dev/ic/ciss.c Sun Nov 21 21:02:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.14.4.1 2009/07/26 18:33:35 snj Exp $ */
+/* $NetBSD: ciss.c,v 1.14.4.2 2010/11/21 21:02:49 riz Exp $ */
/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ciss.c,v 1.14.4.1 2009/07/26 18:33:35 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ciss.c,v 1.14.4.2 2010/11/21 21:02:49 riz Exp $);
#include bio.h
@@ -41,6 +41,7 @@
#include dev/scsipi/scsi_all.h
#include dev/scsipi/scsi_disk.h
#include dev/scsipi/scsiconf.h
+#include dev/scsipi/scsipi_all.h
#include dev/ic/cissreg.h
#include dev/ic/cissvar.h
@@ -363,7 +364,7 @@
sc-sc_channel.chan_channel = 0;
sc-sc_channel.chan_ntargets = sc-maxunits;
sc-sc_channel.chan_nluns = 1; /* ciss doesn't really have SCSI luns */
- sc-sc_channel.chan_openings = sc-maxcmd / (sc-maxunits? sc-maxunits : 1);
+ sc-sc_channel.chan_openings = sc-maxcmd;
#if NBIO 0
/* XXX Reserve some ccb's for sensor and bioctl. */
if (sc-sc_channel.chan_openings 2)
@@ -374,7 +375,7 @@
sc-sc_adapter.adapt_dev = (struct device *) sc;
sc-sc_adapter.adapt_openings = sc-sc_channel.chan_openings;
- sc-sc_adapter.adapt_max_periph = sc-maxunits;
+ sc-sc_adapter.adapt_max_periph = sc-sc_channel.chan_openings;
sc-sc_adapter.adapt_request = ciss_scsi_cmd;
sc-sc_adapter.adapt_minphys = cissminphys;
sc-sc_adapter.adapt_ioctl = ciss_scsi_ioctl;
@@ -618,6 +619,14 @@
if (xs) {
xs-resid = 0;
CISS_DPRINTF(CISS_D_CMD, (scsipi_done(%p) , xs));
+ if (xs-cmd-opcode == INQUIRY) {
+ struct scsipi_inquiry_data *inq;
+ inq = (struct scsipi_inquiry_data *)xs-data;
+ if ((inq-version SID_ANSII) == 0
+ (inq-flags3 SID_CmdQue) != 0) {
+inq-version |= 2;
+ }
+ }
scsipi_done(xs);
}
@@ -637,9 +646,11 @@
break;
case CISS_ERR_INVCMD:
- printf(%s: invalid cmd 0x%x: 0x%x is not valid @ 0x%x[%d]\n,
- device_xname(sc-sc_dev), ccb-ccb_cmd.id,
- err-err_info, err-err_type[3], err-err_type[2]);
+ if (xs == NULL ||
+ xs-cmd-opcode != SCSI_SYNCHRONIZE_CACHE_10)
+ printf(%s: invalid cmd 0x%x: 0x%x is not valid @ 0x%x[%d]\n,
+
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 21:05:44 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1443,1445,1446,1452 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 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.19 src/doc/CHANGES-5.2:1.1.2.20 --- src/doc/CHANGES-5.2:1.1.2.19 Sun Nov 21 20:24:59 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 21:05:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.19 2010/11/21 20:24:59 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.20 2010/11/21 21:05:44 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -704,3 +704,28 @@ Fix kern/43542: 32kHz playback sounds like hissing analog TV snow. [jmcneill, ticket #1442] +lib/libutil/parsedate.31.7 via patch +lib/libutil/parsedate.y1.5 + + Add support for parsing the data format @seconds since epoch e.g. + @735275209 for Tue Apr 20 03:06:49 UTC 1993. This change was + inspired by coreutil's date utility. + [tron, ticket #1443] + +sys/netinet6/in6_proto.c 1.89 +sys/netinet6/ip6_etherip.c 1.14 +sys/netinet6/ip6_etherip.h 1.2 + + Make the EtherIP in IPv6 input path work. + [jakllsch, ticket #1445] + +usr.sbin/sa/usrdb.c1.14 + + Fix corruption of /var/account/usracct files on LP64 platforms. + [dholland, ticket #1446] + +sys/dev/ic/ciss.c1.23 + + Fix a performance problem with the ciss(4) driver. PR#39686. + [pettai, ticket #1452] +
CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: jym Date: Sun Nov 21 21:07:46 UTC 2010 Modified Files: src/usr.sbin/installboot: installboot.8 Log Message: Sort options. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/usr.sbin/installboot/installboot.8 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/installboot/installboot.8 diff -u src/usr.sbin/installboot/installboot.8:1.74 src/usr.sbin/installboot/installboot.8:1.75 --- src/usr.sbin/installboot/installboot.8:1.74 Thu Jan 14 17:49:32 2010 +++ src/usr.sbin/installboot/installboot.8 Sun Nov 21 21:07:46 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: installboot.8,v 1.74 2010/01/14 17:49:32 drochner Exp $ +.\ $NetBSD: installboot.8,v 1.75 2010/11/21 21:07:46 jym Exp $ .\ .\ Copyright (c) 2002-2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -244,6 +244,13 @@ .Ar filesystem , which must be a regular file in this case. . +.It Sy bootconf +.Sy [ amd64 , +.Sy i386 ] +(Don't) read a +.Dq boot.cfg +file. +. .It Sy command=\*[Lt]boot command\*[Gt] .Sy [ amiga ] Modify the default boot command line. @@ -272,6 +279,11 @@ and .Sq z . . +.It Sy modules +.Sy [ amd64 , +.Sy i386 ] +(Don't) load kernel modules. +. .It Sy password=\*[Lt]password\*[Gt] .Sy [ amd64 , .Sy i386 ] @@ -305,18 +317,6 @@ .Sy [ amd64 , .Sy i386 ] Set the timeout before the automatic boot begins to the given number of seconds. -. -.It Sy modules -.Sy [ amd64 , -.Sy i386 ] -(Don't) load kernel modules. -. -.It Sy bootconf -.Sy [ amd64 , -.Sy i386 ] -(Don't) read a -.Dq boot.cfg -file. .El . .It Fl t Ar fstype
CVS commit: [netbsd-5] src/usr.bin/make
Module Name:src
Committed By: riz
Date: Sun Nov 21 18:45:00 UTC 2010
Modified Files:
src/usr.bin/make [netbsd-5]: job.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1433):
usr.bin/make/job.c: revision 1.152
PR/43643: David A. Holland: dash prefix broken with make -j
As the comment says in JobPrintJob set JOB_IGNERR with - commands. Fix
whitespace so that the output is consistent, although there are two separate
execution logic implementations (command.c, job.c)
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.141.2.1 src/usr.bin/make/job.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/make/job.c
diff -u src/usr.bin/make/job.c:1.141 src/usr.bin/make/job.c:1.141.2.1
--- src/usr.bin/make/job.c:1.141 Wed Oct 29 15:37:08 2008
+++ src/usr.bin/make/job.c Sun Nov 21 18:45:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.141 2008/10/29 15:37:08 sjg Exp $ */
+/* $NetBSD: job.c,v 1.141.2.1 2010/11/21 18:45:00 riz Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: job.c,v 1.141 2008/10/29 15:37:08 sjg Exp $;
+static char rcsid[] = $NetBSD: job.c,v 1.141.2.1 2010/11/21 18:45:00 riz Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)job.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: job.c,v 1.141 2008/10/29 15:37:08 sjg Exp $);
+__RCSID($NetBSD: job.c,v 1.141.2.1 2010/11/21 18:45:00 riz Exp $);
#endif
#endif /* not lint */
#endif
@@ -713,6 +713,7 @@
shutUp = DEBUG(LOUD) ? FALSE : TRUE;
break;
case '-':
+ job-flags |= JOB_IGNERR;
errOff = TRUE;
break;
case '+':
@@ -761,7 +762,7 @@
}
if (errOff) {
- if ( !(job-flags JOB_IGNERR) !noSpecials) {
+ if (!noSpecials) {
if (commandShell-hasErrCtl) {
/*
* we don't want the error-control commands showing
@@ -1019,7 +1020,7 @@
(void)printf(*** [%s] Error code %d%s\n,
job-node-name,
WEXITSTATUS(status),
- (job-flags JOB_IGNERR) ? (ignored) : );
+ (job-flags JOB_IGNERR) ? (ignored) : );
if (job-flags JOB_IGNERR)
status = 0;
} else if (DEBUG(JOB)) {
@@ -1229,11 +1230,11 @@
}
if (gn-type OP_OPTIONAL) {
- (void)fprintf(stdout, %s%s %s(ignored)\n, progname,
+ (void)fprintf(stdout, %s%s %s (ignored)\n, progname,
msg, gn-name);
(void)fflush(stdout);
} else if (keepgoing) {
- (void)fprintf(stdout, %s%s %s(continuing)\n, progname,
+ (void)fprintf(stdout, %s%s %s (continuing)\n, progname,
msg, gn-name);
(void)fflush(stdout);
return FALSE;
CVS commit: [netbsd-5] src/sys/dev/dkwedge
Module Name:src
Committed By: riz
Date: Sun Nov 21 18:50:17 UTC 2010
Modified Files:
src/sys/dev/dkwedge [netbsd-5]: dk.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1435):
sys/dev/dkwedge/dk.c: revision 1.57
Make sure to release sc_parent-dk_rawlock before calling
vn_close(sc-sc_parent-dk_rawvp). Avoids a lockdebug panic:
error: mutex_destroy: assertion failed: !MUTEX_OWNED(mtx-mtx_owner)
!MUTEX_HAS_WAITERS(mtx)
when the parent is a raidframe device.
See also:
http://mail-index.netbsd.org/tech-kern/2010/07/27/msg008612.html
To generate a diff of this commit:
cvs rdiff -u -r1.42.6.2 -r1.42.6.3 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.42.6.2 src/sys/dev/dkwedge/dk.c:1.42.6.3
--- src/sys/dev/dkwedge/dk.c:1.42.6.2 Sat Jan 30 19:00:46 2010
+++ src/sys/dev/dkwedge/dk.c Sun Nov 21 18:50:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.42.6.2 2010/01/30 19:00:46 snj Exp $ */
+/* $NetBSD: dk.c,v 1.42.6.3 2010/11/21 18:50:17 riz Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.42.6.2 2010/01/30 19:00:46 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: dk.c,v 1.42.6.3 2010/11/21 18:50:17 riz Exp $);
#include opt_dkwedge.h
@@ -476,17 +476,18 @@
/* Clean up the parent. */
mutex_enter(sc-sc_dk.dk_openlock);
- mutex_enter(sc-sc_parent-dk_rawlock);
if (sc-sc_dk.dk_openmask) {
+ mutex_enter(sc-sc_parent-dk_rawlock);
if (sc-sc_parent-dk_rawopens-- == 1) {
KASSERT(sc-sc_parent-dk_rawvp != NULL);
+ mutex_exit(sc-sc_parent-dk_rawlock);
(void) vn_close(sc-sc_parent-dk_rawvp, FREAD | FWRITE,
NOCRED);
sc-sc_parent-dk_rawvp = NULL;
- }
+ } else
+ mutex_exit(sc-sc_parent-dk_rawlock);
sc-sc_dk.dk_openmask = 0;
}
- mutex_exit(sc-sc_parent-dk_rawlock);
mutex_exit(sc-sc_dk.dk_openlock);
/* Announce our departure. */
@@ -968,7 +969,6 @@
KASSERT(sc-sc_dk.dk_openmask != 0);
mutex_enter(sc-sc_dk.dk_openlock);
- mutex_enter(sc-sc_parent-dk_rawlock);
if (fmt == S_IFCHR)
sc-sc_dk.dk_copenmask = ~1;
@@ -978,15 +978,17 @@
sc-sc_dk.dk_copenmask | sc-sc_dk.dk_bopenmask;
if (sc-sc_dk.dk_openmask == 0) {
+ mutex_enter(sc-sc_parent-dk_rawlock);
if (sc-sc_parent-dk_rawopens-- == 1) {
KASSERT(sc-sc_parent-dk_rawvp != NULL);
+ mutex_exit(sc-sc_parent-dk_rawlock);
error = vn_close(sc-sc_parent-dk_rawvp,
FREAD | FWRITE, NOCRED);
sc-sc_parent-dk_rawvp = NULL;
- }
+ } else
+ mutex_exit(sc-sc_parent-dk_rawlock);
}
- mutex_exit(sc-sc_parent-dk_rawlock);
mutex_exit(sc-sc_dk.dk_openlock);
return (error);
CVS commit: [netbsd-5] src/sys/arch
Module Name:src Committed By: riz Date: Sun Nov 21 17:43:03 UTC 2010 Modified Files: src/sys/arch/amd64/conf [netbsd-5]: XEN3_DOM0 src/sys/arch/i386/conf [netbsd-5]: XEN2_DOM0 Log Message: Pull up following revision(s) (requested by bouyer in ticket #1419): sys/arch/i386/conf/XEN2_DOM0: patch sys/arch/amd64/conf/XEN3_DOM0: revision 1.55 Sync DKWEDGE options with GENERIC To generate a diff of this commit: cvs rdiff -u -r1.33.4.5 -r1.33.4.6 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.53.2.5 -r1.53.2.6 src/sys/arch/i386/conf/XEN2_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.33.4.5 src/sys/arch/amd64/conf/XEN3_DOM0:1.33.4.6 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.33.4.5 Sun Nov 21 03:05:09 2010 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Nov 21 17:43:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.33.4.5 2010/11/21 03:05:09 riz Exp $ +# $NetBSD: XEN3_DOM0,v 1.33.4.6 2010/11/21 17:43:03 riz Exp $ include arch/amd64/conf/std.xen @@ -69,6 +69,13 @@ options EXEC_ELF32 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux) Index: src/sys/arch/i386/conf/XEN2_DOM0 diff -u src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.5 src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.6 --- src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.5 Sun Nov 21 03:05:05 2010 +++ src/sys/arch/i386/conf/XEN2_DOM0 Sun Nov 21 17:43:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN2_DOM0,v 1.53.2.5 2010/11/21 03:05:05 riz Exp $ +# $NetBSD: XEN2_DOM0,v 1.53.2.6 2010/11/21 17:43:03 riz Exp $ include arch/xen/conf/std.xen @@ -89,6 +89,13 @@ #options COMPAT_PECOFF # kernel support to run Win32 apps options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux)
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 18:50:49 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1435. To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 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.16 src/doc/CHANGES-5.2:1.1.2.17 --- src/doc/CHANGES-5.2:1.1.2.16 Sun Nov 21 18:47:39 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 18:50:49 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.16 2010/11/21 18:47:39 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.17 2010/11/21 18:50:49 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -668,3 +668,8 @@ root directory instead of the erroneous EROFS. [mlelstv, ticket #1434] +sys/dev/dkwedge/dk.c1.57 via patch + + Avoid a lockdebug panic for dk(4) on raid(4). + [bouyer, ticket #1435] +
CVS commit: [netbsd-5] src/sys
Module Name:src
Committed By: riz
Date: Sun Nov 21 21:27:37 UTC 2010
Modified Files:
src/sys/arch/vax/vsa [netbsd-5]: dz_vsbus.c spx.c
src/sys/dev/dec [netbsd-5]: dz.c
Log Message:
Pull up following revision(s) (requested by hans in ticket #1459):
sys/arch/vax/vsa/dz_vsbus.c: revision 1.41
sys/dev/dec/dz.c: revision 1.39
sys/arch/vax/vsa/spx.c: revision 1.3
Make SPX work as console device on VAXstation 4000/9x.
Make console keyboard work on VAXstation 4000/9x. Seems not to break
anything on other VAXstations (tested on 4000 VLC).
The interrupt handler uses the softc, so it's probably a good idea to
initialize it before causing interrupts. Prevents a panic on VAXstation
4000/9x with SPX console.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.14.1 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.1 -r1.1.10.1 src/sys/arch/vax/vsa/spx.c
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/dev/dec/dz.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/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.40 src/sys/arch/vax/vsa/dz_vsbus.c:1.40.14.1
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.40 Sat Mar 15 00:57:15 2008
+++ src/sys/arch/vax/vsa/dz_vsbus.c Sun Nov 21 21:27:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_vsbus.c,v 1.40 2008/03/15 00:57:15 matt Exp $ */
+/* $NetBSD: dz_vsbus.c,v 1.40.14.1 2010/11/21 21:27:37 riz Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dz_vsbus.c,v 1.40 2008/03/15 00:57:15 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: dz_vsbus.c,v 1.40.14.1 2010/11/21 21:27:37 riz Exp $);
#include sys/param.h
#include sys/proc.h
@@ -162,7 +162,7 @@
* due to the nature of how bus_space_* works on VAX, this will
* be perfectly good until everything is converted.
*/
- if (dz_regs == 0) /* This isn't console */ {
+ if (cn_tab-cn_dev != makedev(cdevsw_lookup_major(dz_cdevsw), 0)) {
dz_regs = vax_map_physmem(va-va_paddr, 1);
consline = -1;
} else
@@ -286,6 +286,9 @@
dz_regs = iospace;
dz = (void *)dz_regs;
ioaccess(iospace, ioaddr, 1);
+ dz-csr = 0;/* Disable scanning until initting is done */
+ dz-tcr = (1 minor(cndev-cn_dev));/* Turn on xmitter */
+ dz-csr = 0x20; /* Turn scanning back on */
}
void
Index: src/sys/arch/vax/vsa/spx.c
diff -u src/sys/arch/vax/vsa/spx.c:1.1 src/sys/arch/vax/vsa/spx.c:1.1.10.1
--- src/sys/arch/vax/vsa/spx.c:1.1 Tue Aug 12 17:54:47 2008
+++ src/sys/arch/vax/vsa/spx.c Sun Nov 21 21:27:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spx.c,v 1.1 2008/08/12 17:54:47 hans Exp $ */
+/* $NetBSD: spx.c,v 1.1.10.1 2010/11/21 21:27:37 riz Exp $ */
/*
* SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
* Copyright (c) 2005 Blaz Antonic
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.1 2008/08/12 17:54:47 hans Exp $);
+__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.1.10.1 2010/11/21 21:27:37 riz Exp $);
#include sys/param.h
#include sys/device.h
@@ -86,7 +86,7 @@
/*
* off-screen font storage space
- * 32x16 glyphs, 256 regular and underliend chars
+ * 32x16 glyphs, 256 regular and underlined chars
*/
#define FONT_STORAGE_START (spx_xsize * spx_ysize)
#define FONT_STORAGE_SIZE (32 * 16 * 256 * 2)
@@ -204,7 +204,7 @@
static void spx_cursor(void *, int, int, int);
static int spx_mapchar(void *, int, unsigned int *);
static void spx_putchar(void *, int, int, u_int, long);
-static void spx_copycols(void *, int, int, int,int);
+static void spx_copycols(void *, int, int, int, int);
static void spx_erasecols(void *, int, int, int, long);
static void spx_copyrows(void *, int, int, int);
static void spx_eraserows(void *, int, int, long);
@@ -595,7 +595,8 @@
counter--;
}
-int spx_match(device_t parent, cfdata_t match, void *aux)
+int
+spx_match(device_t parent, cfdata_t match, void *aux)
{
struct vsbus_softc *sc = device_private(parent);
#if 0
@@ -608,31 +609,10 @@
* add KA46 when/if ever somebody reports SPXg vax_confdata ID on VS 4000/60
* Ditto for SPX ID on KA42 KA43
*/
- if (vax_boardtype != VAX_BTYP_49)
+ if ((vax_boardtype != VAX_BTYP_49) ||
+ ((vax_confdata (CONF_LCSPX | CONF_SPXg)) == 0))
return 0;
- /* KA49: Identify framebuffer type */
- switch (vax_confdata (CONF_LCSPX | CONF_SPXg)) {
- case CONF_LCSPX:
- fb_type = FB_IS_SPX;
- spx_blkcpy_func = SPX_blkcpy;
- spx_blkset_func = SPX_blkset;
- spx_putchar_func = SPX_putchar;
- break;
- case CONF_SPXg:
- fb_type = FB_IS_SPXg;
- spx_blkcpy_func = SPXg_blkcpy;
- spx_blkset_func = SPXg_blkset;
- spx_putchar_func = SPXg_putchar;
- break;
- case 0:
- aprint_error(spx_match: no framebuffer found\n);
- break;
- case CONF_LCSPX | CONF_SPXg:
- panic(spx_match: incorrect FB configuration\n);
- break;
- }
-
/* FIXME
CVS commit: [netbsd-5] src/sbin/routed
Module Name:src
Committed By: riz
Date: Sun Nov 21 21:30:21 UTC 2010
Modified Files:
src/sbin/routed [netbsd-5]: if.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #1460):
sbin/routed/if.c: revision 1.29
Memcpy into local variable to ensure proper alignement.
Fixes PR port-sparc64/43965.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.16.1 src/sbin/routed/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/routed/if.c
diff -u src/sbin/routed/if.c:1.26 src/sbin/routed/if.c:1.26.16.1
--- src/sbin/routed/if.c:1.26 Tue Aug 14 03:39:19 2007
+++ src/sbin/routed/if.c Sun Nov 21 21:30:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.26 2007/08/14 03:39:19 dyoung Exp $ */
+/* $NetBSD: if.c,v 1.26.16.1 2010/11/21 21:30:20 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#include pathnames.h
#ifdef __NetBSD__
-__RCSID($NetBSD: if.c,v 1.26 2007/08/14 03:39:19 dyoung Exp $);
+__RCSID($NetBSD: if.c,v 1.26.16.1 2010/11/21 21:30:20 riz Exp $);
#elif defined(__FreeBSD__)
__RCSID($FreeBSD$);
#else
@@ -693,7 +693,7 @@
struct rt_entry *rt;
size_t needed;
int mib[6];
- struct if_msghdr *ifm;
+ struct if_msghdr ifm;
struct ifa_msghdr *ifam, *ifam_lim, *ifam2;
int in, ierr, out, oerr;
struct intnet *intnetp;
@@ -751,25 +751,26 @@
if (ifam-ifam_type == RTM_IFINFO) {
const struct sockaddr_dl *sdl;
- ifm = (struct if_msghdr *)ifam;
+ memcpy(ifm, ifam, sizeof ifm);
/* make prototype structure for the IP aliases
*/
memset(ifs0, 0, sizeof(ifs0));
ifs0.int_rip_sock = -1;
- ifs0.int_index = ifm-ifm_index;
- ifs0.int_if_flags = ifm-ifm_flags;
+ ifs0.int_index = ifm.ifm_index;
+ ifs0.int_if_flags = ifm.ifm_flags;
ifs0.int_state = IS_CHECKED;
ifs0.int_query_time = NEVER;
ifs0.int_act_time = now.tv_sec;
ifs0.int_data.ts = now.tv_sec;
- ifs0.int_data.ipackets = ifm-ifm_data.ifi_ipackets;
- ifs0.int_data.ierrors = ifm-ifm_data.ifi_ierrors;
- ifs0.int_data.opackets = ifm-ifm_data.ifi_opackets;
- ifs0.int_data.oerrors = ifm-ifm_data.ifi_oerrors;
+ ifs0.int_data.ipackets = ifm.ifm_data.ifi_ipackets;
+ ifs0.int_data.ierrors = ifm.ifm_data.ifi_ierrors;
+ ifs0.int_data.opackets = ifm.ifm_data.ifi_opackets;
+ ifs0.int_data.oerrors = ifm.ifm_data.ifi_oerrors;
#ifdef sgi
- ifs0.int_data.odrops = ifm-ifm_data.ifi_odrops;
+ ifs0.int_data.odrops = ifm.ifm_data.ifi_odrops;
#endif
- sdl = (const struct sockaddr_dl *)(ifm + 1);
+ sdl = (const struct sockaddr_dl *)
+((struct if_msghdr *)ifam + 1);
/* NUL-termination by memset, above. */
memcpy(ifs0.int_name, sdl-sdl_data,
MIN(sizeof(ifs0.int_name) - 1, sdl-sdl_nlen));
CVS commit: [netbsd-5] src/sys/netbt
Module Name:src
Committed By: riz
Date: Sun Nov 21 21:36:07 UTC 2010
Modified Files:
src/sys/netbt [netbsd-5]: hci_link.c
Log Message:
Pull up following revision(s) (requested by plunky in ticket #1461):
sys/netbt/hci_link.c: revision 1.22
Some Broadcom controllers emit empty ACL packets during connection
setup, using the handle that they have not yet told us for the
connection-to-be. Disconnecting can cause problems so just ignore
zero length ACL packets on unknown connection handles.
fixes a problem reported by Nick Hudson
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.12.1 src/sys/netbt/hci_link.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/netbt/hci_link.c
diff -u src/sys/netbt/hci_link.c:1.20 src/sys/netbt/hci_link.c:1.20.12.1
--- src/sys/netbt/hci_link.c:1.20 Thu Apr 24 11:38:37 2008
+++ src/sys/netbt/hci_link.c Sun Nov 21 21:36:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hci_link.c,v 1.20 2008/04/24 11:38:37 ad Exp $ */
+/* $NetBSD: hci_link.c,v 1.20.12.1 2010/11/21 21:36:07 riz Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hci_link.c,v 1.20 2008/04/24 11:38:37 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: hci_link.c,v 1.20.12.1 2010/11/21 21:36:07 riz Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -450,10 +450,16 @@
* for, just get rid of it. This may happen, if a USB dongle
* is plugged into a self powered hub and does not reset when
* the system is shut down.
+ *
+ * This can cause a problem with some Broadcom controllers
+ * which emit empty ACL packets during connection setup, so
+ * only disconnect where data is present.
*/
- cp.con_handle = htole16(handle);
- cp.reason = 0x13; /* Remote User Terminated Connection */
- hci_send_cmd(unit, HCI_CMD_DISCONNECT, cp, sizeof(cp));
+ if (hdr.length 0) {
+ cp.con_handle = htole16(handle);
+ cp.reason = 0x13;/*Remote User Terminated Connection*/
+ hci_send_cmd(unit, HCI_CMD_DISCONNECT, cp, sizeof(cp));
+ }
goto bad;
}
CVS commit: [netbsd-4] src/sys/netbt
Module Name:src
Committed By: riz
Date: Sun Nov 21 21:38:19 UTC 2010
Modified Files:
src/sys/netbt [netbsd-4]: hci_link.c
Log Message:
Pull up following revision(s) (requested by plunky in ticket #1409):
sys/netbt/hci_link.c: revision 1.22
Some Broadcom controllers emit empty ACL packets during connection
setup, using the handle that they have not yet told us for the
connection-to-be. Disconnecting can cause problems so just ignore
zero length ACL packets on unknown connection handles.
fixes a problem reported by Nick Hudson
To generate a diff of this commit:
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/netbt/hci_link.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/netbt/hci_link.c
diff -u src/sys/netbt/hci_link.c:1.8.2.1 src/sys/netbt/hci_link.c:1.8.2.2
--- src/sys/netbt/hci_link.c:1.8.2.1 Thu Jul 19 16:04:18 2007
+++ src/sys/netbt/hci_link.c Sun Nov 21 21:38:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hci_link.c,v 1.8.2.1 2007/07/19 16:04:18 liamjfoy Exp $ */
+/* $NetBSD: hci_link.c,v 1.8.2.2 2010/11/21 21:38:19 riz Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hci_link.c,v 1.8.2.1 2007/07/19 16:04:18 liamjfoy Exp $);
+__KERNEL_RCSID(0, $NetBSD: hci_link.c,v 1.8.2.2 2010/11/21 21:38:19 riz Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -453,10 +453,16 @@
* for, just get rid of it. This may happen, if a USB dongle
* is plugged into a self powered hub and does not reset when
* the system is shut down.
+ *
+ * This can cause a problem with some Broadcom controllers
+ * which emit empty ACL packets during connection setup, so
+ * only disconnect where data is present.
*/
- cp.con_handle = htole16(handle);
- cp.reason = 0x13; /* Remote User Terminated Connection */
- hci_send_cmd(unit, HCI_CMD_DISCONNECT, cp, sizeof(cp));
+ if (hdr.length 0) {
+ cp.con_handle = htole16(handle);
+ cp.reason = 0x13;/*Remote User Terminated Connection*/
+ hci_send_cmd(unit, HCI_CMD_DISCONNECT, cp, sizeof(cp));
+ }
goto bad;
}
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 21:39:18 UTC 2010 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 1409. To generate a diff of this commit: cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-4.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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.209 src/doc/CHANGES-4.1:1.1.2.210 --- src/doc/CHANGES-4.1:1.1.2.209 Tue Oct 12 10:17:39 2010 +++ src/doc/CHANGES-4.1 Sun Nov 21 21:39:18 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.209 2010/10/12 10:17:39 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.210 2010/11/21 21:39:18 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4259,3 +4259,8 @@ I was getting a SEGV with the example posted there. [jnemeth, ticket #1408] +sys/netbt/hci_link.c1.22 + + Fix bluetooth connection for some Broadcom controllers. + [plunky, ticket #1409] +
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 19:11:10 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: openssh2netbsd Removed Files: src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper: Makefile Log Message: We don't need dist/ssh-pkcs11-helper/Makefile To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/openssh2netbsd cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/openssh2netbsd diff -u src/crypto/external/bsd/openssh/dist/openssh2netbsd:1.1 src/crypto/external/bsd/openssh/dist/openssh2netbsd:1.2 --- src/crypto/external/bsd/openssh/dist/openssh2netbsd:1.1 Sun Jun 7 22:38:47 2009 +++ src/crypto/external/bsd/openssh/dist/openssh2netbsd Sun Nov 21 19:11:09 2010 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: openssh2netbsd,v 1.1 2009/06/07 22:38:47 christos Exp $ +# $NetBSD: openssh2netbsd,v 1.2 2010/11/21 19:11:09 adam Exp $ # # Copyright (c) 2001 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,7 +33,7 @@ ### Remove Makefile and subdirs rm -r Makefile Makefile.inc -rm -r lib ssh-add ssh scp ssh-agent sshd sftp-server ssh-keygen sftp ssh-keyscan ssh-keysign +rm -r lib ssh-add ssh scp ssh-agent sshd sftp-server ssh-keygen sftp ssh-keyscan ssh-keysign ssh-pkcs11-helper ### add NetBSD RCS tag for i in *.c *.h; do
CVS commit: [netbsd-5] src/sys/dev
Module Name:src
Committed By: riz
Date: Sun Nov 21 21:44:07 UTC 2010
Modified Files:
src/sys/dev/acpi [netbsd-5]: wb_acpi.c
src/sys/dev/ic [netbsd-5]: w83l518d.c w83l518d_sdmmc.c w83l518d_sdmmc.h
w83l518dvar.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1462):
sys/dev/acpi/wb_acpi.c: revision 1.3
sys/dev/ic/w83l518d_sdmmc.c: revision 1.2
sys/dev/ic/w83l518d_sdmmc.h: revision 1.2
sys/dev/ic/w83l518d.c: revision 1.2
sys/dev/ic/w83l518dvar.h: revision 1.2
add suspend/resume support
add pmf support
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/acpi/wb_acpi.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/ic/w83l518d.c \
src/sys/dev/ic/w83l518d_sdmmc.c src/sys/dev/ic/w83l518d_sdmmc.h \
src/sys/dev/ic/w83l518dvar.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/acpi/wb_acpi.c
diff -u src/sys/dev/acpi/wb_acpi.c:1.1.2.2 src/sys/dev/acpi/wb_acpi.c:1.1.2.3
--- src/sys/dev/acpi/wb_acpi.c:1.1.2.2 Thu Oct 8 09:47:09 2009
+++ src/sys/dev/acpi/wb_acpi.c Sun Nov 21 21:44:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wb_acpi.c,v 1.1.2.2 2009/10/08 09:47:09 sborrill Exp $ */
+/* $NetBSD: wb_acpi.c,v 1.1.2.3 2010/11/21 21:44:07 riz Exp $ */
/*
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -26,38 +26,39 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wb_acpi.c,v 1.1.2.2 2009/10/08 09:47:09 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: wb_acpi.c,v 1.1.2.3 2010/11/21 21:44:07 riz Exp $);
#include sys/param.h
-#include sys/systm.h
-#include sys/errno.h
-#include sys/ioctl.h
-#include sys/syslog.h
#include sys/device.h
-#include sys/proc.h
-
-#include sys/bus.h
-
-#include dev/isa/isavar.h
-#include dev/isa/isadmavar.h
+#include sys/systm.h
-#include dev/acpi/acpica.h
#include dev/acpi/acpireg.h
#include dev/acpi/acpivar.h
-#include dev/sdmmc/sdmmcvar.h
#include dev/ic/w83l518dvar.h
#include dev/ic/w83l518dreg.h
+#include dev/isa/isadmavar.h
+
+#include dev/sdmmc/sdmmcvar.h
+
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME (wb_acpi)
+
static int wb_acpi_match(device_t, cfdata_t, void *);
static void wb_acpi_attach(device_t, device_t, void *);
static int wb_acpi_detach(device_t, int);
+static bool wb_acpi_suspend(device_t PMF_FN_PROTO);
+static bool wb_acpi_resume(device_t PMF_FN_PROTO);
struct wb_acpi_softc {
struct wb_softc sc_wb;
isa_chipset_tag_t sc_ic;
void *sc_ih;
int sc_ioh_length;
+
+ ACPI_HANDLE sc_crs, sc_srs;
+ ACPI_BUFFER sc_crs_buffer;
};
CFATTACH_DECL_NEW(wb_acpi, sizeof(struct wb_acpi_softc),
@@ -104,6 +105,16 @@
if (ACPI_FAILURE(rv))
return;
+ AcpiGetHandle(aa-aa_node-ad_handle, _CRS, sc-sc_crs);
+ AcpiGetHandle(aa-aa_node-ad_handle, _SRS, sc-sc_srs);
+ if (sc-sc_crs sc-sc_srs) {
+ sc-sc_crs_buffer.Pointer = NULL;
+ sc-sc_crs_buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
+ rv = AcpiGetCurrentResources(sc-sc_crs, sc-sc_crs_buffer);
+ if (ACPI_FAILURE(rv))
+ sc-sc_crs = sc-sc_srs = NULL;
+ }
+
io = acpi_res_io(res, 0);
irq = acpi_res_irq(res, 0);
if (io == NULL || irq == NULL) {
@@ -133,6 +144,8 @@
sc-sc_wb.wb_irq = irq-ar_irq;
sc-sc_wb.wb_base = io-ar_base;
wb_attach(sc-sc_wb);
+
+ pmf_device_register(self, wb_acpi_suspend, wb_acpi_resume);
cleanup:
acpi_resource_cleanup(res);
@@ -144,6 +157,11 @@
struct wb_acpi_softc *sc = device_private(self);
int rv;
+ pmf_device_deregister(self);
+
+ if (sc-sc_crs_buffer.Pointer)
+ ACPI_FREE(sc-sc_crs_buffer.Pointer);
+
rv = wb_detach(sc-sc_wb, flags);
if (rv)
return rv;
@@ -157,3 +175,27 @@
return 0;
}
+
+static bool
+wb_acpi_suspend(device_t self PMF_FN_ARGS)
+{
+ struct wb_acpi_softc *sc = device_private(self);
+
+ return wb_suspend(sc-sc_wb);
+}
+
+static bool
+wb_acpi_resume(device_t self PMF_FN_ARGS)
+{
+ struct wb_acpi_softc *sc = device_private(self);
+ ACPI_STATUS rv;
+
+ if (sc-sc_crs sc-sc_srs) {
+ rv = AcpiSetCurrentResources(sc-sc_srs, sc-sc_crs_buffer);
+ if (ACPI_FAILURE(rv))
+ printf(%s: _SRS failed: %s\n,
+ device_xname(self), AcpiFormatException(rv));
+ }
+
+ return wb_resume(sc-sc_wb);
+}
Index: src/sys/dev/ic/w83l518d.c
diff -u src/sys/dev/ic/w83l518d.c:1.1.2.2 src/sys/dev/ic/w83l518d.c:1.1.2.3
--- src/sys/dev/ic/w83l518d.c:1.1.2.2 Thu Oct 8 09:47:09 2009
+++ src/sys/dev/ic/w83l518d.c Sun Nov 21 21:44:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: w83l518d.c,v 1.1.2.2 2009/10/08 09:47:09 sborrill Exp $ */
+/* $NetBSD: w83l518d.c,v 1.1.2.3 2010/11/21 21:44:07 riz Exp $ */
/*
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: w83l518d.c,v 1.1.2.2 2009/10/08 09:47:09 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: w83l518d.c,v 1.1.2.3 2010/11/21 21:44:07 riz Exp $);
#include sys/param.h
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Nov 21 21:46:43 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Added Files:
src/sys/rump/librump/rumpkern: atomic_cas_up.c
Log Message:
Add a lockless uniprocessor version of atomic_cas_generic.c, which
is currently used by all the archs that previously used cas_generic.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/atomic_cas_up.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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.99 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.100
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.99 Sun Nov 21 17:34:11 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Nov 21 21:46:43 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.99 2010/11/21 17:34:11 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.100 2010/11/21 21:46:43 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -167,13 +167,15 @@
# Some architectures require a little special massage with atomic
# compare-and-swap. This is because the kernel version is using
# instructions or routines unavailable to us in userspace. We
-# use effectively the multiprocessor version of the userspace ops.
+# use a very simple CAS routine which (correctly) assumes non-SMP
+# and no preemption. If some of these archs later develop MP
+# support, switch them to use atomic_cas_generic.c
#
.if ${MACHINE_CPU} == arm || ${MACHINE_CPU} == hppa \
|| ${MACHINE_CPU} == mips || ${MACHINE_CPU} == sh3 \
|| ${MACHINE_CPU} == vax || ${MACHINE_ARCH} == m68000
CPPFLAGS+= -I${RUMPTOP}/../../common/lib/libc/atomic
-SRCS+= atomic_cas_generic.c
+SRCS+= atomic_cas_up.c
.endif
.include bsd.lib.mk
Added files:
Index: src/sys/rump/librump/rumpkern/atomic_cas_up.c
diff -u /dev/null src/sys/rump/librump/rumpkern/atomic_cas_up.c:1.1
--- /dev/null Sun Nov 21 21:46:43 2010
+++ src/sys/rump/librump/rumpkern/atomic_cas_up.c Sun Nov 21 21:46:43 2010
@@ -0,0 +1,60 @@
+/* $NetBSD: atomic_cas_up.c,v 1.1 2010/11/21 21:46:43 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2010 Antti Kantee. 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 AUTHOR 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 AUTHOR 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 sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: atomic_cas_up.c,v 1.1 2010/11/21 21:46:43 pooka Exp $);
+
+/*
+ * Uniprocessor version of atomic CAS. Since there is no preemption
+ * in rump, this is a piece of cake.
+ */
+
+#include sys/types.h
+
+uint32_t rumpup_cas_32_up(volatile uint32_t *ptr, uint32_t, uint32_t);
+
+uint32_t
+rumpup_cas_32_up(volatile uint32_t *ptr, uint32_t old, uint32_t new)
+{
+ uint32_t ret;
+
+ ret = *ptr;
+ if (__predict_true(ret == old)) {
+ *ptr = new;
+ }
+
+ return ret;
+}
+
+__strong_alias(atomic_cas_32,rumpup_cas_32_up)
+__strong_alias(atomic_cas_uint,rumpup_cas_32_up)
+__strong_alias(atomic_cas_ulong,rumpup_cas_32_up)
+__strong_alias(atomic_cas_ptr,rumpup_cas_32_up)
+__strong_alias(atomic_cas_32_ni,rumpup_cas_32_up)
+__strong_alias(atomic_cas_uint_ni,rumpup_cas_32_up)
+__strong_alias(atomic_cas_ulong_ni,rumpup_cas_32_up)
+__strong_alias(atomic_cas_ptr_ni,rumpup_cas_32_up)
CVS commit: [netbsd-5] src/sys/kern
Module Name:src Committed By: riz Date: Sun Nov 21 21:48:29 UTC 2010 Modified Files: src/sys/kern [netbsd-5]: subr_disk.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1463): sys/kern/subr_disk.c: revision 1.100 add some (uint64_t) casts so avoid 32 bit overflows. this fixes my 3TB disk with 4KB sectors and disklabel (which looks like it would work upto 16TB.) idea from mlel...@. To generate a diff of this commit: cvs rdiff -u -r1.93.10.1 -r1.93.10.2 src/sys/kern/subr_disk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_disk.c diff -u src/sys/kern/subr_disk.c:1.93.10.1 src/sys/kern/subr_disk.c:1.93.10.2 --- src/sys/kern/subr_disk.c:1.93.10.1 Sat Apr 4 17:49:21 2009 +++ src/sys/kern/subr_disk.c Sun Nov 21 21:48:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_disk.c,v 1.93.10.1 2009/04/04 17:49:21 snj Exp $ */ +/* $NetBSD: subr_disk.c,v 1.93.10.2 2010/11/21 21:48:28 riz Exp $ */ /*- * Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_disk.c,v 1.93.10.1 2009/04/04 17:49:21 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_disk.c,v 1.93.10.2 2010/11/21 21:48:28 riz Exp $); #include sys/param.h #include sys/kernel.h @@ -348,8 +348,8 @@ return -1; } - p_size = p-p_size dk-dk_blkshift; - p_offset = p-p_offset dk-dk_blkshift; + p_size = (uint64_t)p-p_size dk-dk_blkshift; + p_offset = (uint64_t)p-p_offset dk-dk_blkshift; #if RAW_PART == 3 labelsector = lp-d_partitions[2].p_offset; #else
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 18:13:13 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1421, 1422. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 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.13 src/doc/CHANGES-5.2:1.1.2.14 --- src/doc/CHANGES-5.2:1.1.2.13 Sun Nov 21 17:44:15 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 18:13:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.13 2010/11/21 17:44:15 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.14 2010/11/21 18:13:12 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -314,3 +314,16 @@ Sync DKWEDGE options with GENERIC [bouyer, ticket #1419] +sys/uvm/uvm_bio.c1.69-70 via patch +sys/uvm/uvm_fault.c1.175 via patch +sys/uvm/uvm_map.c1.292 via patch +sys/uvm/uvm_pager.c1.98 via patch + + UVM pmap_update() fixes. + [rmind, ticket #1421] + +external/bsd/top/dist/display.c 1.8 via patch + + Avoid steps and other artefacts in head for more than 9 CPUs. + [is, ticket #1422] +
CVS commit: [netbsd-4] src/sys/kern
Module Name:src Committed By: riz Date: Sun Nov 21 21:52:04 UTC 2010 Modified Files: src/sys/kern [netbsd-4]: subr_disk.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1411): sys/kern/subr_disk.c: revision 1.100 add some (uint64_t) casts so avoid 32 bit overflows. this fixes my 3TB disk with 4KB sectors and disklabel (which looks like it would work upto 16TB.) idea from mlel...@. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.83.2.1 src/sys/kern/subr_disk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_disk.c diff -u src/sys/kern/subr_disk.c:1.83 src/sys/kern/subr_disk.c:1.83.2.1 --- src/sys/kern/subr_disk.c:1.83 Sat Nov 25 11:59:58 2006 +++ src/sys/kern/subr_disk.c Sun Nov 21 21:52:04 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_disk.c,v 1.83 2006/11/25 11:59:58 scw Exp $ */ +/* $NetBSD: subr_disk.c,v 1.83.2.1 2010/11/21 21:52:04 riz Exp $ */ /*- * Copyright (c) 1996, 1997, 1999, 2000 The NetBSD Foundation, Inc. @@ -74,7 +74,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_disk.c,v 1.83 2006/11/25 11:59:58 scw Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_disk.c,v 1.83.2.1 2010/11/21 21:52:04 riz Exp $); #include sys/param.h #include sys/kernel.h @@ -380,8 +380,8 @@ goto bad; } - p_size = p-p_size dk-dk_blkshift; - p_offset = p-p_offset dk-dk_blkshift; + p_size = (uint64_t)p-p_size dk-dk_blkshift; + p_offset = (uint64_t)p-p_offset dk-dk_blkshift; #if RAW_PART == 3 labelsector = lp-d_partitions[2].p_offset; #else
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 21:52:29 UTC 2010 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 1411 To generate a diff of this commit: cvs rdiff -u -r1.1.2.210 -r1.1.2.211 src/doc/CHANGES-4.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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.210 src/doc/CHANGES-4.1:1.1.2.211 --- src/doc/CHANGES-4.1:1.1.2.210 Sun Nov 21 21:39:18 2010 +++ src/doc/CHANGES-4.1 Sun Nov 21 21:52:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.210 2010/11/21 21:39:18 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.211 2010/11/21 21:52:28 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4264,3 +4264,8 @@ Fix bluetooth connection for some Broadcom controllers. [plunky, ticket #1409] +sys/kern/subr_disk.c1.100 + + Fix an issue with 2TB disks. + [mrg, ticket #1463] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 21:53:14 UTC 2010 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Correct the ticket number for the last. (1411) To generate a diff of this commit: cvs rdiff -u -r1.1.2.211 -r1.1.2.212 src/doc/CHANGES-4.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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.211 src/doc/CHANGES-4.1:1.1.2.212 --- src/doc/CHANGES-4.1:1.1.2.211 Sun Nov 21 21:52:28 2010 +++ src/doc/CHANGES-4.1 Sun Nov 21 21:53:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.211 2010/11/21 21:52:28 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.212 2010/11/21 21:53:13 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4267,5 +4267,5 @@ sys/kern/subr_disk.c1.100 Fix an issue with 2TB disks. - [mrg, ticket #1463] + [mrg, ticket #1411]
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 21:55:09 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1459-1463. To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 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.20 src/doc/CHANGES-5.2:1.1.2.21 --- src/doc/CHANGES-5.2:1.1.2.20 Sun Nov 21 21:05:44 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 21:55:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.20 2010/11/21 21:05:44 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.21 2010/11/21 21:55:09 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -729,3 +729,34 @@ Fix a performance problem with the ciss(4) driver. PR#39686. [pettai, ticket #1452] +sys/arch/vax/vsa/dz_vsbus.c 1.41 +sys/arch/vax/vsa/spx.c1.3 +sys/dev/dec/dz.c1.39 + + Make SPX work as console device on VAXstation 4000/9x. + [hans, ticket #1459] + +sbin/routed/if.c1.29 + + Fix routed crashing on startup on sparc64. PR#43695 + [martin, ticket #1460] + +sys/netbt/hci_link.c1.22 + + Fix bluetooth connection for some Broadcom controllers. + [plunky, ticket #1461] + +sys/dev/acpi/wb_acpi.c1.3 via patch +sys/dev/ic/w83l518d.c1.2 via patch +sys/dev/ic/w83l518d_sdmmc.c 1.2 via patch +sys/dev/ic/w83l518d_sdmmc.h 1.2 via patch +sys/dev/ic/w83l518dvar.h 1.2 via patch + + Add wb(4) power management support. + [jmcneill, ticket #1462] + +sys/kern/subr_disk.c1.100 + + Fix an issue with 2TB disks. + [mrg, ticket #1463] +
CVS commit: [netbsd-5] src/sbin/gpt
Module Name:src
Committed By: riz
Date: Sun Nov 21 21:59:38 UTC 2010
Modified Files:
src/sbin/gpt [netbsd-5]: gpt.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1464):
sbin/gpt/gpt.c: revision 1.11
PR/43105: Peter Kerwien: Destroying a GPT partition with dd will cause gpt
destroy / create to fail. When reading the GPT label from the end of the disk
ignore errors if the GPT label at the beginning of the disk was not found.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.8 src/sbin/gpt/gpt.c:1.8.6.1
--- src/sbin/gpt/gpt.c:1.8 Sun Feb 24 18:38:10 2008
+++ src/sbin/gpt/gpt.c Sun Nov 21 21:59:38 2010
@@ -31,7 +31,7 @@
__FBSDID($FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $);
#endif
#ifdef __RCSID
-__RCSID($NetBSD: gpt.c,v 1.8 2008/02/24 18:38:10 christos Exp $);
+__RCSID($NetBSD: gpt.c,v 1.8.6.1 2010/11/21 21:59:38 riz Exp $);
#endif
#include sys/param.h
@@ -560,7 +560,7 @@
#endif
static int
-gpt_gpt(int fd, off_t lba)
+gpt_gpt(int fd, off_t lba, int found)
{
uuid_t type;
off_t size;
@@ -593,8 +593,15 @@
/* Use generic pointer to deal with hdr-hdr_entsz != sizeof(*ent). */
p = gpt_read(fd, le64toh(hdr-hdr_lba_table), blocks);
- if (p == NULL)
- return (-1);
+ if (p == NULL) {
+ if (found) {
+ if (verbose)
+warn(%s: Cannot read LBA table at sector %llu,
+device_name, le64toh(hdr-hdr_lba_table));
+ return (-1);
+ }
+ goto fail_hdr;
+ }
if (crc32(p, tblsz) != le32toh(hdr-hdr_crc_table)) {
if (verbose)
@@ -619,7 +626,7 @@
return (-1);
if (lba != 1)
- return (0);
+ return (1);
for (i = 0; i le32toh(hdr-hdr_entries); i++) {
ent = (void*)(p + i * le32toh(hdr-hdr_entsz));
@@ -643,7 +650,7 @@
return (-1);
m-map_index = i + 1;
}
- return (0);
+ return (1);
fail_ent:
free(p);
@@ -657,7 +664,7 @@
gpt_open(const char *dev)
{
struct stat sb;
- int fd, mode;
+ int fd, mode, found;
mode = readonly ? O_RDONLY : O_RDWR|O_EXCL;
@@ -723,9 +730,9 @@
if (gpt_mbr(fd, 0LL) == -1)
goto close;
- if (gpt_gpt(fd, 1LL) == -1)
+ if ((found = gpt_gpt(fd, 1LL, 1)) == -1)
goto close;
- if (gpt_gpt(fd, mediasz / secsz - 1LL) == -1)
+ if (gpt_gpt(fd, mediasz / secsz - 1LL, found) == -1)
goto close;
return (fd);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Nov 21 22:01:16 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rump.c rump_private.h scheduler.c
Log Message:
Fix situation where we try to configure MAXCPUS cpus.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.63 -r1.64 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpkern/scheduler.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.203 src/sys/rump/librump/rumpkern/rump.c:1.204
--- src/sys/rump/librump/rumpkern/rump.c:1.203 Sun Nov 21 17:34:11 2010
+++ src/sys/rump/librump/rumpkern/rump.c Sun Nov 21 22:01:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.203 2010/11/21 17:34:11 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.204 2010/11/21 22:01:15 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.203 2010/11/21 17:34:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.204 2010/11/21 22:01:15 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -262,7 +262,7 @@
printf(NCPU limited to 1 on this machine architecture\n);
numcpu = 1;
#endif
- rump_cpus_bootstrap(numcpu);
+ rump_cpus_bootstrap(numcpu);
rumpuser_gettime(sec, nsec, error);
boottime.tv_sec = sec;
Index: src/sys/rump/librump/rumpkern/rump_private.h
diff -u src/sys/rump/librump/rumpkern/rump_private.h:1.63 src/sys/rump/librump/rumpkern/rump_private.h:1.64
--- src/sys/rump/librump/rumpkern/rump_private.h:1.63 Wed Nov 17 21:57:33 2010
+++ src/sys/rump/librump/rumpkern/rump_private.h Sun Nov 21 22:01:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_private.h,v 1.63 2010/11/17 21:57:33 pooka Exp $ */
+/* $NetBSD: rump_private.h,v 1.64 2010/11/21 22:01:15 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -96,7 +96,7 @@
struct lwp * rump__lwproc_alloclwp(struct proc *);
-void rump_cpus_bootstrap(int);
+void rump_cpus_bootstrap(int *);
void rump_scheduler_init(int);
void rump_schedule(void);
void rump_unschedule(void);
Index: src/sys/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.21 src/sys/rump/librump/rumpkern/scheduler.c:1.22
--- src/sys/rump/librump/rumpkern/scheduler.c:1.21 Fri Oct 29 15:32:24 2010
+++ src/sys/rump/librump/rumpkern/scheduler.c Sun Nov 21 22:01:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: scheduler.c,v 1.21 2010/10/29 15:32:24 pooka Exp $ */
+/* $NetBSD: scheduler.c,v 1.22 2010/11/21 22:01:15 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.21 2010/10/29 15:32:24 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.22 2010/11/21 22:01:15 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -120,15 +120,16 @@
/* this could/should be mi_attach_cpu? */
void
-rump_cpus_bootstrap(int num)
+rump_cpus_bootstrap(int *nump)
{
struct rumpcpu *rcpu;
struct cpu_info *ci;
+ int num = *nump;
int i;
if (num MAXCPUS) {
- aprint_verbose(CPU limit: %d wanted, %d (MAXCPUS) available\n,
- num, MAXCPUS);
+ aprint_verbose(CPU limit: %d wanted, %d (MAXCPUS)
+ available (adjusted)\n, num, MAXCPUS);
num = MAXCPUS;
}
@@ -141,6 +142,7 @@
/* attach first cpu for bootstrap */
rump_cpu_attach(rump_cpus[0]);
ncpu = 1;
+ *nump = num;
}
void
CVS commit: [netbsd-5] src/dist/nvi/vi
Module Name:src
Committed By: riz
Date: Sun Nov 21 22:03:00 UTC 2010
Modified Files:
src/dist/nvi/vi [netbsd-5]: v_search.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1467):
dist/nvi/vi/v_search.c: revision 1.3
PR/44006: Ralph G: vi: CTRL-A does not handle end-of-word correctly
End-of-word was not included in search regexp leading to false positives.
http://patches.ubuntu.com/by-release/extracted/debian/n/nvi/1.81.6-7/15search_wo
rd.dpatch
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 src/dist/nvi/vi/v_search.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/vi/v_search.c
diff -u src/dist/nvi/vi/v_search.c:1.1.1.2.6.1 src/dist/nvi/vi/v_search.c:1.1.1.2.6.2
--- src/dist/nvi/vi/v_search.c:1.1.1.2.6.1 Tue Jan 20 02:41:13 2009
+++ src/dist/nvi/vi/v_search.c Sun Nov 21 22:03:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: v_search.c,v 1.1.1.2.6.1 2009/01/20 02:41:13 snj Exp $ */
+/* $NetBSD: v_search.c,v 1.1.1.2.6.2 2010/11/21 22:03:00 riz Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -324,15 +324,16 @@
v_searchw(SCR *sp, VICMD *vp)
{
size_t blen, len;
+ size_t olen = STRLEN(VIP(sp)-keyw);
int rval;
CHAR_T *bp, *p;
- len = VIP(sp)-klen + RE_WSTART_LEN + RE_WSTOP_LEN;
+ len = olen + RE_WSTART_LEN + RE_WSTOP_LEN;
GET_SPACE_RETW(sp, bp, blen, len);
MEMCPY(bp, RE_WSTART, RE_WSTART_LEN);
p = bp + RE_WSTART_LEN;
- MEMCPY(p, VIP(sp)-keyw, VIP(sp)-klen);
- p += VIP(sp)-klen;
+ MEMCPY(p, VIP(sp)-keyw, olen);
+ p += olen;
MEMCPY(p, RE_WSTOP, RE_WSTOP_LEN);
rval = v_search(sp, vp, bp, len, SEARCH_SET, FORWARD);
CVS commit: [netbsd-5] src/sys/dev/raidframe
Module Name:src
Committed By: riz
Date: Sun Nov 21 22:06:54 UTC 2010
Modified Files:
src/sys/dev/raidframe [netbsd-5]: raidframevar.h rf_copyback.c
rf_disks.c rf_netbsdkintf.c rf_reconstruct.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1468):
sys/dev/raidframe/rf_disks.c: revision 1.74
sys/dev/raidframe/raidframevar.h: revision 1.14
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.275
sys/dev/raidframe/rf_copyback.c: revision 1.43
sys/dev/raidframe/rf_reconstruct.c: revision 1.109
add support for 2TB raid devices.
- - add two new members to the component label:
u_int numBlocksHi
u_int partitionSizeHi
and store the top 32 bits of the real number of blocks and
partition size. modify rf_print_component_label(),
rf_does_it_fit(), rf_AutoConfigureDisks() and
rf_ReconstructFailedDiskBasic().
- - call disk_blocksize() after disk_attach() [ from mlelstv ]
- - shift the block number relative to DEV_BSHIFT in raidstart()
and InitBP() so that accesses work for non 512-byte devices.
[ from mlelstv ]
- - update rf_getdisksize() to use the new getdisksize() [ from
mlelstv. this part needs a separate change for netbsd-5. ]
reviewed by: oster, christos and darrenr
To generate a diff of this commit:
cvs rdiff -u -r1.12.10.1 -r1.12.10.2 src/sys/dev/raidframe/raidframevar.h
cvs rdiff -u -r1.41.20.1 -r1.41.20.2 src/sys/dev/raidframe/rf_copyback.c
cvs rdiff -u -r1.70.10.2 -r1.70.10.3 src/sys/dev/raidframe/rf_disks.c
cvs rdiff -u -r1.250.4.7 -r1.250.4.8 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.105.4.3 -r1.105.4.4 src/sys/dev/raidframe/rf_reconstruct.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/raidframe/raidframevar.h
diff -u src/sys/dev/raidframe/raidframevar.h:1.12.10.1 src/sys/dev/raidframe/raidframevar.h:1.12.10.2
--- src/sys/dev/raidframe/raidframevar.h:1.12.10.1 Thu Dec 10 22:59:16 2009
+++ src/sys/dev/raidframe/raidframevar.h Sun Nov 21 22:06:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.12.10.1 2009/12/10 22:59:16 snj Exp $ */
+/* $NetBSD: raidframevar.h,v 1.12.10.2 2010/11/21 22:06:53 riz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -471,7 +471,9 @@
done first, (and would become raid0).
This may be in conflict with last_unit!!?! */
/* Not currently used. */
- int future_use2[44]; /* More future expansion */
+ u_int numBlocksHi;/* The top 32-bits of the numBlocks member. */
+ u_int partitionSizeHi;/* The top 32-bits of the partitionSize member. */
+ int future_use2[42]; /* More future expansion */
} RF_ComponentLabel_t;
typedef struct RF_SingleComponent_s {
Index: src/sys/dev/raidframe/rf_copyback.c
diff -u src/sys/dev/raidframe/rf_copyback.c:1.41.20.1 src/sys/dev/raidframe/rf_copyback.c:1.41.20.2
--- src/sys/dev/raidframe/rf_copyback.c:1.41.20.1 Thu Dec 10 22:59:16 2009
+++ src/sys/dev/raidframe/rf_copyback.c Sun Nov 21 22:06:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.c,v 1.41.20.1 2009/12/10 22:59:16 snj Exp $ */
+/* $NetBSD: rf_copyback.c,v 1.41.20.2 2010/11/21 22:06:53 riz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -38,7 +38,7 @@
/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_copyback.c,v 1.41.20.1 2009/12/10 22:59:16 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_copyback.c,v 1.41.20.2 2010/11/21 22:06:53 riz Exp $);
#include dev/raidframe/raidframevar.h
@@ -213,6 +213,7 @@
c_label-row = 0;
c_label-column = fcol;
c_label-partitionSize = raidPtr-Disks[fcol].partitionSize;
+ c_label-partitionSizeHi = raidPtr-Disks[fcol].partitionSize 32;
raidflush_component_label(raidPtr, fcol);
Index: src/sys/dev/raidframe/rf_disks.c
diff -u src/sys/dev/raidframe/rf_disks.c:1.70.10.2 src/sys/dev/raidframe/rf_disks.c:1.70.10.3
--- src/sys/dev/raidframe/rf_disks.c:1.70.10.2 Thu Dec 10 22:59:16 2009
+++ src/sys/dev/raidframe/rf_disks.c Sun Nov 21 22:06:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.70.10.2 2009/12/10 22:59:16 snj Exp $ */
+/* $NetBSD: rf_disks.c,v 1.70.10.3 2010/11/21 22:06:53 riz Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -60,7 +60,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_disks.c,v 1.70.10.2 2009/12/10 22:59:16 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_disks.c,v 1.70.10.3 2010/11/21 22:06:53 riz Exp $);
#include dev/raidframe/raidframevar.h
@@ -453,6 +453,8 @@
/* Found it. Configure it.. */
diskPtr-blockSize = ac-clabel-blockSize;
diskPtr-numBlocks = ac-clabel-numBlocks;
+ diskPtr-numBlocks |=
+ (uint64_t)ac-clabel-numBlocksHi 32;
CVS commit: [netbsd-5] src/dist/pppd/pppd
Module Name:src Committed By: riz Date: Sun Nov 21 22:09:32 UTC 2010 Modified Files: src/dist/pppd/pppd [netbsd-5]: ccp.h Log Message: Pull up following revision(s) (requested by dholland in ticket #1469): dist/pppd/pppd/ccp.h: revision 1.2 Don't attempt to store bitmasks in a variable of type 'bool'. From Shuichiro URATA in PR 42390. Should be pulled up to -5. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.32.1 src/dist/pppd/pppd/ccp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/pppd/pppd/ccp.h diff -u src/dist/pppd/pppd/ccp.h:1.1.1.1 src/dist/pppd/pppd/ccp.h:1.1.1.1.32.1 --- src/dist/pppd/pppd/ccp.h:1.1.1.1 Sun Feb 20 10:28:37 2005 +++ src/dist/pppd/pppd/ccp.h Sun Nov 21 22:09:32 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ccp.h,v 1.1.1.1 2005/02/20 10:28:37 cube Exp $ */ +/* $NetBSD: ccp.h,v 1.1.1.1.32.1 2010/11/21 22:09:32 riz Exp $ */ /* * ccp.h - Definitions for PPP Compression Control Protocol. @@ -39,7 +39,7 @@ bool predictor_2; /* do Predictor-2? */ bool deflate_correct; /* use correct code for deflate? */ bool deflate_draft; /* use draft RFC code for deflate? */ -bool mppe; /* do MPPE? */ +u_short mppe; /* do MPPE? */ u_short bsd_bits; /* # bits/code for BSD Compress */ u_short deflate_size; /* lg(window size) for Deflate */ short method; /* code for chosen compression method */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sun Nov 21 22:10:48 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1464, 1467-1469. To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 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.21 src/doc/CHANGES-5.2:1.1.2.22 --- src/doc/CHANGES-5.2:1.1.2.21 Sun Nov 21 21:55:09 2010 +++ src/doc/CHANGES-5.2 Sun Nov 21 22:10:47 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.21 2010/11/21 21:55:09 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.22 2010/11/21 22:10:47 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -760,3 +760,28 @@ Fix an issue with 2TB disks. [mrg, ticket #1463] +sbin/gpt/gpt.c 1.11 + + Ignore GPT errors from the end of the disk if the label at the + beginning of the disk was not found. PR#43105 + [christos, ticket #1464] + +dist/nvi/vi/v_search.c1.3 + + Fix nvi ^A handling. PR#44006 + [christos, ticket #1467] + +sys/dev/raidframe/raidframevar.h 1.14 via patch +sys/dev/raidframe/rf_copyback.c 1.43 via patch +sys/dev/raidframe/rf_disks.c 1.74 via patch +sys/dev/raidframe/rf_netbsdkintf.c 1.275 via patch +sys/dev/raidframe/rf_reconstruct.c 1.109 via patch + + Add support for 2TB raid devices. + [mrg, ticket #1468] + +dist/pppd/pppd/ccp.h1.2 + + Fix MPPE in pppd. PR#42390 + [dholland, ticket #1469] +
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Nov 21 22:17:24 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c
Log Message:
Encode smp-capability into the makefile so that it can be used to
avoid potential screwups.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.204 -r1.205 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/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.100 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.101
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.100 Sun Nov 21 21:46:43 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Nov 21 22:17:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.100 2010/11/21 21:46:43 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.101 2010/11/21 22:17:24 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -25,6 +25,12 @@
SRCS+= locks.c
#SRCS+= locks_up.c
+# Does the arch support multiple processors?
+.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386
+RUMP_SMP= # defined
+CPPFLAGS.rump.c+= -DRUMP_SMP
+.endif
+
vers.c: ${RUMPTOP}/../conf/newvers.sh ${RUMPTOP}/../conf/osrelease.sh ${RUMPTOP}/../sys/param.h
${_MKMSG_CREATE} vers.c
${HOST_SH} ${RUMPTOP}/../conf/newvers.sh -i RUMP-ROAST -n
@@ -175,8 +181,12 @@
|| ${MACHINE_CPU} == mips || ${MACHINE_CPU} == sh3 \
|| ${MACHINE_CPU} == vax || ${MACHINE_ARCH} == m68000
CPPFLAGS+= -I${RUMPTOP}/../../common/lib/libc/atomic
+.ifdef RUMP_SMP
+SRCS+= atomic_cas_generic.c
+.else
SRCS+= atomic_cas_up.c
.endif
+.endif
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.204 src/sys/rump/librump/rumpkern/rump.c:1.205
--- src/sys/rump/librump/rumpkern/rump.c:1.204 Sun Nov 21 22:01:15 2010
+++ src/sys/rump/librump/rumpkern/rump.c Sun Nov 21 22:17:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.204 2010/11/21 22:01:15 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.205 2010/11/21 22:17:24 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.204 2010/11/21 22:01:15 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.205 2010/11/21 22:17:24 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -249,7 +249,7 @@
if (rumpuser_getenv(RUMP_NCPU, buf, sizeof(buf), error) == 0)
error = 0;
/* non-x86 is missing CPU_INFO_FOREACH() support */
-#if defined(__i386__) || defined(__x86_64__)
+#ifdef RUMP_SMP
if (error == 0) {
numcpu = strtoll(buf, NULL, 10);
if (numcpu 1)
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Sun Nov 21 22:50:38 UTC 2010
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
- don't bitch if /usr/X11R6/lib/X11 does not exist, if /usr/X11R6 does not
exist either. We might have never installed X11R6 on this system.
- spell nonexistent
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.109 src/usr.sbin/postinstall/postinstall:1.110
--- src/usr.sbin/postinstall/postinstall:1.109 Mon Nov 8 04:01:44 2010
+++ src/usr.sbin/postinstall/postinstall Sun Nov 21 17:50:37 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.109 2010/11/08 09:01:44 njoly Exp $
+# $NetBSD: postinstall,v 1.110 2010/11/21 22:50:37 christos Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -633,7 +633,7 @@
MKX11=no
X11ROOTDIR=
fi
- X11SRCDIR=/nonexisent/xsrc
+ X11SRCDIR=/nonexistent/xsrc
fi
}
@@ -1305,10 +1305,13 @@
msg ${_etcx11} is not a directory; skipping check
return 0
fi
- _libx11=${DEST_DIR}/usr/X11R6/lib/X11
- if [ ! -d ${_libx11} ]; then
- msg ${_libx11} is not a directory; skipping check
- return 0
+ if [ -d ${DEST_DIR}/usr/X11R6/. ]
+ then
+ _libx11=${DEST_DIR}/usr/X11R6/lib/X11
+ if [ ! -d ${_libx11} ]; then
+ msg ${_libx11} is not a directory; skipping check
+ return 0
+ fi
fi
_notfixed=
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Sun Nov 21 23:34:56 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5]: fwohci_pci.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #1470):
sys/dev/pci/fwohci_pci.c: revision 1.35
do not attach to Powrbook G3 onboard Firewire controllers until =20
someone with
access to the hardware can figure out why it deadlocks during device
discovery
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/dev/pci/fwohci_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/fwohci_pci.c
diff -u src/sys/dev/pci/fwohci_pci.c:1.32 src/sys/dev/pci/fwohci_pci.c:1.32.10.1
--- src/sys/dev/pci/fwohci_pci.c:1.32 Mon Apr 28 20:23:54 2008
+++ src/sys/dev/pci/fwohci_pci.c Sun Nov 21 23:34:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_pci.c,v 1.32 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: fwohci_pci.c,v 1.32.10.1 2010/11/21 23:34:56 riz Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fwohci_pci.c,v 1.32 2008/04/28 20:23:54 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: fwohci_pci.c,v 1.32.10.1 2010/11/21 23:34:56 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,6 +43,7 @@
#include dev/pci/pcireg.h
#include dev/pci/pcivar.h
+#include dev/pci/pcidevs.h
#include dev/ieee1394/fw_port.h
#include dev/ieee1394/firewire.h
#include dev/ieee1394/firewirereg.h
@@ -74,6 +75,15 @@
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
+ /*
+ * XXX
+ * Firewire controllers used in some G3 PowerBooks hang the system
+ * when trying to discover devices - don't attach to those for now
+ * until someone with the right hardware can investigate
+ */
+ if ((PCI_VENDOR(pa-pa_id) == PCI_VENDOR_APPLE)
+ (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_APPLE_PBG3_FW))
+ return 0;
if (PCI_CLASS(pa-pa_class) == PCI_CLASS_SERIALBUS
PCI_SUBCLASS(pa-pa_class) == PCI_SUBCLASS_SERIALBUS_FIREWIRE
PCI_INTERFACE(pa-pa_class) == PCI_INTERFACE_OHCI)
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Sun Nov 21 23:41:21 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5]: aceride.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1471):
sys/dev/pci/aceride.c: revision 1.28
Add a workaround for 48-bit LBA DMA access bug on M5229 rev. = 0xc4.
- use DMA in 28-bit LBA addressing.
- use PIO in 48-bit LBA addressing.
Idea and message are from FreeBSD, and tested on M5229 rev. 0xc3 in
my Sun Netra X1 with 160GB drive.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.14.1 src/sys/dev/pci/aceride.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/aceride.c
diff -u src/sys/dev/pci/aceride.c:1.25 src/sys/dev/pci/aceride.c:1.25.14.1
--- src/sys/dev/pci/aceride.c:1.25 Tue Mar 18 20:46:36 2008
+++ src/sys/dev/pci/aceride.c Sun Nov 21 23:41:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: aceride.c,v 1.25 2008/03/18 20:46:36 cube Exp $ */
+/* $NetBSD: aceride.c,v 1.25.14.1 2010/11/21 23:41:20 riz Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aceride.c,v 1.25 2008/03/18 20:46:36 cube Exp $);
+__KERNEL_RCSID(0, $NetBSD: aceride.c,v 1.25.14.1 2010/11/21 23:41:20 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -46,6 +46,7 @@
static void acer_chip_map(struct pciide_softc*, struct pci_attach_args*);
static void acer_setup_channel(struct ata_channel*);
static int acer_pci_intr(void *);
+static int acer_dma_init(void *, int, int, void *, size_t, int);
static int aceride_match(device_t, cfdata_t, void *);
static void aceride_attach(device_t, device_t, void *);
@@ -144,6 +145,12 @@
sc-sc_wdcdev.sc_atac.atac_udma_cap = 2;
}
sc-sc_wdcdev.irqack = pciide_irqack;
+ if (rev = 0xc4) {
+ sc-sc_wdcdev.dma_init = acer_dma_init;
+ aprint_verbose_dev(sc-sc_wdcdev.sc_atac.atac_dev,
+ using PIO transfers above 137GB as workaround for
+ 48bit DMA access bug, expect reduced performance\n);
+ }
}
sc-sc_wdcdev.sc_atac.atac_pio_cap = 4;
@@ -375,3 +382,15 @@
}
return rv;
}
+
+static int
+acer_dma_init(void *v, int channel, int drive, void *databuf,
+size_t datalen, int flags)
+{
+
+ /* use PIO for LBA48 transfer */
+ if (flags WDC_DMA_LBA48)
+ return EINVAL;
+
+ return pciide_dma_init(v, channel, drive, databuf, datalen, flags);
+}
CVS commit: xsrc/external/mit/libXdmcp/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 23:46:26 UTC 2010 Update of /cvsroot/xsrc/external/mit/libXdmcp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26817 Log Message: initial import of libXdmcp-1.1.0 Status: Vendor Tag: xorg Release Tags: libXdmcp-1-1-0 U xsrc/external/mit/libXdmcp/dist/xdmcp.pc.in U xsrc/external/mit/libXdmcp/dist/Flush.c U xsrc/external/mit/libXdmcp/dist/Makefile.am U xsrc/external/mit/libXdmcp/dist/autogen.sh U xsrc/external/mit/libXdmcp/dist/config.guess U xsrc/external/mit/libXdmcp/dist/ltmain.sh U xsrc/external/mit/libXdmcp/dist/Makefile.in U xsrc/external/mit/libXdmcp/dist/config.sub U xsrc/external/mit/libXdmcp/dist/Wrap.c U xsrc/external/mit/libXdmcp/dist/INSTALL N xsrc/external/mit/libXdmcp/dist/Key.c U xsrc/external/mit/libXdmcp/dist/Wraphelp.c U xsrc/external/mit/libXdmcp/dist/Fill.c U xsrc/external/mit/libXdmcp/dist/configure N xsrc/external/mit/libXdmcp/dist/Read.c U xsrc/external/mit/libXdmcp/dist/depcomp U xsrc/external/mit/libXdmcp/dist/ChangeLog U xsrc/external/mit/libXdmcp/dist/missing U xsrc/external/mit/libXdmcp/dist/README U xsrc/external/mit/libXdmcp/dist/Wraphelp.README.crypto U xsrc/external/mit/libXdmcp/dist/Unwrap.c U xsrc/external/mit/libXdmcp/dist/configure.ac U xsrc/external/mit/libXdmcp/dist/Wrap.h U xsrc/external/mit/libXdmcp/dist/COPYING N xsrc/external/mit/libXdmcp/dist/Array.c U xsrc/external/mit/libXdmcp/dist/aclocal.m4 U xsrc/external/mit/libXdmcp/dist/AUTHORS N xsrc/external/mit/libXdmcp/dist/Write.c U xsrc/external/mit/libXdmcp/dist/install-sh U xsrc/external/mit/libXdmcp/dist/config.h.in U xsrc/external/mit/libXdmcp/dist/include/X11/Xdmcp.h N xsrc/external/mit/libXdmcp/dist/doc/Makefile.am N xsrc/external/mit/libXdmcp/dist/doc/Makefile.in N xsrc/external/mit/libXdmcp/dist/doc/xdmcp.xml No conflicts created by this import
CVS commit: xsrc/external/mit/libXdmcp/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 21 23:48:10 UTC 2010 Removed Files: xsrc/external/mit/libXdmcp/dist: A8Eq.c AA16.c AA32.c AA8.c Alloc.c AofA8.c CA8.c CmpKey.c DA16.c DA32.c DA8.c DAofA8.c DecKey.c GenKey.c IncKey.c NEWS RA16.c RA32.c RA8.c RAofA8.c RC16.c RC32.c RC8.c RHead.c RR.c RaA16.c RaA32.c RaA8.c RaAoA8.c WA16.c WA32.c WA8.c WAofA8.c WC16.c WC32.c WC8.c Whead.c Log Message: merge cornflakes To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXdmcp/dist/A8Eq.c \ xsrc/external/mit/libXdmcp/dist/Alloc.c \ xsrc/external/mit/libXdmcp/dist/CA8.c \ xsrc/external/mit/libXdmcp/dist/DA32.c \ xsrc/external/mit/libXdmcp/dist/DA8.c \ xsrc/external/mit/libXdmcp/dist/DAofA8.c \ xsrc/external/mit/libXdmcp/dist/RA16.c \ xsrc/external/mit/libXdmcp/dist/RA32.c \ xsrc/external/mit/libXdmcp/dist/RA8.c \ xsrc/external/mit/libXdmcp/dist/RAofA8.c \ xsrc/external/mit/libXdmcp/dist/RC16.c \ xsrc/external/mit/libXdmcp/dist/RC32.c \ xsrc/external/mit/libXdmcp/dist/RC8.c \ xsrc/external/mit/libXdmcp/dist/RHead.c \ xsrc/external/mit/libXdmcp/dist/RR.c \ xsrc/external/mit/libXdmcp/dist/WA16.c \ xsrc/external/mit/libXdmcp/dist/WA32.c \ xsrc/external/mit/libXdmcp/dist/WA8.c \ xsrc/external/mit/libXdmcp/dist/WAofA8.c cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXdmcp/dist/AA16.c \ xsrc/external/mit/libXdmcp/dist/AA32.c \ xsrc/external/mit/libXdmcp/dist/AA8.c \ xsrc/external/mit/libXdmcp/dist/AofA8.c \ xsrc/external/mit/libXdmcp/dist/CmpKey.c \ xsrc/external/mit/libXdmcp/dist/DA16.c \ xsrc/external/mit/libXdmcp/dist/DecKey.c \ xsrc/external/mit/libXdmcp/dist/GenKey.c \ xsrc/external/mit/libXdmcp/dist/IncKey.c \ xsrc/external/mit/libXdmcp/dist/NEWS \ xsrc/external/mit/libXdmcp/dist/RaA16.c \ xsrc/external/mit/libXdmcp/dist/RaA32.c \ xsrc/external/mit/libXdmcp/dist/RaA8.c \ xsrc/external/mit/libXdmcp/dist/RaAoA8.c \ xsrc/external/mit/libXdmcp/dist/WC16.c \ xsrc/external/mit/libXdmcp/dist/WC32.c \ xsrc/external/mit/libXdmcp/dist/WC8.c \ xsrc/external/mit/libXdmcp/dist/Whead.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libXdmcp
Module Name:src
Committed By: mrg
Date: Sun Nov 21 23:52:15 UTC 2010
Modified Files:
src/external/mit/xorg/lib/libXdmcp: Makefile
Log Message:
update for libXdmcp 1.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXdmcp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXdmcp/Makefile
diff -u src/external/mit/xorg/lib/libXdmcp/Makefile:1.2 src/external/mit/xorg/lib/libXdmcp/Makefile:1.3
--- src/external/mit/xorg/lib/libXdmcp/Makefile:1.2 Sat Sep 13 04:32:30 2008
+++ src/external/mit/xorg/lib/libXdmcp/Makefile Sun Nov 21 23:52:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 23:52:15 mrg Exp $
.include bsd.own.mk
@@ -6,11 +6,15 @@
.PATH: ${X11SRCDIR.${LIB}}
.PATH: ${X11SRCDIR.${LIB}}/include/X11
-SRCS= A8Eq.c AA16.c AA32.c AA8.c Alloc.c AofA8.c CA8.c CmpKey.c DA16.c \
- DA32.c DA8.c DAofA8.c DecKey.c Fill.c Flush.c GenKey.c \
- IncKey.c RA16.c RA32.c RA8.c RAofA8.c RC16.c RC32.c RC8.c \
- RHead.c RR.c RaA16.c RaA32.c RaA8.c RaAoA8.c Unwrap.c WA16.c \
- WA32.c WA8.c WAofA8.c WC16.c WC32.c WC8.c Whead.c Wrap.c Wraphelp.c
+SRCS= Array.c \
+ Fill.c \
+ Flush.c \
+ Key.c \
+ Read.c \
+ Unwrap.c \
+ Wrap.c \
+ Write.c \
+ Wraphelp.c
INCS= Xdmcp.h
INCSDIR=${X11INCDIR}/X11
@@ -18,9 +22,6 @@
CPPFLAGS+=${X11FLAGS.THREADLIB}
CPPFLAGS+=-DHASXDMAUTH
-CPPFLAGS.Fill.c= ${X11FLAGS.CONNECTION}
-CPPFLAGS.Flush.c= ${X11FLAGS.CONNECTION}
-
PKGDIST= ${LIB}
.include bsd.x11.mk
CVS commit: [netbsd-5] src/sys/arch/xen/xen
Module Name:src
Committed By: riz
Date: Sun Nov 21 23:55:58 UTC 2010
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: if_xennet_xenbus.c
Log Message:
Pull up following revision(s) (requested by jym in ticket #1473):
sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.42
sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.43
sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.45
Features (like feature-rx-copy) are set during XenbusStateInitWait in
backend. So delay xennet_xenbus_resume() up to notification of
backend state change.
This avoids a race that happens during dynamic attach/detach of network
interfaces with xm(1), where frontend queries xenstore for features not
yet reported by backend. This does not happen during normal domU boot,
as the backend has enough time to fill in these entries before frontend
asks for them.
Issue was reported by sborrill@: detaching xennet interfaces with RX copy
mode enabled turns them back during attach to RX flip mode due to the race.
feature-rx-copy support is part of another patch.
Handle error case (avoid changing to XenbusStateConnected when resume
failed)
Implement feature-rx-copy support in xennet (domU network frontend).
Instead of flipping pages back and forth between dom0 and domU for the
network RX queue, feature-rx-copy tells frontend to use content copy
instead.
This is the only mode supported by the dom0 Linux pv_ops backend. NetBSD
domU and dom0 can still fall back to flipping, when needed.
Copy is supposed to be faster than flipping, as it does not require
MMU manipulation and TLB shootdowns.
Based on patch provided by Hideki ONO. Thanks!
See also http://mail-index.netbsd.org/port-xen/2010/09/24/msg006265.html
and http://mail-index.netbsd.org/port-xen/2010/10/16/msg006312.html
ok bou...@.
XXX will ask for a pull-up after 5.1 is branched.
To generate a diff of this commit:
cvs rdiff -u -r1.29.2.3 -r1.29.2.4 src/sys/arch/xen/xen/if_xennet_xenbus.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/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.29.2.3 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.29.2.4
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.29.2.3 Mon Sep 28 01:31:46 2009
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Sun Nov 21 23:55:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.29.2.3 2009/09/28 01:31:46 snj Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.29.2.4 2010/11/21 23:55:58 riz Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_xennet_xenbus.c,v 1.29.2.3 2009/09/28 01:31:46 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_xennet_xenbus.c,v 1.29.2.4 2010/11/21 23:55:58 riz Exp $);
#include opt_xen.h
#include opt_nfs_boot.h
@@ -178,6 +178,9 @@
#define BEST_DISCONNECTED 1
#define BEST_CONNECTED 2
#define BEST_SUSPENDED 3
+ unsigned long sc_rx_feature;
+#define FEATURE_RX_FLIP 0
+#define FEATURE_RX_COPY 1
#if NRND 0
rndsource_element_t sc_rnd_source;
#endif
@@ -347,9 +350,6 @@
rnd_attach_source(sc-sc_rnd_source, device_xname(sc-sc_dev),
RND_TYPE_NET, 0);
#endif
-
- /* initialise shared structures and tell backend that we are ready */
- xennet_xenbus_resume(sc);
}
static int
@@ -411,6 +411,7 @@
{
struct xennet_xenbus_softc *sc = p;
struct xenbus_transaction *xbt;
+ unsigned long rx_copy;
int error;
netif_tx_sring_t *tx_ring;
netif_rx_sring_t *rx_ring;
@@ -420,7 +421,6 @@
sc-sc_tx_ring_gntref = GRANT_INVALID_REF;
sc-sc_rx_ring_gntref = GRANT_INVALID_REF;
-
/* setup device: alloc event channel and shared rings */
tx_ring = (void *)uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
UVM_KMF_WIRED | UVM_KMF_ZERO);
@@ -450,6 +450,19 @@
event_set_handler(sc-sc_evtchn, xennet_handler, sc,
IPL_NET, device_xname(sc-sc_dev));
+ error = xenbus_read_ul(NULL, sc-sc_xbusd-xbusd_otherend,
+ feature-rx-copy, rx_copy, 10);
+ if (error)
+ rx_copy = 0; /* default value if key is absent */
+
+ if (rx_copy == 1) {
+ aprint_normal_dev(sc-sc_dev, using RX copy mode\n);
+ sc-sc_rx_feature = FEATURE_RX_COPY;
+ } else {
+ aprint_normal_dev(sc-sc_dev, using RX flip mode\n);
+ sc-sc_rx_feature = FEATURE_RX_FLIP;
+ }
+
again:
xbt = xenbus_transaction_start();
if (xbt == NULL)
@@ -467,21 +480,21 @@
goto abort_transaction;
}
error = xenbus_printf(xbt, sc-sc_xbusd-xbusd_path,
- feature-rx-notify, %u, 1);
+ request-rx-copy, %lu, rx_copy);
if (error) {
- errmsg = writing feature-rx-notify;
+ errmsg = writing request-rx-copy;
goto abort_transaction;
}
error = xenbus_printf(xbt, sc-sc_xbusd-xbusd_path,
- event-channel, %u, sc-sc_evtchn);
+ feature-rx-notify, %u, 1);
if (error) {
- errmsg = writing event channel;
+ errmsg = writing feature-rx-notify;
goto abort_transaction;
}
error = xenbus_printf(xbt,
CVS commit: src
Module Name:src
Committed By: mrg
Date: Mon Nov 22 00:12:14 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/libX11: Makefile
Log Message:
merge libX11 1.3.6 - delete XKeysymDB.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libX11/Makefile
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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.97 src/distrib/sets/lists/xbase/mi:1.98
--- src/distrib/sets/lists/xbase/mi:1.97 Sun Nov 21 07:26:40 2010
+++ src/distrib/sets/lists/xbase/mi Mon Nov 22 00:12:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.97 2010/11/21 07:26:40 mrg Exp $
+# $NetBSD: mi,v 1.98 2010/11/22 00:12:14 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -259,7 +259,7 @@
./usr/X11R6/lib base-x11-root x11
./usr/X11R6/lib/X11 base-x11-root x11
./usr/X11R6/lib/X11/XErrorDB-unknown- x11
-./usr/X11R6/lib/X11/XKeysymDB-unknown- x11
+./usr/X11R6/lib/X11/XKeysymDB-unknown- obsolete
./usr/X11R6/lib/X11/Xcms.txt-unknown- x11
./usr/X11R6/lib/X11/XftConfigxbase-obsolete obsolete
./usr/X11R6/lib/X11/XftConfig-OBSOLETE xbase-obsolete obsolete
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.8 src/external/mit/xorg/lib/libX11/Makefile:1.9
--- src/external/mit/xorg/lib/libX11/Makefile:1.8 Tue Jun 1 05:26:51 2010
+++ src/external/mit/xorg/lib/libX11/Makefile Mon Nov 22 00:12:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/06/01 05:26:51 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/11/22 00:12:14 mrg Exp $
.include bsd.own.mk
@@ -83,7 +83,7 @@
USETBL= yes
-FILES= XErrorDB XKeysymDB Xcms.txt
+FILES= XErrorDB Xcms.txt
FILESDIR= ${X11LIBDIR}
.PATH: ${X11SRCDIR.X11}
CVS commit: [netbsd-5] src/lib/libc/stdlib
Module Name:src
Committed By: riz
Date: Mon Nov 22 00:20:27 UTC 2010
Modified Files:
src/lib/libc/stdlib [netbsd-5]: getenv.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #1474):
lib/libc/stdlib/getenv.c: revision 1.33 via patch
- Fix a bug in getenv(3) and getenv_r(3) which would return bogus
results e.g. for getenv(A=3DB) if an environment variable A
with value B=3DC exists.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.26.1 src/lib/libc/stdlib/getenv.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/stdlib/getenv.c
diff -u src/lib/libc/stdlib/getenv.c:1.18 src/lib/libc/stdlib/getenv.c:1.18.26.1
--- src/lib/libc/stdlib/getenv.c:1.18 Sun Sep 25 20:08:01 2005
+++ src/lib/libc/stdlib/getenv.c Mon Nov 22 00:20:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getenv.c,v 1.18 2005/09/25 20:08:01 christos Exp $ */
+/* $NetBSD: getenv.c,v 1.18.26.1 2010/11/22 00:20:27 riz Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)getenv.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: getenv.c,v 1.18 2005/09/25 20:08:01 christos Exp $);
+__RCSID($NetBSD: getenv.c,v 1.18.26.1 2010/11/22 00:20:27 riz Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,6 +67,8 @@
char *result;
_DIAGASSERT(name != NULL);
+ if (strchr(name, '=') != NULL)
+ return NULL;
rwlock_rdlock(__environ_lock);
result = __findenv(name, offset);
@@ -83,6 +85,11 @@
_DIAGASSERT(name != NULL);
+ if (strchr(name, '=') != NULL) {
+ errno = ENOENT;
+ return -1;
+ }
+
rwlock_rdlock(__environ_lock);
result = __findenv(name, offset);
if (result == NULL) {
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Mon Nov 22 00:25:54 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: TIckets 1470-1471,1473-1474 To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 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.22 src/doc/CHANGES-5.2:1.1.2.23 --- src/doc/CHANGES-5.2:1.1.2.22 Sun Nov 21 22:10:47 2010 +++ src/doc/CHANGES-5.2 Mon Nov 22 00:25:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.22 2010/11/21 22:10:47 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.23 2010/11/22 00:25:54 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -785,3 +785,25 @@ Fix MPPE in pppd. PR#42390 [dholland, ticket #1469] +sys/dev/pci/fwohci_pci.c 1.35 + + Do not attach to Powerbook G3 onboard Firewire controllers. + [macallan, ticket #1470] + +sys/dev/pci/aceride.c1.28 + + Add a workaround for 48-bit LBA DMA access bug on M5229 rev. = 0xc4. + [nakayama, ticket #1471] + +sys/arch/xen/xen/if_xennet_xenbus.c 1.42-43,1.45 via patch + + Fix xennet hotplug and implment feature-rx-copy. Improves + support under Linux dom0. + [jym, ticket #1473] + +lib/libc/stdlib/getenv.c 1.33 via patch + + Fix a bug in getenv(3) and getenv_r(3) which would return bogus + results under certain circumstances. + [tron, ticket #1474] +
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 22 00:27:55 UTC 2010 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20124 Log Message: initial import of xkeyboard-config-2.0. this adds new symbols/at, symbols/extras/ir and symbols/extras/ru, as well as many fixes for other configs. Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-0 U xsrc/external/mit/xkeyboard-config/dist/install-sh C xsrc/external/mit/xkeyboard-config/dist/configure.in U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/CREDITS U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mn U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/il U xsrc/external/mit/xkeyboard-config/dist/symbols/ro U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/me U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/ie U xsrc/external/mit/xkeyboard-config/dist/symbols/be U xsrc/external/mit/xkeyboard-config/dist/symbols/ba U xsrc/external/mit/xkeyboard-config/dist/symbols/ng U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-config/dist/symbols/dk U xsrc/external/mit/xkeyboard-config/dist/symbols/fo U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/hu U xsrc/external/mit/xkeyboard-config/dist/symbols/kh U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/terminate U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl C xsrc/external/mit/xkeyboard-config/dist/symbols/lk U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/bg U xsrc/external/mit/xkeyboard-config/dist/symbols/sk U xsrc/external/mit/xkeyboard-config/dist/symbols/lt U xsrc/external/mit/xkeyboard-config/dist/symbols/sn U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/gn U xsrc/external/mit/xkeyboard-config/dist/symbols/rs U xsrc/external/mit/xkeyboard-config/dist/symbols/jp U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/hr U xsrc/external/mit/xkeyboard-config/dist/symbols/brai C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir C xsrc/external/mit/xkeyboard-config/dist/symbols/sy U xsrc/external/mit/xkeyboard-config/dist/symbols/level5 U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/latin U xsrc/external/mit/xkeyboard-config/dist/symbols/kr U xsrc/external/mit/xkeyboard-config/dist/symbols/no U xsrc/external/mit/xkeyboard-config/dist/symbols/mv U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/al U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U
CVS commit: src/external/mit/xorg/bin/xft-config
Module Name:src Committed By: mrg Date: Mon Nov 22 00:31:36 UTC 2010 Removed Files: src/external/mit/xorg/bin/xft-config: Makefile Log Message: delete obsolete files. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/bin/xft-config/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/makekeys
Module Name:src
Committed By: mrg
Date: Mon Nov 22 00:52:33 UTC 2010
Modified Files:
src/external/mit/xorg/tools/makekeys: Makefile.makekeys
Log Message:
makekeys can't read from stdin anymore; avoid it.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/tools/makekeys/Makefile.makekeys
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/makekeys/Makefile.makekeys
diff -u src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.1.1.1 src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.2
--- src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/tools/makekeys/Makefile.makekeys Mon Nov 22 00:52:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.makekeys,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile.makekeys,v 1.2 2010/11/22 00:52:33 mrg Exp $
MAKEKEYSDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys ${PRINTOBJDIR}
MAKEKEYS= ${MAKEKEYSDIR}/makekeys
@@ -14,4 +14,4 @@
ks_tables.h: ${MAKEKEYS} ${KSDEF}
${_MKTARGET_CREATE}
rm -f ${.TARGET}
- ${MAKEKEYS} ${KSDEF} ${.TARGET}
+ ${MAKEKEYS} ${KSDEF} ${.TARGET}
CVS commit: src/usr.sbin/puffs
Module Name:src
Committed By: pooka
Date: Mon Nov 22 01:07:51 UTC 2010
Modified Files:
src/usr.sbin/puffs: makerumpmanpages.sh
Log Message:
Generate different manpages for 1) disk 2) net 3) fictional file systems.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/makerumpmanpages.sh
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/puffs/makerumpmanpages.sh
diff -u src/usr.sbin/puffs/makerumpmanpages.sh:1.10 src/usr.sbin/puffs/makerumpmanpages.sh:1.11
--- src/usr.sbin/puffs/makerumpmanpages.sh:1.10 Sun Nov 21 19:29:01 2010
+++ src/usr.sbin/puffs/makerumpmanpages.sh Mon Nov 22 01:07:51 2010
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: makerumpmanpages.sh,v 1.10 2010/11/21 19:29:01 pooka Exp $
+# $NetBSD: makerumpmanpages.sh,v 1.11 2010/11/22 01:07:51 pooka Exp $
#
IFS=' '
-MANTMPL=.\\\ \$NetBSD\$'
+MANTMPL1=.\\\ \$NetBSD\$'
.\
.\ WARNING: GENERATED FILE, DO NOT EDIT
.\ INSTEAD, EDIT makerumpmanpages.sh AND REGEN
@@ -37,23 +37,23 @@
.Os
.Sh NAME
.Nm rump_xxxfsxxx
-.Nd mount the xxxfsxxx file system using a userspace server
+.Nd mount a xxxfsxxx xxxfssrcxxx with a userspace server
.Sh SYNOPSIS
.Cd file-system PUFFS
.Cd pseudo-device putter
.Pp
.Nm
.Op options
-.Ar image
+.Ar xxximagexxx
.Ar mountpoint
.Sh DESCRIPTION
.Em NOTE!
-This manual page has been generated from a common source shared between all
+This manual page describes features specific to the
.Xr rump 3
-file servers.
-Some parts of this manual page may not apply to this particular server.
-After reading this manual page, you may want to verify the details from
-.Xr mount_xxxfsxxx 8 .
+file server.
+Please see
+.Xr mount_xxxfsxxx 8
+for a full description of the available command line options.
.Pp
The
.Nm
@@ -70,14 +70,15 @@
not require kernel support except
.Xr puffs 4 .
Apart from a minor speed penalty there is no downside with respect to
-in-kernel code.
-.Pp
+in-kernel code.'
+
+MANTMPL_BLK='.Pp
.Nm
does not require using
.Xr vnconfig 8
for mounts from regular files and the file path can be passed
directly as the
-.Ar image
+.Ar xxximagexxx
parameter.
In fact, the use of
.Xr vnconfig 8
@@ -88,7 +89,7 @@
must be indicated by appending the token
.Dq %DISKLABEL:p%
to the
-.Ar image
+.Ar xxximagexxx
path.
The letter
.Dq p
@@ -108,8 +109,24 @@
Corrupt file system images commonly cause the file system
to crash the entire kernel, but with
.Nm
-only the userspace server process will dump core.
-.Pp
+only the userspace server process will dump core.'
+
+MANTMPL_NET='.Pp
+Even though the
+.Nm
+file system client runs within a virtual rump kernel in userspace,
+it uses host network services
+.Pq by means of Dq rump sockin .
+This means that regardless of whether using
+.Nm
+or
+.Xr mount_xxxfsxxx 8 ,
+the same network configurations will be used.
+Currently,
+.Dq sockin
+supports IPv4.'
+
+MANTMPL2='.Pp
To use
.Nm
via
@@ -121,16 +138,12 @@
should be given.
Similarly,
.Nm
-is run instead of
+is used instead of
.Xr mount_xxxfsxxx 8
if
.Dq rump
is added to the options field of
.Xr fstab 5 .
-.Pp
-Please see
-.Xr mount_xxxfsxxx 8
-for a full description of the available command line options.
.Sh SEE ALSO
.Xr p2k 3 ,
.Xr puffs 3 ,
@@ -140,21 +153,77 @@
The
.Nm
utility first appeared in
-.Nx 5.0 .'
+.Nx xxxfirstxxx .'
-# generate the manual pages
-#
+# vary manpages slightly based on the type of server in question
+disk=cd9660 efs ext2fs ffs hfs lfs msdos ntfs sysvbfs udf
+net=nfs smbfs
+fictional=fdesc kernfs tmpfs
+special=au-naturel nqmfs syspuffs
+
+first5=cd9660 efs ext2fs ffs hfs lfs msdos nfs ntfs syspuffs sysvbfs tmpfs udf
+
+member ()
+{
+
+ what=$1
+ shift
+
+ while [ $# -gt 0 ] ; do
+ [ $1 = ${what} ] return 0
+ shift
+ done
+ return 1
+}
+
+sedsub='s/xxxfsxxx/$fs/g\;s/XXXFSXXX/$fsc/g\;s/xxximagexxx/$image/g\;'\
+'s/xxxfirstxxx/$first/g\;s/xxxfssrcxxx/$fssrc/g\;'
+
+# auto manual pages
for x in rump_*
do
fs=${x#rump_}
- # syspuffs is special, it has a handwritten manpage
- if [ $fs = syspuffs ]
- then
- continue
+ # see if we are dealing with a new server
+ if ! member $fs $disk $net $fictional $special ; then
+ echo ERROR: $fs not found in any class!
+ exit 1
+ fi
+
+ # special file systems have special manpages
+ member $fs $special continue
+
+ # figure out our type
+ if member $fs $disk ; then
+ mytype=disk
+ image=image
+ fssrc=image
+ fi
+ if member $fs $net ; then
+ mytype=net
+ image=share
+ fssrc=share
+ fi
+ if member $fs $fictional ; then
+ mytype=special
+ image=$fs
+ fssrc='fictional fs'
+ fi
+
+ # which version did server first appear?
+ if member $fs $first5 ; then
+ first=5.0
+ else
+ first=6.0
fi
fsc=`echo $fs | tr '[:lower:]' '[:upper:]'`
- echo ${MANTMPL} | sed s/xxxfsxxx/$fs/g;s/XXXFSXXX/$fsc/g \
- rump_${fs}/rump_${fs}.8
+ eval sedstr=${sedsub}
+
+ echo ${MANTMPL1} | sed -e
CVS commit: src/usr.sbin/puffs
Module Name:src Committed By: pooka Date: Mon Nov 22 01:08:26 UTC 2010 Modified Files: src/usr.sbin/puffs/rump_cd9660: rump_cd9660.8 src/usr.sbin/puffs/rump_efs: rump_efs.8 src/usr.sbin/puffs/rump_ext2fs: rump_ext2fs.8 src/usr.sbin/puffs/rump_fdesc: rump_fdesc.8 src/usr.sbin/puffs/rump_ffs: rump_ffs.8 src/usr.sbin/puffs/rump_hfs: rump_hfs.8 src/usr.sbin/puffs/rump_kernfs: rump_kernfs.8 src/usr.sbin/puffs/rump_lfs: rump_lfs.8 src/usr.sbin/puffs/rump_msdos: rump_msdos.8 src/usr.sbin/puffs/rump_nfs: rump_nfs.8 src/usr.sbin/puffs/rump_ntfs: rump_ntfs.8 src/usr.sbin/puffs/rump_smbfs: rump_smbfs.8 src/usr.sbin/puffs/rump_sysvbfs: rump_sysvbfs.8 src/usr.sbin/puffs/rump_tmpfs: rump_tmpfs.8 src/usr.sbin/puffs/rump_udf: rump_udf.8 Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_efs/rump_efs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.8 cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_fdesc/rump_fdesc.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_ffs/rump_ffs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_hfs/rump_hfs.8 cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_kernfs/rump_kernfs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_lfs/rump_lfs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_msdos/rump_msdos.8 cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/rump_nfs/rump_nfs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_ntfs/rump_ntfs.8 cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_tmpfs/rump_tmpfs.8 cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/rump_udf/rump_udf.8 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/puffs/rump_cd9660/rump_cd9660.8 diff -u src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8:1.10 src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8:1.11 --- src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8:1.10 Sun Nov 21 19:32:16 2010 +++ src/usr.sbin/puffs/rump_cd9660/rump_cd9660.8 Mon Nov 22 01:08:23 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_cd9660.8,v 1.10 2010/11/21 19:32:16 pooka Exp $ +.\ $NetBSD: rump_cd9660.8,v 1.11 2010/11/22 01:08:23 pooka Exp $ .\ .\ WARNING: GENERATED FILE, DO NOT EDIT .\ INSTEAD, EDIT makerumpmanpages.sh AND REGEN @@ -31,7 +31,7 @@ .Os .Sh NAME .Nm rump_cd9660 -.Nd mount the cd9660 file system using a userspace server +.Nd mount a cd9660 image with a userspace server .Sh SYNOPSIS .Cd file-system PUFFS .Cd pseudo-device putter @@ -42,12 +42,12 @@ .Ar mountpoint .Sh DESCRIPTION .Em NOTE! -This manual page has been generated from a common source shared between all +This manual page describes features specific to the .Xr rump 3 -file servers. -Some parts of this manual page may not apply to this particular server. -After reading this manual page, you may want to verify the details from -.Xr mount_cd9660 8 . +file server. +Please see +.Xr mount_cd9660 8 +for a full description of the available command line options. .Pp The .Nm @@ -115,16 +115,12 @@ should be given. Similarly, .Nm -is run instead of +is used instead of .Xr mount_cd9660 8 if .Dq rump is added to the options field of .Xr fstab 5 . -.Pp -Please see -.Xr mount_cd9660 8 -for a full description of the available command line options. .Sh SEE ALSO .Xr p2k 3 , .Xr puffs 3 , Index: src/usr.sbin/puffs/rump_efs/rump_efs.8 diff -u src/usr.sbin/puffs/rump_efs/rump_efs.8:1.10 src/usr.sbin/puffs/rump_efs/rump_efs.8:1.11 --- src/usr.sbin/puffs/rump_efs/rump_efs.8:1.10 Sun Nov 21 19:32:16 2010 +++ src/usr.sbin/puffs/rump_efs/rump_efs.8 Mon Nov 22 01:08:23 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_efs.8,v 1.10 2010/11/21 19:32:16 pooka Exp $ +.\ $NetBSD: rump_efs.8,v 1.11 2010/11/22 01:08:23 pooka Exp $ .\ .\ WARNING: GENERATED FILE, DO NOT EDIT .\ INSTEAD, EDIT makerumpmanpages.sh AND REGEN @@ -31,7 +31,7 @@ .Os .Sh NAME .Nm rump_efs -.Nd mount the efs file system using a userspace server +.Nd mount a efs image with a userspace server .Sh SYNOPSIS .Cd file-system PUFFS .Cd pseudo-device putter @@ -42,12 +42,12 @@ .Ar mountpoint .Sh DESCRIPTION .Em NOTE! -This manual page has been generated from a common source shared between all +This manual page describes features specific to the .Xr rump 3 -file servers. -Some parts of this manual page may not apply to this particular server. -After reading this manual page, you may want to verify the details from -.Xr mount_efs 8 . +file server. +Please see +.Xr mount_efs 8 +for a full description of the available command line options. .Pp The .Nm @@ -115,16 +115,12 @@ should be given. Similarly, .Nm -is run
CVS commit: src/usr.sbin/puffs
Module Name:src Committed By: pooka Date: Mon Nov 22 01:09:35 UTC 2010 Removed Files: src/usr.sbin/puffs/rump_au-naturel: rump_au-naturel.8 src/usr.sbin/puffs/rump_nqmfs: rump_nqmfs.8 Log Message: these files are no longer autogenerated, so remove them To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/usr.sbin/puffs/rump_au-naturel/rump_au-naturel.8 cvs rdiff -u -r1.1 -r0 src/usr.sbin/puffs/rump_nqmfs/rump_nqmfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Mon Nov 22 01:22:28 UTC 2010 Modified Files: src/distrib/sets/lists/xbase: mi Log Message: add new xkeyboard-config 2.0 files To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/xbase/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/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.98 src/distrib/sets/lists/xbase/mi:1.99 --- src/distrib/sets/lists/xbase/mi:1.98 Mon Nov 22 00:12:14 2010 +++ src/distrib/sets/lists/xbase/mi Mon Nov 22 01:22:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.98 2010/11/22 00:12:14 mrg Exp $ +# $NetBSD: mi,v 1.99 2010/11/22 01:22:28 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2068,6 +2068,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/apple -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/ar -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/ara -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/at -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/az -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/ba -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/bd -unknown- xorg @@ -2117,7 +2118,9 @@ ./usr/X11R7/lib/X11/xkb/symbols/et -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/extras base-x11-root xorg ./usr/X11R7/lib/X11/xkb/symbols/extras/apl -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/extras/ir -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/extras/rs -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/extras/ru -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/extras/us -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/eurosign -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/fi -unknown- xorg
CVS commit: [netbsd-5] src/sys/arch/xen/x86
Module Name:src
Committed By: riz
Date: Mon Nov 22 01:43:59 UTC 2010
Modified Files:
src/sys/arch/xen/x86 [netbsd-5]: cpu.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1475):
sys/arch/xen/x86/cpu.c: revision 1.52
Boot vs AP processors don't make sense for physical CPUs, these are
handled by the hypervisor and all CPUs are running when the dom0 is started.
In addition, we don't have a reliable way to determine the boot CPU as
- we may not be running on the boot CPU
- we don't have access to the lapic id
So simplify by ignoring the information and assign phycpu_info_primary to the
first attached CPU.
To generate a diff of this commit:
cvs rdiff -u -r1.28.4.2 -r1.28.4.3 src/sys/arch/xen/x86/cpu.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/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.28.4.2 src/sys/arch/xen/x86/cpu.c:1.28.4.3
--- src/sys/arch/xen/x86/cpu.c:1.28.4.2 Thu Apr 22 20:02:49 2010
+++ src/sys/arch/xen/x86/cpu.c Mon Nov 22 01:43:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.28.4.2 2010/04/22 20:02:49 snj Exp $ */
+/* $NetBSD: cpu.c,v 1.28.4.3 2010/11/22 01:43:58 riz Exp $ */
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.28.4.2 2010/04/22 20:02:49 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.28.4.3 2010/11/22 01:43:58 riz Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -231,26 +231,22 @@
struct cpu_softc *sc = device_private(self);
struct cpu_attach_args *caa = aux;
struct cpu_info *ci;
- int cpunum = caa-cpu_number;
+ static int nphycpu = 0;
sc-sc_dev = self;
/*
- * If we're an Application Processor, allocate a cpu_info
- * structure, otherwise use the primary's.
+ * If we're the first attached CPU use the primary cpu_info,
+ * otherwise allocate a new one.
*/
- if (caa-cpu_role == CPU_ROLE_AP) {
+ if (nphycpu 0) {
ci = malloc(sizeof(*ci), M_DEVBUF, M_WAITOK | M_ZERO);
ci-ci_curldt = -1;
- if (phycpu_info[cpunum] != NULL)
- panic(cpu at apic id %d already attached?, cpunum);
- phycpu_info[cpunum] = ci;
+ if (phycpu_info[nphycpu] != NULL)
+ panic(cpu%d already attached?, nphycpu);
+ phycpu_info[nphycpu] = ci;
} else {
ci = phycpu_info_primary;
- if (cpunum != 0) {
- phycpu_info[0] = NULL;
- phycpu_info[cpunum] = ci;
- }
}
ci-ci_self = ci;
@@ -259,29 +255,9 @@
ci-ci_dev = self;
ci-ci_cpuid = caa-cpu_number;
ci-ci_vcpu = NULL;
+ ci-ci_index = nphycpu++;
- printf(: );
- switch (caa-cpu_role) {
- case CPU_ROLE_SP:
- printf((uniprocessor)\n);
- ci-ci_flags |= CPUF_PRESENT | CPUF_SP | CPUF_PRIMARY;
- break;
-
- case CPU_ROLE_BP:
- printf((boot processor)\n);
- ci-ci_flags |= CPUF_PRESENT | CPUF_BSP | CPUF_PRIMARY;
- break;
-
- case CPU_ROLE_AP:
- /*
- * report on an AP
- */
- printf((application processor)\n);
- break;
-
- default:
- panic(unknown processor type??\n);
- }
+ printf(\n);
return;
#else
cpu_attach_common(parent, self, aux);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Mon Nov 22 01:45:14 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1475. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 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.23 src/doc/CHANGES-5.2:1.1.2.24 --- src/doc/CHANGES-5.2:1.1.2.23 Mon Nov 22 00:25:54 2010 +++ src/doc/CHANGES-5.2 Mon Nov 22 01:45:14 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.23 2010/11/22 00:25:54 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.24 2010/11/22 01:45:14 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -807,3 +807,8 @@ results under certain circumstances. [tron, ticket #1474] +sys/arch/xen/x86/cpu.c1.52 + + Fix an array overflow when cpuid = 32. + [bouyer, ticket #1475] +
CVS commit: [netbsd-5] src/usr.bin/passwd
Module Name:src
Committed By: riz
Date: Mon Nov 22 02:41:07 UTC 2010
Modified Files:
src/usr.bin/passwd [netbsd-5]: yp_passwd.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1476):
usr.bin/passwd/yp_passwd.c: revision 1.34
PR/43852: Wolfgang Stukenbrock: yp_passwd command may destroy NIS database
entries when used on a server that includes users via netgroups.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.10.1 src/usr.bin/passwd/yp_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/yp_passwd.c
diff -u src/usr.bin/passwd/yp_passwd.c:1.32 src/usr.bin/passwd/yp_passwd.c:1.32.10.1
--- src/usr.bin/passwd/yp_passwd.c:1.32 Fri Jan 25 19:36:12 2008
+++ src/usr.bin/passwd/yp_passwd.c Mon Nov 22 02:41:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_passwd.c,v 1.32 2008/01/25 19:36:12 christos Exp $ */
+/* $NetBSD: yp_passwd.c,v 1.32.10.1 2010/11/22 02:41:07 riz Exp $ */
/*
* Copyright (c) 1988, 1990, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)local_passwd.c8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: yp_passwd.c,v 1.32 2008/01/25 19:36:12 christos Exp $);
+__RCSID($NetBSD: yp_passwd.c,v 1.32.10.1 2010/11/22 02:41:07 riz Exp $);
#endif
#endif /* not lint */
@@ -167,21 +167,26 @@
ypgetpwnam(const char *nam, struct passwd *pwd)
{
char *val;
- int reason, vallen;
- int flags;
+ int reason, vallen, namlen = (int)strlen(nam);
+ int flags = 0;
int ok = 0;
val = NULL;
- reason = yp_match(domain, passwd.byname, nam, (int)strlen(nam),
- val, vallen);
+ reason = yp_match(domain, master.passwd.byname, nam, namlen,
+ val, vallen);
+ if (reason == YPERR_MAP) {
+ reason = yp_match(domain, passwd.byname, nam, namlen,
+ val, vallen);
+ flags = _PASSWORD_OLDFMT;
+ }
if (reason != 0)
goto out;
- flags = _PASSWORD_OLDFMT;
if (pw_scan(val, pwd, flags) == 0)
goto out;
ok = 1;
+ val = NULL; /* Don't free the memory, it is still in use */
out:
if (val)
free(val);
@@ -212,7 +217,7 @@
char *master;
int ch, r, rpcport, status;
struct yppasswd ypp;
- struct passwd pwb, *pw;
+ struct passwd pwb, pwb2, *pw;
char pwbuf[1024];
struct timeval tv;
CLIENT *client;
@@ -265,7 +270,7 @@
* the daemon.
*/
if ((r = yp_master(domain, passwd.byname, master)) != 0)
- errx(1, can't find the master NIS server. Reason: %s,
+ errx(1, can't find the master NIS server. Reason: %s,
yperr_string(r));
/*
@@ -284,16 +289,16 @@
/* Bail out if this is a local (non-yp) user, */
/* then get user's login identity */
- if (!ypgetpwnam(username, pw = pwb) ||
- getpwnam_r(username, pwb, pwbuf, sizeof(pwbuf), pw) ||
+ if (!ypgetpwnam(username, pwb) ||
+ getpwnam_r(username, pwb2, pwbuf, sizeof(pwbuf), pw) ||
pw == NULL)
errx(1, NIS unknown user %s, username);
- if (uid uid != pw-pw_uid)
+ if (uid uid != pwb.pw_uid)
errx(1, you may only change your own password: %s,
strerror(EACCES));
- makeypp(ypp, pw);
+ makeypp(ypp, pwb);
client = clnt_create(master, YPPASSWDPROG, YPPASSWDVERS, udp);
if (client == NULL)
