CVS commit: [uebayasi-xip] src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Fri Feb 11 09:01:42 UTC 2011
Modified Files:
src/sys/miscfs/genfs [uebayasi-xip]: genfs_io.c
Log Message:
Clean up debug code.
To generate a diff of this commit:
cvs rdiff -u -r1.36.2.64 -r1.36.2.65 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.64 src/sys/miscfs/genfs/genfs_io.c:1.36.2.65
--- src/sys/miscfs/genfs/genfs_io.c:1.36.2.64 Sun Nov 21 18:22:32 2010
+++ src/sys/miscfs/genfs/genfs_io.c Fri Feb 11 09:01:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.36.2.64 2010/11/21 18:22:32 uebayasi Exp $ */
+/* $NetBSD: genfs_io.c,v 1.36.2.65 2011/02/11 09:01:42 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.64 2010/11/21 18:22:32 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.36.2.65 2011/02/11 09:01:42 uebayasi Exp $);
#include opt_xip.h
@@ -215,17 +215,6 @@
*/
if (flags PGO_LOCKED) {
-#if 0
- genfs_getpages_mem();
- } else {
- genfs_getpages_io();
- }
-}
-
-int
-genfs_getpages_mem()
-{
-#endif
int nfound;
struct vm_page *pg;
@@ -274,13 +263,7 @@
goto out_err;
}
mutex_exit(uobj-vmobjlock);
-#if 0
-}
-int
-genfs_getpages_io()
-{
-#endif
/*
* find the requested pages and make some simple checks.
* leave space in the page array for a whole block.
@@ -325,13 +308,7 @@
UVMHIST_LOG(ubchist, ridx %d npages %d startoff %ld endoff %ld,
ridx, npages, startoffset, endoffset);
-#if 0
-}
-int
-genfs_getpages_io_relock()
-{
-#endif
if (!has_trans) {
fstrans_start(vp-v_mount, FSTRANS_SHARED);
has_trans = true;
@@ -360,13 +337,7 @@
kmem_free(pgs, pgs_size);
goto startover;
}
-#if 0
-}
-int
-genfs_getpages_io_findpages()
-{
-#endif
if (!xip) {
if (uvn_findpages(uobj, origoffset, npages, pgs[ridx],
async ? UFP_NOWAIT : UFP_ALL) != orignmempages) {
@@ -407,18 +378,7 @@
*/
if (overwrite) {
-#if 0
- genfs_getpages_io_overwrite();
- } else {
- genfs_getpages_io_read();
- }
-}
-int
-genfs_getpages_io_overwrite()
-{
- {
-#endif
KASSERT(!xip);
if (!glocked) {
@@ -434,25 +394,13 @@
npages += ridx;
goto out;
}
-#if 0
-}
-int
-genfs_getpages_io_read()
-{
-#endif
/*
* the page wasn't resident and we're not overwriting,
* so we're going to have to do some i/o.
* find any additional pages needed to cover the expanded range.
*/
-#if 0
-}
-int
-genfs_getpages_io_read_allocpages()
-{
-#endif
if (!xip) {
npages = (endoffset - startoffset) PAGE_SHIFT;
if (startoffset != origoffset || npages != orignmempages) {
@@ -483,13 +431,7 @@
}
}
}
-#if 0
-}
-int
-genfs_getpages_io_read_bio()
-{
-#endif
mutex_exit(uobj-vmobjlock);
{
@@ -506,13 +448,7 @@
bytes = MIN(totalbytes, MAX(diskeof - startoffset, 0));
tailbytes = totalbytes - bytes;
skipbytes = 0;
-#if 0
-}
-int
-genfs_getpages_io_read_bio_prepare()
-{
-#endif
if (!xip) {
kva = uvm_pagermapin(pgs, npages,
UVMPAGER_MAPIN_READ | UVMPAGER_MAPIN_WAITOK);
@@ -534,10 +470,7 @@
else
BIO_SETPRIO(mbp, BPRIO_TIMECRITICAL);
}
-#if 0
-}
-#endif
/*
* if EOF is in the middle of the range, zero the part past EOF.
* skip over pages which are not PG_FAKE since in that case they have
@@ -557,13 +490,7 @@
tailstart += len;
tailbytes -= len;
}
-#if 0
-}
-int
-genfs_getpages_io_read_bio_loop()
-{
-#endif
/*
* now loop over the pages, reading as needed.
*/
@@ -743,12 +670,7 @@
}
loopdone:
-#if 0
-int
-genfs_getpages_biodone()
-{
-#endif
if (!xip) {
nestiobuf_done(mbp, skipbytes, error);
if (async) {
@@ -809,10 +731,7 @@
putiobuf(mbp);
}
-#if 0
-}
-#endif
}
if (!glocked) {
@@ -820,13 +739,7 @@
}
mutex_enter(uobj-vmobjlock);
-#if 0
-}
-int
-genfs_getpages_generic_io_done()
-{
-#endif
/*
* we're almost done! release the pages...
* for errors, we free the pages.
@@ -931,10 +844,6 @@
orignmempages * sizeof(struct vm_page *));
KASSERT(error != 0 || ap-a_m[ap-a_centeridx] != NULL);
}
-#if 0
-}
-
-#endif
out_err_free:
if (pgs != NULL pgs != pgs_onstack)
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: yamt
Date: Fri Feb 11 09:15:45 UTC 2011
Modified Files:
src/sys/fs/puffs: puffs_msgif.c
Log Message:
puffs_msg_wait: check PARKFLAG_HASERROR before PARKFLAG_CALL. PR/44240.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/fs/puffs/puffs_msgif.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/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.84 src/sys/fs/puffs/puffs_msgif.c:1.85
--- src/sys/fs/puffs/puffs_msgif.c:1.84 Mon Nov 15 20:31:41 2010
+++ src/sys/fs/puffs/puffs_msgif.c Fri Feb 11 09:15:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.84 2010/11/15 20:31:41 pooka Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.85 2011/02/11 09:15:45 yamt Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.84 2010/11/15 20:31:41 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_msgif.c,v 1.85 2011/02/11 09:15:45 yamt Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -468,13 +468,6 @@
mutex_exit(pmp-pmp_lock);
mutex_enter(park-park_mtx);
- if ((park-park_flags PARKFLAG_WANTREPLY) == 0
- || (park-park_flags PARKFLAG_CALL)) {
- mutex_exit(park-park_mtx);
- rv = 0;
- goto skipwait;
- }
-
/* did the response beat us to the wait? */
if (__predict_false((park-park_flags PARKFLAG_DONE)
|| (park-park_flags PARKFLAG_HASERROR))) {
@@ -483,6 +476,13 @@
goto skipwait;
}
+ if ((park-park_flags PARKFLAG_WANTREPLY) == 0
+ || (park-park_flags PARKFLAG_CALL)) {
+ mutex_exit(park-park_mtx);
+ rv = 0;
+ goto skipwait;
+ }
+
error = cv_wait_sig(park-park_cv, park-park_mtx);
DPRINTF((puffs_touser: waiter for %p woke up with %d\n,
park, error));
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Fri Feb 11 10:07:20 UTC 2011
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: plainrsa-gen.c
Log Message:
From Mats E Andersson deb...@gisladisker.se: Fix fprintf format specifier
usage from previous patch.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c:1.5 src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c:1.6
--- src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c:1.5 Thu Feb 10 11:20:08 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/plainrsa-gen.c Fri Feb 11 10:07:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: plainrsa-gen.c,v 1.5 2011/02/10 11:20:08 tteras Exp $ */
+/* $NetBSD: plainrsa-gen.c,v 1.6 2011/02/11 10:07:19 tteras Exp $ */
/* Id: plainrsa-gen.c,v 1.6 2005/04/21 09:08:40 monas Exp */
/*
@@ -131,7 +131,7 @@
fprintf(fp, # : PUB 0s%s\n, pubkey64-v);
fprintf(fp, : RSA\t{\n);
- fprintf(fp, \t# RSA %zu bits\n, BN_num_bits(key-n));
+ fprintf(fp, \t# RSA %d bits\n, BN_num_bits(key-n));
fprintf(fp, \t# pubkey=0s%s\n, pubkey64-v);
fprintf(fp, \tModulus: 0x%s\n, lowercase(BN_bn2hex(key-n)));
fprintf(fp, \tPublicExponent: 0x%s\n, lowercase(BN_bn2hex(key-e)));
CVS commit: [bouyer-quota2] src/sys/kern
Module Name:src Committed By: bouyer Date: Fri Feb 11 11:27:30 UTC 2011 Modified Files: src/sys/kern [bouyer-quota2]: vfs_syscalls.c Log Message: Remove debug printf To generate a diff of this commit: cvs rdiff -u -r1.414.4.1 -r1.414.4.2 src/sys/kern/vfs_syscalls.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/vfs_syscalls.c diff -u src/sys/kern/vfs_syscalls.c:1.414.4.1 src/sys/kern/vfs_syscalls.c:1.414.4.2 --- src/sys/kern/vfs_syscalls.c:1.414.4.1 Thu Jan 20 14:24:58 2011 +++ src/sys/kern/vfs_syscalls.c Fri Feb 11 11:27:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls.c,v 1.414.4.1 2011/01/20 14:24:58 bouyer Exp $ */ +/* $NetBSD: vfs_syscalls.c,v 1.414.4.2 2011/02/11 11:27:29 bouyer Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.414.4.1 2011/01/20 14:24:58 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.414.4.2 2011/02/11 11:27:29 bouyer Exp $); #ifdef _KERNEL_OPT #include opt_fileassoc.h @@ -899,27 +899,21 @@ error = namei_simple_user(SCARG(uap, path), NSM_FOLLOW_TRYEMULROOT, vp); - printf(namei error %d\n, error); if (error != 0) return (error); mp = vp-v_mount; error = copyin(SCARG(uap, pref), pref, sizeof(pref)); - printf(copyin error %d\n, error); if (error) return error; error = prop_dictionary_copyin(pref, dict); - printf(prop_dictionary_copyin error %d\n, error); if (error) return error; error = VFS_QUOTACTL(mp, dict); - printf(VFS_QUOTACTL error %d\n, error); vrele(vp); if (!error) error = prop_dictionary_copyout(pref, dict); - printf(prop_dictionary_copyout error %d\n, error); if (!error) error = copyout(pref, SCARG(uap, pref), sizeof(pref)); - printf(copyout error %d\n, error); prop_object_release(dict); return (error); }
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src
Committed By: bouyer
Date: Fri Feb 11 11:38:44 UTC 2011
Modified Files:
src/sys/ufs/ufs [bouyer-quota2]: quota2_prop.c
Log Message:
Remove key quota version, it doesn't serve any purpose
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/ufs/ufs/quota2_prop.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/ufs/ufs/quota2_prop.c
diff -u src/sys/ufs/ufs/quota2_prop.c:1.1.2.4 src/sys/ufs/ufs/quota2_prop.c:1.1.2.5
--- src/sys/ufs/ufs/quota2_prop.c:1.1.2.4 Mon Jan 31 15:24:10 2011
+++ src/sys/ufs/ufs/quota2_prop.c Fri Feb 11 11:38:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2_prop.c,v 1.1.2.4 2011/01/31 15:24:10 bouyer Exp $ */
+/* $NetBSD: quota2_prop.c,v 1.1.2.5 2011/02/11 11:38:44 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -134,12 +134,6 @@
if (prop_number_integer_value(pn) != 1)
return EINVAL;
- pn = prop_dictionary_get(qdict, quota version);
- if (pn == NULL)
- return EINVAL;
- if (prop_number_integer_value(pn) != 2)
- return EINVAL;
-
o = prop_dictionary_get(qdict, commands);
if (o == NULL)
return ENOMEM;
@@ -183,9 +177,6 @@
if (!prop_dictionary_set_uint8(dict, interface version, 1)) {
goto err;
}
- if (!prop_dictionary_set_uint8(dict, quota version, 2)) {
- goto err;
- }
return dict;
err:
prop_object_release(dict);
@@ -247,7 +238,6 @@
err:
prop_object_release(dict1);
return NULL;
-
}
prop_dictionary_t
CVS commit: src/sys/arch/sandpoint
Module Name:src Committed By: phx Date: Fri Feb 11 12:26:05 UTC 2011 Modified Files: src/sys/arch/sandpoint: README.NAS Log Message: Sorted out NH230 based bords. Added NH230 IRQ mapping. LevelOne FNS-5000B seems identical to QNAP TS-201. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sandpoint/README.NAS 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/sandpoint/README.NAS diff -u src/sys/arch/sandpoint/README.NAS:1.13 src/sys/arch/sandpoint/README.NAS:1.14 --- src/sys/arch/sandpoint/README.NAS:1.13 Thu Feb 10 17:11:33 2011 +++ src/sys/arch/sandpoint/README.NAS Fri Feb 11 12:26:04 2011 @@ -1,4 +1,4 @@ -$NetBSD: README.NAS,v 1.13 2011/02/10 17:11:33 phx Exp $ +$NetBSD: README.NAS,v 1.14 2011/02/11 12:26:04 phx Exp $ MPC8241/8245 NAS products @@ -26,12 +26,12 @@ re.15 viaide.13 IOMEGA StorCenter 250/500/1T Not yet recognized, research in progress -re.15 satalink.13 QNAP TS-201 +re.15 satalink.13 QNAP TS-201, LevelOne FNS-5000B stge.15 acardide.16 D-Link DSM-G600 -re.? iteide.16 Allnet ALL6250 -re.? satalink.? Allnet ALL6260, Longshine LCS-8311, Netronix NH231, +re.15 iteide.16 Netronix NH-230, Allnet ALL6250, Encore ENNHD-1000, + Planex NAS-01G +re.15 satalink.16 Netronix NH-231, Allnet ALL6260, Longshine LCS-8311, Fujitsu-Siemens AMS150, Fujitsu-Siemens SBLAN2 -? ? LevelOne NASCon FNS-5000B (GBit, SATA) PCI line/pin and EPIC IRQ assignments @@ -42,6 +42,7 @@ QNAP 13, 14, 15, 16 - 0, 1, 2, 3 StorCenter 12, 13, 14, 15 - 0, 1, 2, 3 DLink 13, 14, 15, 16 - 0, 1, 3, 4 +NH230 13, 14, 15, 16 - 0, 3, 1, 2 - USB EHCI is a multiple function PCI device which has pin assignment A, B and C.
CVS commit: [bouyer-quota2] src/usr.sbin/quotactl
Module Name:src Committed By: bouyer Date: Fri Feb 11 12:44:40 UTC 2011 Modified Files: src/usr.sbin/quotactl [bouyer-quota2]: quotactl.8 Log Message: Add an example plist To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/usr.sbin/quotactl/quotactl.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/quotactl/quotactl.8 diff -u src/usr.sbin/quotactl/quotactl.8:1.1.2.1 src/usr.sbin/quotactl/quotactl.8:1.1.2.2 --- src/usr.sbin/quotactl/quotactl.8:1.1.2.1 Mon Jan 31 21:14:06 2011 +++ src/usr.sbin/quotactl/quotactl.8 Fri Feb 11 12:44:39 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: quotactl.8,v 1.1.2.1 2011/01/31 21:14:06 bouyer Exp $ +.\ $NetBSD: quotactl.8,v 1.1.2.2 2011/02/11 12:44:39 bouyer Exp $ .\ .\ Copyright (c) 2011 Manuel Bouyer .\ All rights reserved. @@ -67,6 +67,62 @@ .Fl x is present, a message is printed to stderr for each failed command, and the exit status will be 2 if any comand failed. +.Sh EXAMPLES +This will set the quota limits for user id 100 on the filesystem /home: +.Bd -literal +quotactl /home EOF +?xml version=1.0 encoding=UTF-8? +!DOCTYPE plist PUBLIC -//Apple Computer//DTD PLIST 1.0//EN http://www.apple.com/DTDs/PropertyList-1.0.dtd; +plist version=1.0 +dict +keycommands/key +array +dict +keycommand/key +stringset/string +keydata/key +array +dict +keyblock/key +dict +keyexpire time/key +integer0/integer +keygrace time/key +integer2419200/integer +keyhard/key +integer0x2000/integer +keysoft/key +integer0x1000/integer +keyusage/key +integer0x0/integer +/dict +keyfile/key +dict +keyexpire time/key +integer0/integer +keygrace time/key +integer172800/integer +keyhard/key +integer0x800/integer +keysoft/key +integer0x400/integer +keyusage/key +integer0x0/integer +/dict +keyid/key +integer100/integer +/dict +/array +keytype/key +stringuser/string +/dict +/array +keyinterface version/key +integer0x1/integer +/dict +/plist +EOF + .Sh SEE ALSO .Xr quota 1 , .Xr quotactl 2 ,
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Fri Feb 11 12:46:41 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
ssh mostly ignores the return value of select(), so if the timeout
expired it would assume that all input set descriptors had activity.
In case we get rv == 0 from the poll backend, zero out the fd sets
to signal that in fact no descriptors have activity.
Before this commit ssh was jittery when run through a rump tcp/ip
stack (interactive sessions kept blocking on stdin and you had to
peddle the connection). Now it works smoothly ... or at least
smoothly enough so that this commit could be done through a rump
tcp/ip stack:
USER COMMANDPID FD PROTO LOCAL ADDRESS FOREIGN ADDRESS
root ssh1250 tcplocalhost.65517 cvs.netbsd.org.22
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.35 src/lib/librumphijack/hijack.c:1.36
--- src/lib/librumphijack/hijack.c:1.35 Tue Feb 8 19:12:54 2011
+++ src/lib/librumphijack/hijack.c Fri Feb 11 12:46:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.35 2011/02/08 19:12:54 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.36 2011/02/11 12:46:41 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.35 2011/02/08 19:12:54 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.36 2011/02/11 12:46:41 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -591,18 +591,27 @@
if (incr)
j++;
}
+ assert(j == realnfds);
if (timeout) {
TIMEVAL_TO_TIMESPEC(timeout, ts);
tsp = ts;
}
rv = REALPOLLTS(pfds, realnfds, tsp, NULL);
- if (rv = 0)
+ /*
+ * If select() returns with an error the descriptor sets
+ * will be unmodified
+ */
+ if (rv 0)
goto out;
/*
- * ok, harvest results. first zero out entries (can't use
- * FD_ZERO for the obvious select-me-not reason). whee.
+ * zero out results (can't use FD_ZERO for the
+ * obvious select-me-not reason). whee.
+ *
+ * We do this here since some software ignores the return
+ * value of select, and hence if the timeout expires, it may
+ * assume all input descriptors have activity.
*/
for (i = 0; i nfds; i++) {
if (readfds)
@@ -612,8 +621,12 @@
if (exceptfds)
FD_CLR(i, exceptfds);
}
+ if (rv == 0)
+ goto out;
- /* and then plug in the results */
+ /*
+ * We have 0 fds with activity. Harvest the results.
+ */
for (i = 0; i (int)realnfds; i++) {
if (readfds) {
if (pfds[i].revents POLLIN) {
CVS commit: [bouyer-quota2] src/lib/libc/sys
Module Name:src Committed By: bouyer Date: Fri Feb 11 12:50:11 UTC 2011 Modified Files: src/lib/libc/sys [bouyer-quota2]: quotactl.2 Log Message: Add pointers to source files using the quotactl interface To generate a diff of this commit: cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/lib/libc/sys/quotactl.2 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/sys/quotactl.2 diff -u src/lib/libc/sys/quotactl.2:1.26.2.1 src/lib/libc/sys/quotactl.2:1.26.2.2 --- src/lib/libc/sys/quotactl.2:1.26.2.1 Fri Feb 11 12:35:27 2011 +++ src/lib/libc/sys/quotactl.2 Fri Feb 11 12:50:11 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: quotactl.2,v 1.26.2.1 2011/02/11 12:35:27 bouyer Exp $ +.\ $NetBSD: quotactl.2,v 1.26.2.2 2011/02/11 12:50:11 bouyer Exp $ .\ .\ Copyright (c) 1983, 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -181,6 +181,20 @@ was supplied; the associated structure could not be copied in or out of the kernel. .El +.Sh FILES +Example of usage of the +.Nm +syscall, with construction of the pref argument an interpretation of +the reply, can be found in the following +.Nx +source files: +.Bl -tag +.It src/usr.bin/quota/getvfsquota.c +.It src/usr.sbin/repquota/repquota.c +.It src/usr.sbin/edquota/edquota.c +.It src/usr.sbin/quotaon/quotaon.c +.It src/sys/ufs/ufs/quota2_prop.c +.El .Sh SEE ALSO .Xr quota 1 , .Xr proplib 3 ,
CVS commit: [bouyer-quota2] src/share/man/man5
Module Name:src Committed By: bouyer Date: Fri Feb 11 12:58:50 UTC 2011 Modified Files: src/share/man/man5 [bouyer-quota2]: fstab.5 Log Message: Mention the new in-filesystem quota system, and a possible migration path using repquota -x and quotactl. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.4.1 src/share/man/man5/fstab.5 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/man5/fstab.5 diff -u src/share/man/man5/fstab.5:1.36 src/share/man/man5/fstab.5:1.36.4.1 --- src/share/man/man5/fstab.5:1.36 Sun Jan 11 22:03:56 2009 +++ src/share/man/man5/fstab.5 Fri Feb 11 12:58:50 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstab.5,v 1.36 2009/01/11 22:03:56 wiz Exp $ +.\ $NetBSD: fstab.5,v 1.36.4.1 2011/02/11 12:58:50 bouyer Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -183,7 +183,7 @@ are specified, the filesystem is automatically processed by the .Xr quotacheck 8 -command, and user and/or group disk quotas are enabled with +command, and legacy user and/or group disk quotas are enabled with .Xr quotaon 8 . By default, filesystem quotas are maintained in files named @@ -202,6 +202,23 @@ userquota=/var/quotas/tmp.user .Ed .Pp +It is recommended to turn on the new, in-filesystem quota with +.Xr tunefs 8 +or at +.Xr newfs 8 +time, and to not use the +.Dq userquota +or +.Dq groupquota +options. +Migration of limits to the new in-filesystem quota can be handled +by +.Xr repquota 8 +with option +.Fl x +and +.Xr quotactl 8 . +.Pp The option .Dq rump is used to mount the file system using a
CVS commit: src/tests/fs/psshfs
Module Name:src Committed By: pooka Date: Fri Feb 11 13:19:46 UTC 2011 Modified Files: src/tests/fs/psshfs: sshd_config.in t_psshfs.sh Log Message: Use sshd's pidfile instead of $! and wait for the pidfile to appear. This plugs a race condition where sshd did not have a chance to open a sucket before we attempted to connect to it. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/fs/psshfs/sshd_config.in cvs rdiff -u -r1.3 -r1.4 src/tests/fs/psshfs/t_psshfs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/psshfs/sshd_config.in diff -u src/tests/fs/psshfs/sshd_config.in:1.1 src/tests/fs/psshfs/sshd_config.in:1.2 --- src/tests/fs/psshfs/sshd_config.in:1.1 Tue Jul 6 14:06:22 2010 +++ src/tests/fs/psshfs/sshd_config.in Fri Feb 11 13:19:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: sshd_config.in,v 1.1 2010/07/06 14:06:22 pooka Exp $ +# $NetBSD: sshd_config.in,v 1.2 2011/02/11 13:19:46 pooka Exp $ # Basic settings. Port 1 @@ -20,7 +20,7 @@ StrictModes no # Some settings to allow user runs of sshd. -PidFile @WORKDIR@/sshd.pid.2 +PidFile @WORKDIR@/sshd.pid Subsystem sftp @WORKDIR@/sftp-server UsePam no UsePrivilegeSeparation no Index: src/tests/fs/psshfs/t_psshfs.sh diff -u src/tests/fs/psshfs/t_psshfs.sh:1.3 src/tests/fs/psshfs/t_psshfs.sh:1.4 --- src/tests/fs/psshfs/t_psshfs.sh:1.3 Thu Jan 6 07:28:32 2011 +++ src/tests/fs/psshfs/t_psshfs.sh Fri Feb 11 13:19:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_psshfs.sh,v 1.3 2011/01/06 07:28:32 pooka Exp $ +# $NetBSD: t_psshfs.sh,v 1.4 2011/02/11 13:19:46 pooka Exp $ # # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -80,8 +80,10 @@ atf_check -s eq:0 -o empty -e empty chmod 400 ssh_host_key atf_check -s eq:0 -o empty -e empty chmod 444 ssh_host_key.pub - /usr/sbin/sshd -e -D -f ./sshd_config sshd.log 21 - echo $! sshd.pid + /usr/sbin/sshd -e -f ./sshd_config sshd.log 21 + while [ ! -f sshd.pid ]; do + sleep 0.01 + done echo SSH server started (pid $(cat sshd.pid)) echo Setting up SSH client configuration
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Fri Feb 11 14:02:13 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
play the important typecast game
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.36 src/lib/librumphijack/hijack.c:1.37
--- src/lib/librumphijack/hijack.c:1.36 Fri Feb 11 12:46:41 2011
+++ src/lib/librumphijack/hijack.c Fri Feb 11 14:02:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.36 2011/02/11 12:46:41 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.37 2011/02/11 14:02:12 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.36 2011/02/11 12:46:41 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.37 2011/02/11 14:02:12 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -591,7 +591,7 @@
if (incr)
j++;
}
- assert(j == realnfds);
+ assert(j == (int)realnfds);
if (timeout) {
TIMEVAL_TO_TIMESPEC(timeout, ts);
CVS commit: [bouyer-quota2] src/usr.sbin/quotactl
Module Name:src Committed By: bouyer Date: Fri Feb 11 15:05:35 UTC 2011 Modified Files: src/usr.sbin/quotactl [bouyer-quota2]: quotactl.c Log Message: Fix pointers if realloc return a different memory area. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/usr.sbin/quotactl/quotactl.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/quotactl/quotactl.c diff -u src/usr.sbin/quotactl/quotactl.c:1.1.2.1 src/usr.sbin/quotactl/quotactl.c:1.1.2.2 --- src/usr.sbin/quotactl/quotactl.c:1.1.2.1 Mon Jan 31 21:14:06 2011 +++ src/usr.sbin/quotactl/quotactl.c Fri Feb 11 15:05:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: quotactl.c,v 1.1.2.1 2011/01/31 21:14:06 bouyer Exp $ */ +/* $NetBSD: quotactl.c,v 1.1.2.2 2011/02/11 15:05:35 bouyer Exp $ */ /*- * Copyright (c) 2011 Manuel Bouyer * All rights reserved. @@ -29,7 +29,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: quotactl.c,v 1.1.2.1 2011/01/31 21:14:06 bouyer Exp $); +__RCSID($NetBSD: quotactl.c,v 1.1.2.2 2011/02/11 15:05:35 bouyer Exp $); #endif /* not lint */ /* @@ -107,10 +107,10 @@ plist = realloc(plist, plistsize + READ_SIZE); if (plist == NULL) err(1, realloc buffer); - p += READ_SIZE; + p = plist + plistsize; plistsize += READ_SIZE; } - if (ferror(f)) + if (!feof(f)) err(1, error reading %s, xmlfile); qdict = prop_dictionary_internalize(plist);
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Fri Feb 11 15:38:14 UTC 2011
Modified Files:
src/tests/lib/librumphijack: Makefile
Added Files:
src/tests/lib/librumphijack: h_client.c t_asyncio.sh
Log Message:
add test for fix in rev 1.36 of librumphijack/hijack.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumphijack/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/librumphijack/h_client.c \
src/tests/lib/librumphijack/t_asyncio.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/Makefile
diff -u src/tests/lib/librumphijack/Makefile:1.1 src/tests/lib/librumphijack/Makefile:1.2
--- src/tests/lib/librumphijack/Makefile:1.1 Sun Feb 6 18:44:29 2011
+++ src/tests/lib/librumphijack/Makefile Fri Feb 11 15:38:14 2011
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2011/02/06 18:44:29 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/11 15:38:14 pooka Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/lib/librumphijack
-TESTS_SH= t_tcpip
-TESTS_C= h_netget
+TESTS_SH= t_asyncio
+TESTS_SH+= t_tcpip
+TESTS_C= h_client
+TESTS_C+= h_netget
FILES= netstat.expout index.html
FILESDIR= ${TESTSDIR}
Added files:
Index: src/tests/lib/librumphijack/h_client.c
diff -u /dev/null src/tests/lib/librumphijack/h_client.c:1.1
--- /dev/null Fri Feb 11 15:38:14 2011
+++ src/tests/lib/librumphijack/h_client.c Fri Feb 11 15:38:14 2011
@@ -0,0 +1,71 @@
+/* $NetBSD: h_client.c,v 1.1 2011/02/11 15:38:14 pooka Exp $ */
+
+/*
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
+ * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/types.h
+#include sys/select.h
+
+#include err.h
+#include errno.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include unistd.h
+
+int
+main(int argc, char *argv[])
+{
+
+ if (argc != 2) {
+ errx(1, need testname as param);
+ }
+
+ if (strcmp(argv[1], select_timeout) == 0) {
+ fd_set rfds;
+ struct timeval tv;
+ int rv;
+
+ tv.tv_sec = 0;
+ tv.tv_usec = 1;
+
+ FD_ZERO(rfds);
+ FD_SET(STDIN_FILENO, rfds);
+
+ rv = select(STDIN_FILENO+1, rfds, NULL, NULL, tv);
+ if (rv == -1)
+ err(1, select);
+ if (rv != 0)
+ errx(1, select succesful);
+
+ if (FD_ISSET(STDIN_FILENO, rfds))
+ errx(1, stdin fileno is still set);
+ exit(0);
+ } else {
+ return ENOTSUP;
+ }
+}
Index: src/tests/lib/librumphijack/t_asyncio.sh
diff -u /dev/null src/tests/lib/librumphijack/t_asyncio.sh:1.1
--- /dev/null Fri Feb 11 15:38:14 2011
+++ src/tests/lib/librumphijack/t_asyncio.sh Fri Feb 11 15:38:14 2011
@@ -0,0 +1,53 @@
+# $NetBSD: t_asyncio.sh,v 1.1 2011/02/11 15:38:14 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Fri Feb 11 15:38:55 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +tp To generate a diff of this commit: cvs rdiff -u -r1.245 -r1.246 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.245 src/distrib/sets/lists/tests/mi:1.246 --- src/distrib/sets/lists/tests/mi:1.245 Wed Feb 9 14:34:42 2011 +++ src/distrib/sets/lists/tests/mi Fri Feb 11 15:38:55 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.245 2011/02/09 14:34:42 pooka Exp $ +# $NetBSD: mi,v 1.246 2011/02/11 15:38:55 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -472,6 +472,7 @@ ./usr/libdata/debug/usr/tests/lib/librumpclient tests-lib-debug ./usr/libdata/debug/usr/tests/lib/librumpclient/t_fd.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/librumphijack tests-lib-debug +./usr/libdata/debug/usr/tests/lib/librumphijack/h_client.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/librumphijack/h_netget.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libskeytests-lib-debug ./usr/libdata/debug/usr/tests/lib/libskey/t_algorithms.debug tests-lib-debug debug,atf,skey @@ -1901,9 +1902,11 @@ ./usr/tests/lib/librumpclient/t_fd tests-lib-tests atf ./usr/tests/lib/librumphijack tests-lib-tests atf ./usr/tests/lib/librumphijack/Atffile tests-lib-tests atf +./usr/tests/lib/librumphijack/h_client tests-lib-tests atf ./usr/tests/lib/librumphijack/h_netget tests-lib-tests atf ./usr/tests/lib/librumphijack/index.html tests-lib-tests atf ./usr/tests/lib/librumphijack/netstat.expout tests-lib-tests atf +./usr/tests/lib/librumphijack/t_asyncio tests-lib-tests atf ./usr/tests/lib/librumphijack/t_tcpip tests-lib-tests atf ./usr/tests/lib/libskeytests-lib-tests atf ./usr/tests/lib/libskey/Atffile tests-lib-tests atf,skey
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Fri Feb 11 16:54:03 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: Makefile t_getquota.sh
Added Files:
src/tests/fs/ffs [bouyer-quota2]: t_miscquota.sh
Log Message:
Add a test which cause the kernel to walk a quota list where all entries
are not in the header disk block, and at last 2 of them are in the same
non-header disk block.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.6 -r1.14.2.7 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/tests/fs/ffs/t_getquota.sh
cvs rdiff -u -r0 -r1.1.2.1 src/tests/fs/ffs/t_miscquota.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.14.2.6 src/tests/fs/ffs/Makefile:1.14.2.7
--- src/tests/fs/ffs/Makefile:1.14.2.6 Wed Feb 9 20:53:10 2011
+++ src/tests/fs/ffs/Makefile Fri Feb 11 16:54:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14.2.6 2011/02/09 20:53:10 bouyer Exp $
+# $NetBSD: Makefile,v 1.14.2.7 2011/02/11 16:54:03 bouyer Exp $
#
.include bsd.own.mk
@@ -17,7 +17,7 @@
MAN.h_quota2_tests= # empty
BINDIR.h_quota2_tests= ${TESTSDIR}
-.for name in t_getquota t_setquota t_quotalimit t_clearquota
+.for name in t_getquota t_setquota t_quotalimit t_clearquota t_miscquota
TESTS_SH+= ${name}
TESTS_SH_SRC_${name}= quotas_common.sh ${name}.sh
.endfor
Index: src/tests/fs/ffs/t_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.1.2.7 src/tests/fs/ffs/t_getquota.sh:1.1.2.8
--- src/tests/fs/ffs/t_getquota.sh:1.1.2.7 Mon Feb 7 16:22:50 2011
+++ src/tests/fs/ffs/t_getquota.sh Fri Feb 11 16:54:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.1.2.7 2011/02/07 16:22:50 bouyer Exp $
+# $NetBSD: t_getquota.sh,v 1.1.2.8 2011/02/11 16:54:03 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -84,3 +84,28 @@
done
rump_shutdown
}
+
+quota_walk_list()
+{
+ create_with_quotas_server $*
+ local q=$4
+ local expect
+
+ case ${q} in
+ user)
+ expect=u
+ fail=g
+ ;;
+ group)
+ expect=g
+ fail=u
+ ;;
+ both)
+ expect=u g
+ fail=
+ ;;
+ *)
+ atf_fail wrong quota type
+ ;;
+ esac
+}
Added files:
Index: src/tests/fs/ffs/t_miscquota.sh
diff -u /dev/null src/tests/fs/ffs/t_miscquota.sh:1.1.2.1
--- /dev/null Fri Feb 11 16:54:03 2011
+++ src/tests/fs/ffs/t_miscquota.sh Fri Feb 11 16:54:03 2011
@@ -0,0 +1,63 @@
+# $NetBSD: t_miscquota.sh,v 1.1.2.1 2011/02/11 16:54:03 bouyer Exp $
+#
+# Copyright (c) 2011 Manuel Bouyer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+test_case walk_list_user quota_walk_list \
+walk user quota list over several disk blocks -b le 1 user
+
+quota_walk_list()
+{
+ create_with_quotas_server $*
+ local q=$4
+ local expect
+
+ case ${q} in
+ user)
+ expect=u
+ fail=g
+ ;;
+ group)
+ expect=g
+ fail=u
+ ;;
+ *)
+ atf_fail wrong quota type
+ ;;
+ esac
+
+ # create 100 users, all in the same hash list
+ local i=1;
+ while [ $i -lt 101 ]; do
+ atf_check -s exit:0 \
+ $(atf_get_srcdir)/rump_edquota -${expect} \
+ -s10k/20 -h40M/50k -t 2W/3D $((i * 4096))
+ i=$((i + 1))
+ done
+ # do a repquota
+ atf_check -s exit:0 -o 'match:integer0x64000' \
+ $(atf_get_srcdir)/rump_repquota -x -${expect} /mnt
+ rump_shutdown
+}
CVS commit: [bouyer-quota2] src/distrib/sets/lists/tests
Module Name:src Committed By: bouyer Date: Fri Feb 11 16:54:35 UTC 2011 Modified Files: src/distrib/sets/lists/tests [bouyer-quota2]: mi Log Message: +t_miscquota To generate a diff of this commit: cvs rdiff -u -r1.240.2.3 -r1.240.2.4 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.240.2.3 src/distrib/sets/lists/tests/mi:1.240.2.4 --- src/distrib/sets/lists/tests/mi:1.240.2.3 Wed Feb 9 20:53:10 2011 +++ src/distrib/sets/lists/tests/mi Fri Feb 11 16:54:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.240.2.3 2011/02/09 20:53:10 bouyer Exp $ +# $NetBSD: mi,v 1.240.2.4 2011/02/11 16:54:35 bouyer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1189,6 +1189,7 @@ ./usr/tests/fs/ffs/t_quota2_remount tests-fs-tests atf ./usr/tests/fs/ffs/t_quotalimit tests-fs-tests atf ./usr/tests/fs/ffs/t_setquota tests-fs-tests atf +./usr/tests/fs/ffs/t_miscquota tests-fs-tests atf ./usr/tests/fs/kernfstests-fs-tests ./usr/tests/fs/kernfs/Atffile tests-fs-tests atf ./usr/tests/fs/kernfs/t_basic tests-fs-tests atf
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src
Committed By: bouyer
Date: Fri Feb 11 16:55:35 UTC 2011
Modified Files:
src/sys/ufs/ufs [bouyer-quota2]: ufs_quota2.c
Log Message:
walk_list: make sure we don't try to read the same quota disk block again
without releasing it first
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/ufs/ufs/ufs_quota2.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/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.1.2.13 src/sys/ufs/ufs/ufs_quota2.c:1.1.2.14
--- src/sys/ufs/ufs/ufs_quota2.c:1.1.2.13 Thu Feb 10 16:16:05 2011
+++ src/sys/ufs/ufs/ufs_quota2.c Fri Feb 11 16:55:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.1.2.13 2011/02/10 16:16:05 bouyer Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.1.2.14 2011/02/11 16:55:35 bouyer Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.1.2.13 2011/02/10 16:16:05 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_quota2.c,v 1.1.2.14 2011/02/11 16:55:35 bouyer Exp $);
#include sys/buf.h
#include sys/param.h
@@ -155,7 +155,7 @@
struct buf *bp, *obp = hbp;
int ret = 0, ret2 = 0;
struct quota2_entry *q2e;
- daddr_t lblkno, blkoff;
+ daddr_t lblkno, blkoff, olblkno = 0;
KASSERT(mutex_owner(dqlock));
@@ -165,6 +165,9 @@
if (lblkno == 0) {
/* in the header block */
bp = hbp;
+ } else if (lblkno == olblkno) {
+ /* still in the same buf */
+ bp = obp;
} else {
ret = bread(ump-um_quotas[type], lblkno,
ump-umq2_bsize,
@@ -192,6 +195,7 @@
brelse(obp, 0);
}
obp = bp;
+ olblkno = lblkno;
offp = (q2e-q2e_next);
off = ufs_rw64(*offp, needswap);
}
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Fri Feb 11 17:28:30 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: t_miscquota.sh Log Message: This test requires root To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/t_miscquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/ffs/t_miscquota.sh diff -u src/tests/fs/ffs/t_miscquota.sh:1.1.2.1 src/tests/fs/ffs/t_miscquota.sh:1.1.2.2 --- src/tests/fs/ffs/t_miscquota.sh:1.1.2.1 Fri Feb 11 16:54:03 2011 +++ src/tests/fs/ffs/t_miscquota.sh Fri Feb 11 17:28:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_miscquota.sh,v 1.1.2.1 2011/02/11 16:54:03 bouyer Exp $ +# $NetBSD: t_miscquota.sh,v 1.1.2.2 2011/02/11 17:28:29 bouyer Exp $ # # Copyright (c) 2011 Manuel Bouyer # All rights reserved. @@ -25,7 +25,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -test_case walk_list_user quota_walk_list \ +test_case_root walk_list_user quota_walk_list \ walk user quota list over several disk blocks -b le 1 user quota_walk_list()
CVS commit: src/sys/netipsec
Module Name:src Committed By: drochner Date: Fri Feb 11 17:53:35 UTC 2011 Modified Files: src/sys/netipsec: ipsec.c Log Message: invalidate the secpolicy cache bin the PCB before destroying, so that the refcount in the (global) policies gets decremented (This apparently was missed when the policy cache code was copied over from KAME IPSEC.) From Wolfgang Stukenbrock per PR kern/44410, just fixed differently to avoid unecessary differences to KAME. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/netipsec/ipsec.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/netipsec/ipsec.c diff -u src/sys/netipsec/ipsec.c:1.48 src/sys/netipsec/ipsec.c:1.49 --- src/sys/netipsec/ipsec.c:1.48 Wed Jul 21 20:41:31 2010 +++ src/sys/netipsec/ipsec.c Fri Feb 11 17:53:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec.c,v 1.48 2010/07/21 20:41:31 jakllsch Exp $ */ +/* $NetBSD: ipsec.c,v 1.49 2011/02/11 17:53:35 drochner Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.48 2010/07/21 20:41:31 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.49 2011/02/11 17:53:35 drochner Exp $); /* * IPsec controller part. @@ -1437,6 +1437,10 @@ if (inp-inp_sp-sp_out != NULL) KEY_FREESP(inp-inp_sp-sp_out); +#ifdef __NetBSD__ + ipsec_invalpcbcache(inp-inp_sp, IPSEC_DIR_ANY); +#endif + ipsec_delpcbpolicy(inp-inp_sp); inp-inp_sp = NULL; @@ -1521,6 +1525,10 @@ if (in6p-in6p_sp-sp_out != NULL) KEY_FREESP(in6p-in6p_sp-sp_out); +#ifdef __NetBSD + ipsec_invalpcbcache(in6p-in6p_sp, IPSEC_DIR_ANY); +#endif + ipsec_delpcbpolicy(in6p-in6p_sp); in6p-in6p_sp = NULL;
CVS commit: src/sys/uvm
Module Name:src
Committed By: jmcneill
Date: Fri Feb 11 23:05:55 UTC 2011
Modified Files:
src/sys/uvm: uvm_device.c uvm_pmap.h
Log Message:
add optional MD pmap_mmap_flags macro for passing flags between cdev_mmap
and pmap_enter, ok matt@
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/uvm/uvm_device.c
cvs rdiff -u -r1.35 -r1.36 src/sys/uvm/uvm_pmap.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_device.c
diff -u src/sys/uvm/uvm_device.c:1.58 src/sys/uvm/uvm_device.c:1.59
--- src/sys/uvm/uvm_device.c:1.58 Wed Feb 2 15:13:34 2011
+++ src/sys/uvm/uvm_device.c Fri Feb 11 23:05:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_device.c,v 1.58 2011/02/02 15:13:34 chuck Exp $ */
+/* $NetBSD: uvm_device.c,v 1.59 2011/02/11 23:05:55 jmcneill Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_device.c,v 1.58 2011/02/02 15:13:34 chuck Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_device.c,v 1.59 2011/02/11 23:05:55 jmcneill Exp $);
#include opt_uvmhist.h
@@ -355,6 +355,7 @@
vaddr_t curr_va;
off_t curr_offset;
paddr_t paddr, mdpgno;
+ u_int mmapflags;
int lcv, retval;
dev_t device;
vm_prot_t mapprot;
@@ -415,12 +416,13 @@
break;
}
paddr = pmap_phys_address(mdpgno);
+ mmapflags = pmap_mmap_flags(mdpgno);
mapprot = ufi-entry-protection;
UVMHIST_LOG(maphist,
MAPPING: device: pm=0x%x, va=0x%x, pa=0x%lx, at=%d,
ufi-orig_map-pmap, curr_va, paddr, mapprot);
- if (pmap_enter(ufi-orig_map-pmap, curr_va, paddr,
- mapprot, PMAP_CANFAIL | mapprot) != 0) {
+ if (pmap_enter(ufi-orig_map-pmap, curr_va, paddr, mapprot,
+ PMAP_CANFAIL | mapprot | mmapflags) != 0) {
/*
* pmap_enter() didn't have the resource to
* enter this mapping. Unlock everything,
Index: src/sys/uvm/uvm_pmap.h
diff -u src/sys/uvm/uvm_pmap.h:1.35 src/sys/uvm/uvm_pmap.h:1.36
--- src/sys/uvm/uvm_pmap.h:1.35 Mon Nov 29 09:49:33 2010
+++ src/sys/uvm/uvm_pmap.h Fri Feb 11 23:05:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pmap.h,v 1.35 2010/11/29 09:49:33 mrg Exp $ */
+/* $NetBSD: uvm_pmap.h,v 1.36 2011/02/11 23:05:55 jmcneill Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -178,6 +178,9 @@
#if !defined(pmap_phys_address)
paddr_t pmap_phys_address(paddr_t);
#endif
+#if !defined(pmap_mmap_flags)
+#define pmap_mmap_flags(x) 0
+#endif
void pmap_protect(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
#if !defined(pmap_reference)
void pmap_reference(pmap_t);
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: jmcneill
Date: Fri Feb 11 23:08:39 UTC 2011
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: bus_space.c pmap.c
Log Message:
add bus_space_mmap support for BUS_SPACE_MAP_PREFETCHABLE, ok matt@
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x86/x86/bus_space.c
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/x86/x86/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.34 src/sys/arch/x86/include/pmap.h:1.35
--- src/sys/arch/x86/include/pmap.h:1.34 Tue Feb 1 20:19:32 2011
+++ src/sys/arch/x86/include/pmap.h Fri Feb 11 23:08:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.34 2011/02/01 20:19:32 chuck Exp $ */
+/* $NetBSD: pmap.h,v 1.35 2011/02/11 23:08:38 jmcneill Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -198,9 +198,18 @@
#define pmap_is_modified(pg) pmap_test_attrs(pg, PG_M)
#define pmap_is_referenced(pg) pmap_test_attrs(pg, PG_U)
#define pmap_move(DP,SP,D,L,S)
-#define pmap_phys_address(ppn) x86_ptob(ppn)
+#define pmap_phys_address(ppn) (x86_ptob(ppn) ~X86_MMAP_FLAG_MASK)
+#define pmap_mmap_flags(ppn) x86_mmap_flags(ppn)
#define pmap_valid_entry(E) ((E) PG_V) /* is PDE or PTE valid? */
+#if defined(__x86_64__) || defined(PAE)
+#define X86_MMAP_FLAG_SHIFT (64 - PGSHIFT)
+#else
+#define X86_MMAP_FLAG_SHIFT (32 - PGSHIFT)
+#endif
+
+#define X86_MMAP_FLAG_MASK 0xf
+#define X86_MMAP_FLAG_PREFETCH 0x1
/*
* prototypes
@@ -229,6 +238,8 @@
int pmap_pdes_invalid(vaddr_t, pd_entry_t * const *, pd_entry_t *);
+u_int x86_mmap_flags(paddr_t);
+
vaddr_t reserve_dumppages(vaddr_t); /* XXX: not a pmap fn */
void pmap_tlb_shootdown(pmap_t, vaddr_t, vaddr_t, pt_entry_t);
Index: src/sys/arch/x86/x86/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.32 src/sys/arch/x86/x86/bus_space.c:1.33
--- src/sys/arch/x86/x86/bus_space.c:1.32 Mon Jan 10 16:59:09 2011
+++ src/sys/arch/x86/x86/bus_space.c Fri Feb 11 23:08:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.32 2011/01/10 16:59:09 jruoho Exp $ */
+/* $NetBSD: bus_space.c,v 1.33 2011/02/11 23:08:38 jmcneill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.32 2011/01/10 16:59:09 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.33 2011/02/11 23:08:38 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -484,6 +484,7 @@
bus_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off, int prot,
int flags)
{
+ paddr_t pflags = 0;
/* Can't mmap I/O space. */
if (x86_bus_space_is_io(t))
@@ -496,7 +497,10 @@
* Note we are called for each page in the device that
* the upper layers want to map.
*/
- return (x86_btop(addr + off));
+ if (flags BUS_SPACE_MAP_PREFETCHABLE)
+ pflags |= X86_MMAP_FLAG_PREFETCH;
+
+ return x86_btop(addr + off) | (pflags X86_MMAP_FLAG_SHIFT);
}
void
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.117 src/sys/arch/x86/x86/pmap.c:1.118
--- src/sys/arch/x86/x86/pmap.c:1.117 Thu Feb 10 00:23:14 2011
+++ src/sys/arch/x86/x86/pmap.c Fri Feb 11 23:08:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.117 2011/02/10 00:23:14 jym Exp $ */
+/* $NetBSD: pmap.c,v 1.118 2011/02/11 23:08:38 jmcneill Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -142,7 +142,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.117 2011/02/10 00:23:14 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.118 2011/02/11 23:08:38 jmcneill Exp $);
#include opt_user_ldt.h
#include opt_lockdebug.h
@@ -4781,3 +4781,15 @@
return x86_tmp_pml_paddr[PTP_LEVELS - 1];
}
+
+u_int
+x86_mmap_flags(paddr_t mdpgno)
+{
+ u_int nflag = (mdpgno X86_MMAP_FLAG_SHIFT) X86_MMAP_FLAG_MASK;
+ u_int pflag = 0;
+
+ if (nflag X86_MMAP_FLAG_PREFETCH)
+ pflag |= PMAP_WRITE_COMBINE;
+
+ return pflag;
+}
CVS commit: src
Module Name:src Committed By: christos Date: Fri Feb 11 23:47:49 UTC 2011 Modified Files: src/external/bsd/mdocml/dist: lib.in src/gnu/dist/groff/tmac: groff_mdoc.man src/gnu/usr.bin/groff/tmac: mdoc.local src/share/tmac: doc2html Log Message: Tell the groff and friends about libsaslc(3). Sort and fix whitespace on mdoc.local. Add libisns to doc2html. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/dist/lib.in cvs rdiff -u -r1.15 -r1.16 src/gnu/dist/groff/tmac/groff_mdoc.man cvs rdiff -u -r1.61 -r1.62 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.62 -r1.63 src/share/tmac/doc2html 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/mdocml/dist/lib.in diff -u src/external/bsd/mdocml/dist/lib.in:1.2 src/external/bsd/mdocml/dist/lib.in:1.3 --- src/external/bsd/mdocml/dist/lib.in:1.2 Tue Jan 18 04:28:42 2011 +++ src/external/bsd/mdocml/dist/lib.in Fri Feb 11 18:47:49 2011 @@ -79,6 +79,7 @@ LINE(librpcsec_gss, RPC GSS-API Authentication Library (librpcsec_gss, \\-lrpcsec_gss)) LINE(librpcsvc, RPC Service Library (librpcsvc, \\-lrpcsvc)) LINE(librt, POSIX Real\\-time Library (librt, -lrt)) +LINE(libsaslc, Simple Authentication and Security Layer client library (libsaslc, \\-lsaslc)) LINE(libsdp, Bluetooth Service Discovery Protocol User Library (libsdp, \\-lsdp)) LINE(libssp, Buffer Overflow Protection Library (libssp, \\-lssp)) LINE(libtermcap, Termcap Access Library (libtermcap, \\-ltermcap)) Index: src/gnu/dist/groff/tmac/groff_mdoc.man diff -u src/gnu/dist/groff/tmac/groff_mdoc.man:1.15 src/gnu/dist/groff/tmac/groff_mdoc.man:1.16 --- src/gnu/dist/groff/tmac/groff_mdoc.man:1.15 Mon Jan 17 16:57:04 2011 +++ src/gnu/dist/groff/tmac/groff_mdoc.man Fri Feb 11 18:47:49 2011 @@ -1719,6 +1719,8 @@ .Lb libresolv .It Li librt .Lb librt +.It Li libsaslc +.Lb libsaslc .It Li libtermcap .Lb libtermcap .It Li libusbhid Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.61 src/gnu/usr.bin/groff/tmac/mdoc.local:1.62 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.61 Tue Jan 18 19:10:10 2011 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Fri Feb 11 18:47:49 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.61 2011/01/19 00:10:10 uwe Exp $ +.\ $NetBSD: mdoc.local,v 1.62 2011/02/11 23:47:49 christos Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -82,15 +82,16 @@ .ds doc-volume-as-xen xen . .\ Local libraries not in groff -.ds doc-str-Lb-libarchive Reading and Writing Streaming Archives Library (libarchive, \-larchive) -.ds doc-str-Lb-libbluetooth Bluetooth Library (libbluetooth, \-lbluetooth) +.ds doc-str-Lb-libarchive Reading and Writing Streaming Archives Library (libarchive, \-larchive) +.ds doc-str-Lb-libbluetooth Bluetooth Library (libbluetooth, \-lbluetooth) .ds doc-str-Lb-libfetch File Transfer Library for URLs (libfetch, \-lfetch) -.ds doc-str-Lb-libiscsi iSCSI protocol library (libiscsi, \-liscsi) -.ds doc-str-Lb-libisns Internet Storage Name Service Library (libisns, \-lisns) -.ds doc-str-Lb-libnetpgpNetpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) -.ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) -.ds doc-str-Lb-libperfuse PUFFS enabled relay to FUSE Library (libperfuse, \-lperfuse) -.ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) -.ds doc-str-Lb-librefuseFile System in Userspace Convenience Library (librefuse, \-lrefuse) -.ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) -.ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) +.ds doc-str-Lb-libiscsi iSCSI protocol library (libiscsi, \-liscsi) +.ds doc-str-Lb-libisns Internet Storage Name Service Library (libisns, \-lisns) +.ds doc-str-Lb-libnetpgp Netpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) +.ds doc-str-Lb-libperfuse PUFFS enabled relay to FUSE Library (libperfuse, \-lperfuse) +.ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) +.ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) +.ds doc-str-Lb-librefuse File System in Userspace Convenience Library (librefuse, \-lrefuse) +.ds doc-str-Lb-libsaslc Simple Authentication and Security Layer client library (libsaslc, \-lsaslc) +.ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) +.ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) Index: src/share/tmac/doc2html diff -u src/share/tmac/doc2html:1.62 src/share/tmac/doc2html:1.63 --- src/share/tmac/doc2html:1.62 Sat May 16 14:12:04 2009 +++ src/share/tmac/doc2html Fri Feb 11 18:47:49 2011 @@ -1,4 +1,4 @@ -.\
CVS commit: src/distrib/i386/ramdisks/common
Module Name:src
Committed By: jym
Date: Fri Feb 11 23:56:17 UTC 2011
Modified Files:
src/distrib/i386/ramdisks/common: list.ramdisk
Log Message:
BOOTMODEL disappeared when CD ISOs switched from ramdisk to CD-ROM as
root file system 2 years ago.
CMD sed + MTREE is turned into COPY (as does amd64).
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/i386/ramdisks/common/list.ramdisk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.16 src/distrib/i386/ramdisks/common/list.ramdisk:1.17
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.16 Fri Jan 14 10:26:33 2011
+++ src/distrib/i386/ramdisks/common/list.ramdisk Fri Feb 11 23:56:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.16 2011/01/14 10:26:33 tsutsui Exp $
+# $NetBSD: list.ramdisk,v 1.17 2011/02/11 23:56:17 jym Exp $
SRCDIRS usr.bin/less
SRCDIRS bin sbin usr.bin usr.sbin
@@ -80,5 +80,4 @@
COPY ${DESTDIR}/usr/mdec/mbr_bootsel usr/mdec/mbr_bootsel
# and the boot script
-CMD sed -e s/@BOOTMODEL@/${BOOTMODEL}/ ${CURDIR}/../common/dot.profile .profile
-MTREE ./.profile type=file uname=root gname=wheel mode=0444
+COPY ${CURDIR}/../common/dot.profile .profile
CVS commit: xsrc/external/mit/xf86-video-intel/dist
Module Name:xsrc
Committed By: jmcneill
Date: Sat Feb 12 00:07:27 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_exa.c
xsrc/external/mit/xf86-video-intel/dist/uxa: uxa-priv.h uxa.c
Log Message:
In case somebody wants to try to get UXA working, make it compile against
newer X servers
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h \
xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.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/xf86-video-intel/dist/src/i830_exa.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_exa.c Sat Feb 12 00:07:26 2011
@@ -83,7 +83,7 @@
};
#ifdef I830_USE_UXA
-static int uxa_pixmap_index;
+static DevPrivateKeyRec uxa_pixmap_index;
#endif
#ifndef SERVER_1_5
@@ -1035,7 +1035,7 @@
I830Ptr i830 = I830PTR(scrn);
#ifdef SERVER_1_5
-if (!dixRequestPrivate(uxa_pixmap_index, 0))
+if (!dixRegisterPrivateKey(uxa_pixmap_index, PRIVATE_PIXMAP, 0))
return FALSE;
#else
if (!AllocatePixmapPrivate(pScreen, uxa_pixmap_index, 0))
Index: xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h
diff -u xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.2
--- xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h:1.1.1.1 Tue Jun 9 02:54:32 2009
+++ xsrc/external/mit/xf86-video-intel/dist/uxa/uxa-priv.h Sat Feb 12 00:07:26 2011
@@ -43,7 +43,36 @@
#include X11/Xproto.h
#ifdef MITSHM
#define _XSHM_SERVER_
-#include X11/extensions/shmstr.h
+/* X11/extensions/shmstr.h */
+/* #warning this file is deprecated and provided only for source compatibility */
+#include X11/extensions/shmproto.h
+
+#define XSHM_PUT_IMAGE_ARGS \
+DrawablePtr /* dst */, \
+GCPtr /* pGC */, \
+int /* depth */, \
+unsigned int /* format */, \
+int /* w */, \
+int /* h */, \
+int /* sx */, \
+int /* sy */, \
+int /* sw */, \
+int /* sh */, \
+int /* dx */, \
+int /* dy */, \
+char * /* data */
+
+#define XSHM_CREATE_PIXMAP_ARGS \
+ScreenPtr /* pScreen */, \
+int /* width */, \
+int /* height */, \
+int /* depth */, \
+char * /* addr */
+
+typedef struct _ShmFuncs {
+PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
+void (* PutImage)(XSHM_PUT_IMAGE_ARGS);
+} ShmFuncs, *ShmFuncsPtr;
#endif
#include scrnintstr.h
#include pixmapstr.h
@@ -167,7 +196,7 @@
(PixmapWidthPaddingInfo[d].padRoundUp+1)))
#endif
-extern int uxa_screen_index;
+extern DevPrivateKeyRec uxa_screen_index;
static inline uxa_screen_t *
uxa_get_screen(ScreenPtr screen)
{
Index: xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c
diff -u xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.1.1.1 xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c:1.1.1.1 Tue Jun 9 02:54:32 2009
+++ xsrc/external/mit/xf86-video-intel/dist/uxa/uxa.c Sat Feb 12 00:07:26 2011
@@ -39,7 +39,7 @@
#include dixfontstr.h
#include uxa.h
-int uxa_screen_index;
+DevPrivateKeyRec uxa_screen_index;
#ifndef SERVER_1_5
static int uxa_generation;
#endif
@@ -479,6 +479,7 @@
uxa_screen-info = uxa_driver;
#ifdef SERVER_1_5
+dixRegisterPrivateKey(uxa_screen_index, PRIVATE_SCREEN, 0);
dixSetPrivate(screen-devPrivates, uxa_screen_index, uxa_screen);
#else
if (uxa_generation != serverGeneration) {
CVS commit: [matt-nb5-pq3] src/sys/arch/powerpc/oea
Module Name:src
Committed By: matt
Date: Sat Feb 12 00:45:23 UTC 2011
Modified Files:
src/sys/arch/powerpc/oea [matt-nb5-pq3]: cpu_subr.c
Log Message:
Add IBM750GX support (from Bob Lee).
To generate a diff of this commit:
cvs rdiff -u -r1.50.14.3 -r1.50.14.4 src/sys/arch/powerpc/oea/cpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.50.14.3 src/sys/arch/powerpc/oea/cpu_subr.c:1.50.14.4
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.50.14.3 Fri Jan 28 02:34:11 2011
+++ src/sys/arch/powerpc/oea/cpu_subr.c Sat Feb 12 00:45:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.50.14.3 2011/01/28 02:34:11 matt Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.50.14.4 2011/02/12 00:45:22 matt Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.50.14.3 2011/01/28 02:34:11 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.50.14.4 2011/02/12 00:45:22 matt Exp $);
#include opt_ppcparam.h
#include opt_multiprocessor.h
@@ -209,6 +209,7 @@
{ 620, MPC620, REVFMT_HEX },
{ 750, MPC750, REVFMT_MAJMIN },
{ 750FX, IBM750FX, REVFMT_MAJMIN },
+ { 750GX, IBM750GX, REVFMT_MAJMIN },
{ 7400, MPC7400, REVFMT_MAJMIN },
{ 7410, MPC7410, REVFMT_MAJMIN },
{ 7450, MPC7450, REVFMT_MAJMIN },
@@ -276,7 +277,7 @@
else if (MPC745X_P(vers) vers != MPC7450)
oeacpufeat |= OEACPU_XBSEN | OEACPU_HIGHBAT | OEACPU_HIGHSPRG;
- else if (vers == IBM750FX)
+ else if (vers == IBM750FX || vers == IBM750GX)
oeacpufeat |= OEACPU_HIGHBAT;
}
@@ -325,6 +326,7 @@
switch (vers) {
#define K *1024
case IBM750FX:
+ case IBM750GX:
case MPC601:
case MPC750:
case MPC7400:
@@ -493,6 +495,7 @@
case MPC603ev:
case MPC750:
case IBM750FX:
+ case IBM750GX:
case MPC7400:
case MPC7410:
case MPC8240:
@@ -537,6 +540,7 @@
#ifdef NAPMODE
switch (vers) {
case IBM750FX:
+ case IBM750GX:
case MPC750:
case MPC7400:
/* Select NAP mode. */
@@ -548,6 +552,7 @@
switch (vers) {
case IBM750FX:
+ case IBM750GX:
case MPC750:
hid0 = ~HID0_DBP; /* XXX correct? */
hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT;
@@ -600,6 +605,7 @@
case MPC604ev:
case MPC750:
case IBM750FX:
+ case IBM750GX:
case MPC7400:
case MPC7410:
case MPC7447A:
@@ -618,6 +624,7 @@
cpu_config_l3cr(vers);
break;
case IBM750FX:
+ case IBM750GX:
case MPC750:
case MPC7400:
case MPC7410:
@@ -639,7 +646,7 @@
* XXX supported by Motorola and may return values that are off by
* XXX 35-55 degrees C.
*/
- if (vers == MPC750 || vers == IBM750FX)
+ if (vers == MPC750 || vers == IBM750FX || vers == IBM750GX)
cpu_tau_setup(ci);
#endif
@@ -899,6 +906,7 @@
switch (vers) {
case IBM750FX:
+ case IBM750GX:
cpu_fmttab_print(cpu_ibm750_l2cr_formats, l2cr);
break;
case MPC750:
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: matt
Date: Sat Feb 12 01:02:12 UTC 2011
Modified Files:
src/sys/arch/powerpc/oea: cpu_subr.c
Log Message:
Add support for the IBM750GX (from Bob Lee).
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/oea/cpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.61 src/sys/arch/powerpc/oea/cpu_subr.c:1.62
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.61 Tue Jan 18 02:25:42 2011
+++ src/sys/arch/powerpc/oea/cpu_subr.c Sat Feb 12 01:02:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.61 2011/01/18 02:25:42 matt Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.62 2011/02/12 01:02:12 matt Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.61 2011/01/18 02:25:42 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.62 2011/02/12 01:02:12 matt Exp $);
#include opt_ppcparam.h
#include opt_multiprocessor.h
@@ -211,6 +211,7 @@
{ 620, MPC620, REVFMT_HEX },
{ 750, MPC750, REVFMT_MAJMIN },
{ 750FX, IBM750FX, REVFMT_MAJMIN },
+ { 750GX, IBM750GX, REVFMT_MAJMIN },
{ 7400, MPC7400, REVFMT_MAJMIN },
{ 7410, MPC7410, REVFMT_MAJMIN },
{ 7450, MPC7450, REVFMT_MAJMIN },
@@ -277,6 +278,9 @@
else if (MPC745X_P(vers) vers != MPC7450)
oeacpufeat |= OEACPU_XBSEN | OEACPU_HIGHBAT | OEACPU_HIGHSPRG;
+
+ else if (vers == IBM750FX || vers == IBM750GX)
+ oeacpufeat |= OEACPU_HIGHBAT;
}
void
@@ -324,6 +328,7 @@
switch (vers) {
#define K *1024
case IBM750FX:
+ case IBM750GX:
case MPC601:
case MPC750:
case MPC7400:
@@ -501,6 +506,7 @@
case MPC750:
case IBM750FX:
+ case IBM750GX:
/* Select NAP mode. */
hid0 = ~(HID0_DOZE | HID0_NAP | HID0_SLEEP);
hid0 |= HID0_NAP | HID0_DPM;
@@ -540,6 +546,7 @@
#ifdef NAPMODE
switch (vers) {
case IBM750FX:
+ case IBM750GX:
case MPC750:
case MPC7400:
/* Select NAP mode. */
@@ -551,6 +558,7 @@
switch (vers) {
case IBM750FX:
+ case IBM750GX:
case MPC750:
hid0 = ~HID0_DBP; /* XXX correct? */
hid0 |= HID0_EMCP | HID0_BTIC | HID0_SGE | HID0_BHT;
@@ -603,6 +611,7 @@
case MPC604ev:
case MPC750:
case IBM750FX:
+ case IBM750GX:
case MPC7400:
case MPC7410:
case MPC7447A:
@@ -621,6 +630,7 @@
cpu_config_l3cr(vers);
break;
case IBM750FX:
+ case IBM750GX:
case MPC750:
case MPC7400:
case MPC7410:
@@ -642,7 +652,7 @@
* XXX supported by Motorola and may return values that are off by
* XXX 35-55 degrees C.
*/
- if (vers == MPC750 || vers == IBM750FX)
+ if (vers == MPC750 || vers == IBM750FX || vers == IBM750GX)
cpu_tau_setup(ci);
#endif
@@ -902,6 +912,7 @@
switch (vers) {
case IBM750FX:
+ case IBM750GX:
cpu_fmttab_print(cpu_ibm750_l2cr_formats, l2cr);
break;
case MPC750:
CVS commit: src/sys/arch/sandpoint
Module Name:src Committed By: nisimura Date: Sat Feb 12 03:25:37 UTC 2011 Modified Files: src/sys/arch/sandpoint: README.NAS Log Message: add Thecus N1200 NAS information. It looks a fairly close sibling of Freescale MPC8349mITX eval featuring I2C controlled satellite MCU. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sandpoint/README.NAS 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/sandpoint/README.NAS diff -u src/sys/arch/sandpoint/README.NAS:1.14 src/sys/arch/sandpoint/README.NAS:1.15 --- src/sys/arch/sandpoint/README.NAS:1.14 Fri Feb 11 12:26:04 2011 +++ src/sys/arch/sandpoint/README.NAS Sat Feb 12 03:25:37 2011 @@ -1,4 +1,4 @@ -$NetBSD: README.NAS,v 1.14 2011/02/11 12:26:04 phx Exp $ +$NetBSD: README.NAS,v 1.15 2011/02/12 03:25:37 nisimura Exp $ MPC8241/8245 NAS products @@ -47,23 +47,40 @@ - USB EHCI is a multiple function PCI device which has pin assignment A, B and C. -- *attention* Synology DS407 is a MPC8349E product. + e300 NAS products +- Freescale MPC8349E-mITXE - e300 NAS products + PCI bus:IDSEL IPIC IRQ +satalink 0:16 22 +miniPCI 1:14 21 +3.3vPCI 1:15 20 + + I2C bus:addr +ds1339 RTC 1:0x68 +sat MCU 1:0x0a + +- Thecus N1200 + + PCI bus:IDSEL IPIC IRQ +satalink 0:16 22 + + I2C bus:addr +f75375 fanctl 0:0x2e +rs5c372a RTC 0:0x32 +sat MCU 0:0x36 + +- Synology DS407 + + PCI bus:IDSEL IPIC IRQ +satalink 0:13 20 +satalink 0:14 21 +USB ? 0:15 22 +PCI ? 0:16 19 + + I2C +ds1337 RTC 1:0x68 -Freescale MPC8349E-mITXE - PCI IDSEL MPC8349 IRQ - 1st PCI 16 - 22 - satalink - 2nd PCI 14, 15 - 21, 20 - miniPCI, 3.3VPCI - -Synology DS407 - PCI IDSEL MPC8349 IRQ - 1st PCI 13, 14, 15, 16 - 20, 21, 22, 19 - satalink,satalink,ehci,PCI - 2nd PCI ??? [ research still in progress ]
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Sat Feb 12 03:43:50 UTC 2011 Modified Files: src/sys/arch/hp300/hp300: bus_space.c Log Message: Use __func__ to print (correct) function names. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp300/hp300/bus_space.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/hp300/hp300/bus_space.c diff -u src/sys/arch/hp300/hp300/bus_space.c:1.17 src/sys/arch/hp300/hp300/bus_space.c:1.18 --- src/sys/arch/hp300/hp300/bus_space.c:1.17 Mon Apr 28 20:23:19 2008 +++ src/sys/arch/hp300/hp300/bus_space.c Sat Feb 12 03:43:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space.c,v 1.17 2008/04/28 20:23:19 martin Exp $ */ +/* $NetBSD: bus_space.c,v 1.18 2011/02/12 03:43:50 tsutsui Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.17 2008/04/28 20:23:19 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.18 2011/02/12 03:43:50 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -66,7 +66,7 @@ } if (t-bustype != HP300_BUS_SPACE_DIO) - panic(bus_space_map: bad space tag); + panic(%s: bad space tag, __FUNC__); /* * Allocate virtual address space from the extio extent map. @@ -112,7 +112,7 @@ /* * Not meaningful on any currently-supported hp300 bus. */ - panic(bus_space_free: shouldn't be here); + panic(%s: shouldn't be here, __func__); } void @@ -130,7 +130,7 @@ } if (t-bustype != HP300_BUS_SPACE_DIO) - panic(bus_space_map: bad space tag); + panic(%s: bad space tag, __func__); kva = m68k_trunc_page(bsh); offset = m68k_page_offset(bsh); @@ -139,7 +139,7 @@ #ifdef DIAGNOSTIC if (bsh (vaddr_t)extiobase || bsh = ((vaddr_t)extiobase + ptoa(EIOMAPSIZE))) - panic(bus_space_unmap: bad bus space handle); + panic(%s: bad bus space handle, __func__); #endif /* @@ -152,8 +152,8 @@ */ if (extent_free(extio_ex, kva, size, EX_NOWAIT | (extio_ex_malloc_safe ? EX_MALLOCOK : 0))) - printf(bus_space_unmap: kva 0x%lx size 0x%lx: - can't free region\n, (u_long) bsh, size); + printf(%s: kva 0x%lx size 0x%lx: + can't free region\n, __func-_, (u_long)bsh, size); } /* ARGSUSED */ @@ -194,7 +194,7 @@ break; default: - panic(bus_space_probe: unupported data size %d, sz); + panic(%s: unupported data size %d, __func__, sz); /* NOTREACHED */ }
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: jmcneill Date: Sat Feb 12 04:49:19 UTC 2011 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: add /usr/pkg/lib/X11/fonts to font directory list To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf 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/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.4 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.4 Mon Dec 14 00:39:58 2009 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Sat Feb 12 04:49:19 2011 @@ -1,6 +1,6 @@ ?xml version=1.0? !DOCTYPE fontconfig SYSTEM fonts.dtd -!-- $NetBSD: fonts.conf,v 1.4 2009/12/14 00:39:58 mrg Exp $ -- +!-- $NetBSD: fonts.conf,v 1.5 2011/02/12 04:49:19 jmcneill Exp $ -- !-- /etc/fonts/fonts.conf file to configure system font access -- fontconfig @@ -25,6 +25,7 @@ !-- Font directory list -- dir/usr/X11R7/lib/X11/fonts/dir + dir/usr/pkg/lib/X11/fonts/dir dir~/.fonts/dir !--
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Sat Feb 12 04:52:28 UTC 2011 Modified Files: src/sys/arch/hp300/hp300: bus_space.c Log Message: Umm, fix typo. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp300/hp300/bus_space.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/hp300/hp300/bus_space.c diff -u src/sys/arch/hp300/hp300/bus_space.c:1.18 src/sys/arch/hp300/hp300/bus_space.c:1.19 --- src/sys/arch/hp300/hp300/bus_space.c:1.18 Sat Feb 12 03:43:50 2011 +++ src/sys/arch/hp300/hp300/bus_space.c Sat Feb 12 04:52:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space.c,v 1.18 2011/02/12 03:43:50 tsutsui Exp $ */ +/* $NetBSD: bus_space.c,v 1.19 2011/02/12 04:52:28 tsutsui Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.18 2011/02/12 03:43:50 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.19 2011/02/12 04:52:28 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -66,7 +66,7 @@ } if (t-bustype != HP300_BUS_SPACE_DIO) - panic(%s: bad space tag, __FUNC__); + panic(%s: bad space tag, __func__); /* * Allocate virtual address space from the extio extent map. @@ -153,7 +153,7 @@ if (extent_free(extio_ex, kva, size, EX_NOWAIT | (extio_ex_malloc_safe ? EX_MALLOCOK : 0))) printf(%s: kva 0x%lx size 0x%lx: - can't free region\n, __func-_, (u_long)bsh, size); + can't free region\n, __func__, (u_long)bsh, size); } /* ARGSUSED */
CVS commit: src/sys/arch/hp300
Module Name:src
Committed By: tsutsui
Date: Sat Feb 12 05:08:41 UTC 2011
Modified Files:
src/sys/arch/hp300/conf: GENERIC INSTALL files.hp300
src/sys/arch/hp300/dev: diofbreg.h diofbvar.h
src/sys/arch/hp300/hp300: autoconf.c
src/sys/arch/hp300/stand: Makefile.buildboot
src/sys/arch/hp300/stand/common: grfreg.h ite.c ite_subr.c itevar.h
Added Files:
src/sys/arch/hp300/dev: gendiofb.c
src/sys/arch/hp300/stand/common: ite_dumb.c
Log Message:
Add dumb framebuffer (no acceleration, no colormap) support
for HP362 and HP382.
Tested on A1473-69510 (HP362 VGA-res) and A1474-69511 (HP382 mid-res).
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hp300/conf/INSTALL
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp300/dev/diofbreg.h \
src/sys/arch/hp300/dev/diofbvar.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp300/dev/gendiofb.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/hp300/hp300/autoconf.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hp300/stand/Makefile.buildboot
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/stand/common/grfreg.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/stand/common/ite.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp300/stand/common/ite_dumb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/common/ite_subr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/itevar.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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.161 src/sys/arch/hp300/conf/GENERIC:1.162
--- src/sys/arch/hp300/conf/GENERIC:1.161 Sun Feb 6 18:40:55 2011
+++ src/sys/arch/hp300/conf/GENERIC Sat Feb 12 05:08:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.161 2011/02/06 18:40:55 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.162 2011/02/12 05:08:40 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.161 $
+#ident GENERIC-$Revision: 1.162 $
maxusers 32 # estimated number of users
@@ -236,6 +236,9 @@
tvrx* at dio? scode ? # TurboVRX framebuffer
wsdisplay* at tvrx?
+gendiofb* at dio? scode ? # dumb framebuffer support for 362/382
+wsdisplay* at gendiofb?
+
com0 at dio0 scode 9 # DCA serial interfaces
com* at dio? scode ?
Index: src/sys/arch/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.42 src/sys/arch/hp300/conf/INSTALL:1.43
--- src/sys/arch/hp300/conf/INSTALL:1.42 Sun Feb 6 18:26:53 2011
+++ src/sys/arch/hp300/conf/INSTALL Sat Feb 12 05:08:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.42 2011/02/06 18:26:53 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.43 2011/02/12 05:08:40 tsutsui Exp $
#
# INSTALL machine description file
#
@@ -183,6 +183,9 @@
tvrx* at dio? scode ?
wsdisplay* at tvrx?
+gendiofb* at dio? scode ?
+wsdisplay* at gendiofb?
+
com* at dio0 scode 9 # DCA serial interfaces
com* at dio? scode ?
Index: src/sys/arch/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.79 src/sys/arch/hp300/conf/files.hp300:1.80
--- src/sys/arch/hp300/conf/files.hp300:1.79 Sun Feb 6 18:26:53 2011
+++ src/sys/arch/hp300/conf/files.hp300 Sat Feb 12 05:08:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.79 2011/02/06 18:26:53 tsutsui Exp $
+# $NetBSD: files.hp300,v 1.80 2011/02/12 05:08:40 tsutsui Exp $
#
# hp300-specific configuration info
@@ -113,6 +113,10 @@
attach tvrx at dio
file arch/hp300/dev/tvrx.c tvrx needs-flag
+device gendiofb: wsemuldisplaydev, diofb, rasops8
+attach gendiofb at dio
+file arch/hp300/dev/gendiofb.c gendiofb needs-flag
+
#
# Devices on the DIO bus
#
Index: src/sys/arch/hp300/dev/diofbreg.h
diff -u src/sys/arch/hp300/dev/diofbreg.h:1.1 src/sys/arch/hp300/dev/diofbreg.h:1.2
--- src/sys/arch/hp300/dev/diofbreg.h:1.1 Sun Feb 6 18:26:51 2011
+++ src/sys/arch/hp300/dev/diofbreg.h Sat Feb 12 05:08:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: diofbreg.h,v 1.1 2011/02/06 18:26:51 tsutsui Exp $ */
+/* $NetBSD: diofbreg.h,v 1.2 2011/02/12 05:08:40 tsutsui Exp $ */
/* $OpenBSD: diofbreg.h,v 1.3 2007/01/07 15:13:52 miod Exp $ */
/*
@@ -58,6 +58,8 @@
#define GID_TIGER 12
#define GID_YGENESIS 13
#define GID_HYPERION 14
+#define GID_A1474MID 16
+#define GID_A147xVGA 17
#ifndef _LOCORE
struct diofbreg {
Index: src/sys/arch/hp300/dev/diofbvar.h
diff -u src/sys/arch/hp300/dev/diofbvar.h:1.1 src/sys/arch/hp300/dev/diofbvar.h:1.2
--- src/sys/arch/hp300/dev/diofbvar.h:1.1 Sun Feb 6 18:26:51 2011
+++ src/sys/arch/hp300/dev/diofbvar.h Sat Feb 12 05:08:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: diofbvar.h,v 1.1 2011/02/06 18:26:51 tsutsui Exp $ */
+/* $NetBSD: diofbvar.h,v 1.2 2011/02/12 05:08:40 tsutsui Exp $ */
/* $OpenBSD: diofbvar.h,v 1.10 2006/08/11
CVS commit: src/sys/arch/hp300/stand
Module Name:src Committed By: tsutsui Date: Sat Feb 12 05:09:15 UTC 2011 Modified Files: src/sys/arch/hp300/stand/inst: version src/sys/arch/hp300/stand/uboot: version Log Message: Bump version for 362 and 382 framebuffer support. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/inst/version cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp300/stand/uboot/version 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/hp300/stand/inst/version diff -u src/sys/arch/hp300/stand/inst/version:1.10 src/sys/arch/hp300/stand/inst/version:1.11 --- src/sys/arch/hp300/stand/inst/version:1.10 Thu Feb 10 12:47:08 2011 +++ src/sys/arch/hp300/stand/inst/version Sat Feb 12 05:09:15 2011 @@ -1,4 +1,4 @@ -$NetBSD: version,v 1.10 2011/02/10 12:47:08 tsutsui Exp $ +$NetBSD: version,v 1.11 2011/02/12 05:09:15 tsutsui Exp $ 1.1: Initial version 1.2: Added support for HP-IB cartridge tapes @@ -10,3 +10,4 @@ 1.8: Identify HP362 and HP382 1.9: Change boot messages to replace build date and maker with kernrev. 1.10: Pull OpenBSD's ite driver reorganization. +1.11: Add support for framebuffers on HP362 and HP382. Index: src/sys/arch/hp300/stand/uboot/version diff -u src/sys/arch/hp300/stand/uboot/version:1.17 src/sys/arch/hp300/stand/uboot/version:1.18 --- src/sys/arch/hp300/stand/uboot/version:1.17 Thu Feb 10 12:47:08 2011 +++ src/sys/arch/hp300/stand/uboot/version Sat Feb 12 05:09:15 2011 @@ -1,4 +1,4 @@ -$NetBSD: version,v 1.17 2011/02/10 12:47:08 tsutsui Exp $ +$NetBSD: version,v 1.18 2011/02/12 05:09:15 tsutsui Exp $ 1.1: Initial version 1.2: Added support for network booting @@ -17,3 +17,4 @@ 1.15: Identify HP362 and HP382 1.16: Change boot messages to replace build date and maker with kernrev. 1.17: Pull OpenBSD's ite driver reorganization. +1.18: Add support for framebuffers on HP362 and HP382.
CVS commit: src/sys/arch/hp300
Module Name:src
Committed By: tsutsui
Date: Sat Feb 12 05:15:39 UTC 2011
Modified Files:
src/sys/arch/hp300/conf: GENERIC INSTALL files.hp300
src/sys/arch/hp300/hp300: bus_space.c
src/sys/arch/hp300/include: bus.h
Added Files:
src/sys/arch/hp300/dev: sgc.c sgcreg.h sgcvar.h
Log Message:
Pull basic SGC bus attachment from OpenBSD to test devices.
Disabled by default since there is no SGC drivers yet.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hp300/conf/INSTALL
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp300/dev/sgc.c \
src/sys/arch/hp300/dev/sgcreg.h src/sys/arch/hp300/dev/sgcvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp300/hp300/bus_space.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/include/bus.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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.162 src/sys/arch/hp300/conf/GENERIC:1.163
--- src/sys/arch/hp300/conf/GENERIC:1.162 Sat Feb 12 05:08:40 2011
+++ src/sys/arch/hp300/conf/GENERIC Sat Feb 12 05:15:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.162 2011/02/12 05:08:40 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.163 2011/02/12 05:15:39 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.162 $
+#ident GENERIC-$Revision: 1.163 $
maxusers 32 # estimated number of users
@@ -194,6 +194,7 @@
intio0 at mainbus0 # internal i/o space
dio0 at mainbus0 # DIO/DIO-II bus
+#sgc0 at mainbus0 # SGC bus
# Human Interface Loop devices
hil0 at intio? # HIL controller
Index: src/sys/arch/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.43 src/sys/arch/hp300/conf/INSTALL:1.44
--- src/sys/arch/hp300/conf/INSTALL:1.43 Sat Feb 12 05:08:40 2011
+++ src/sys/arch/hp300/conf/INSTALL Sat Feb 12 05:15:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.43 2011/02/12 05:08:40 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.44 2011/02/12 05:15:39 tsutsui Exp $
#
# INSTALL machine description file
#
@@ -135,6 +135,7 @@
intio0 at mainbus0 # internal i/o space
dio0 at mainbus0 # DIO/DIO-II bus
+#sgc0 at mainbus0 # SGC bus
# Real-time clock (not optional)
rtc* at intio?
Index: src/sys/arch/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.80 src/sys/arch/hp300/conf/files.hp300:1.81
--- src/sys/arch/hp300/conf/files.hp300:1.80 Sat Feb 12 05:08:40 2011
+++ src/sys/arch/hp300/conf/files.hp300 Sat Feb 12 05:15:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.80 2011/02/12 05:08:40 tsutsui Exp $
+# $NetBSD: files.hp300,v 1.81 2011/02/12 05:15:39 tsutsui Exp $
#
# hp300-specific configuration info
@@ -43,6 +43,14 @@
file arch/hp300/dev/dio.c dio
#
+# SGC bus
+#
+
+device sgc { scode = -1 }
+attach sgc at mainbus
+file arch/hp300/dev/sgc.c sgc
+
+#
# Devices in Internal i/o space
#
Index: src/sys/arch/hp300/hp300/bus_space.c
diff -u src/sys/arch/hp300/hp300/bus_space.c:1.19 src/sys/arch/hp300/hp300/bus_space.c:1.20
--- src/sys/arch/hp300/hp300/bus_space.c:1.19 Sat Feb 12 04:52:28 2011
+++ src/sys/arch/hp300/hp300/bus_space.c Sat Feb 12 05:15:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.19 2011/02/12 04:52:28 tsutsui Exp $ */
+/* $NetBSD: bus_space.c,v 1.20 2011/02/12 05:15:39 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.19 2011/02/12 04:52:28 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20 2011/02/12 05:15:39 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -65,7 +65,8 @@
return 0;
}
- if (t-bustype != HP300_BUS_SPACE_DIO)
+ if (t-bustype != HP300_BUS_SPACE_DIO
+ t-bustype != HP300_BUS_SPACE_SGC)
panic(%s: bad space tag, __func__);
/*
@@ -129,7 +130,8 @@
return;
}
- if (t-bustype != HP300_BUS_SPACE_DIO)
+ if (t-bustype != HP300_BUS_SPACE_DIO
+ t-bustype != HP300_BUS_SPACE_SGC)
panic(%s: bad space tag, __func__);
kva = m68k_trunc_page(bsh);
Index: src/sys/arch/hp300/include/bus.h
diff -u src/sys/arch/hp300/include/bus.h:1.15 src/sys/arch/hp300/include/bus.h:1.16
--- src/sys/arch/hp300/include/bus.h:1.15 Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/include/bus.h Sat Feb 12 05:15:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.15 2008/04/28 20:23:19 martin Exp $ */
+/* $NetBSD: bus.h,v 1.16 2011/02/12 05:15:39 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -64,6 +64,7 @@
*/
#define HP300_BUS_SPACE_INTIO 0 /* space is intio space */
#define HP300_BUS_SPACE_DIO 1 /* space is dio space */
+#define HP300_BUS_SPACE_SGC 2 /* space is sgc space */
