Re: CVS commit: src
Matt Thomas wrote: On Jan 28, 2011, at 3:38 PM, matthew green wrote: disklabel.h should export nothing to userland and values userland needs should be obtained via sysctl. I've been asking this question of various developers for a while. how do i create a disklabel on a file system image as a normal user a non-netbsd host with this method? But that would be a hosted tool and that's a different case than a native tool. Where would the hosted tool get that information from? If it's from a MD header file we're back to where we started... Cheers, Simon.
Re: CVS commit: src/sys/dev/pci
On Sun, Jan 30, 2011 at 07:01:07PM -0500, Christos Zoulas wrote: Module Name: src Committed By: christos Date: Mon Jan 31 00:01:07 UTC 2011 Modified Files: src/sys/dev/pci: if_iwi.c Log Message: clear register 0x41 as FreeBSD and OpenBSD do. Update copyright to the latest. Over the years, I've seen the cargo cult clear this particular register repeatedly on several makes and models of wireless chip. Nobody has been able to explain it by reference to any documentation or a vendor recommendation. Are you sure that this change has any effect or justification? See this discussion for the story on this register, http://www.mail-archive.com/bcm43xx-dev@lists.berlios.de/msg09278.html. Dave -- David Young OJC Technologies dyo...@ojctech.com Urbana, IL * (217) 344-0444 x24
Re: CVS commit: src
On Jan 30, 2011, at 1:35 PM, Simon Burge wrote: Matt Thomas wrote: On Jan 28, 2011, at 3:38 PM, matthew green wrote: disklabel.h should export nothing to userland and values userland needs should be obtained via sysctl. I've been asking this question of various developers for a while. how do i create a disklabel on a file system image as a normal user a non-netbsd host with this method? But that would be a hosted tool and that's a different case than a native tool. Where would the hosted tool get that information from? If it's from a MD header file we're back to where we started... Why? hosted != native. I don't expect a tool to be built on linux to know where to get a disklabel from. I do expect the native on NetBSD to know how to get the disklabel location for the current machine it's running on from sysctl and not a header file.
re: CVS commit: src
disklabel.h should export nothing to userland and values userland needs should be obtained via sysctl. I've been asking this question of various developers for a while. how do i create a disklabel on a file system image as a normal user a non-netbsd host with this method? But that would be a hosted tool and that's a different case than a native tool. Where would the hosted tool get that information from? If it's from a MD header file we're back to where we started... Why? hosted != native. I don't expect a tool to be built on linux to know where to get a disklabel from. I do expect the native on NetBSD to know how to get the disklabel location for the current machine it's running on from sysctl and not a header file. how does the cross build on linux create an image with a disklabel? .mrg.
Re: CVS commit: src/sys/dev/pci
In article 20110131011548.gq24...@ojctech.com, David Young dyo...@pobox.com wrote: On Sun, Jan 30, 2011 at 07:01:07PM -0500, Christos Zoulas wrote: Module Name: src Committed By:christos Date:Mon Jan 31 00:01:07 UTC 2011 Modified Files: src/sys/dev/pci: if_iwi.c Log Message: clear register 0x41 as FreeBSD and OpenBSD do. Update copyright to the latest. Over the years, I've seen the cargo cult clear this particular register repeatedly on several makes and models of wireless chip. Nobody has been able to explain it by reference to any documentation or a vendor recommendation. Are you sure that this change has any effect or justification? See this discussion for the story on this register, http://www.mail-archive.com/bcm43xx-dev@lists.berlios.de/msg09278.html. I'd rather leave it in since our iwi driver keeps dying and theirs isn't. If it does not help I will revert it. christos
Re: CVS commit: src/sys/kern
On Sun, Jan 30, 2011 at 07:05:29PM -0500, Christos Zoulas wrote: Log Message: make syscalls match documentation as far as pid_t goes. You just broke pdp10 binary compat! :-) -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src
On Jan 30, 2011, at 8:24 PM, matthew green wrote: disklabel.h should export nothing to userland and values userland needs should be obtained via sysctl. I've been asking this question of various developers for a while. how do i create a disklabel on a file system image as a normal user a non-netbsd host with this method? But that would be a hosted tool and that's a different case than a native tool. Where would the hosted tool get that information from? If it's from a MD header file we're back to where we started... Why? hosted != native. I don't expect a tool to be built on linux to know where to get a disklabel from. I do expect the native on NetBSD to know how to get the disklabel location for the current machine it's running on from sysctl and not a header file. how does the cross build on linux create an image with a disklabel? tools/disklabel ?
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sun Jan 30 08:55:52 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_cpu_cstate.c acpi_cpu_pstate.c acpi_cpu_tstate.c
Log Message:
Improve error reporting.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/acpi_cpu_cstate.c \
src/sys/dev/acpi/acpi_cpu_pstate.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/acpi_cpu_tstate.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/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.36 src/sys/dev/acpi/acpi_cpu_cstate.c:1.37
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.36 Thu Jan 13 03:40:51 2011
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Sun Jan 30 08:55:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.36 2011/01/13 03:40:51 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.37 2011/01/30 08:55:52 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.36 2011/01/13 03:40:51 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.37 2011/01/30 08:55:52 jruoho Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -142,7 +142,7 @@
panic(NOTREACHED);
}
- aprint_debug_dev(sc-sc_dev, C%d: %3s,
+ aprint_verbose_dev(sc-sc_dev, C%d: %3s,
lat %3u us, pow %5u mW, flags 0x%02x\n, i, str,
cs-cs_latency, cs-cs_power, cs-cs_flags);
}
@@ -490,8 +490,8 @@
out:
if (ACPI_FAILURE(rv))
- aprint_debug_dev(sc-sc_dev, invalid
- _CST: %s\n, AcpiFormatException(rv));
+ aprint_error_dev(sc-sc_dev, failed to add
+ C-state: %s\n, AcpiFormatException(rv));
return rv;
}
Index: src/sys/dev/acpi/acpi_cpu_pstate.c
diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.36 src/sys/dev/acpi/acpi_cpu_pstate.c:1.37
--- src/sys/dev/acpi/acpi_cpu_pstate.c:1.36 Thu Dec 30 12:05:02 2010
+++ src/sys/dev/acpi/acpi_cpu_pstate.c Sun Jan 30 08:55:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.36 2010/12/30 12:05:02 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.37 2011/01/30 08:55:52 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_pstate.c,v 1.36 2010/12/30 12:05:02 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_pstate.c,v 1.37 2011/01/30 08:55:52 jruoho Exp $);
#include sys/param.h
#include sys/evcnt.h
@@ -75,10 +75,16 @@
}
/*
- * Append additional information from the
- * extended _PSS, if available. Note that
- * XPSS can not be used on Intel systems
- * that use either _PDC or _OSC.
+ * Append additional information from the extended _PSS,
+ * if available. Note that XPSS can not be used on Intel
+ * systems that use either _PDC or _OSC. From the XPSS
+ * method specification:
+ *
+ * The platform must not require the use of the
+ *optional _PDC or _OSC methods to coordinate
+ *between the operating system and firmware for
+ *the purposes of enabling specific processor
+ *power management features or implementations.
*/
if (sc-sc_cap == 0) {
@@ -134,11 +140,11 @@
return;
case AE_SUPPORT:
- aprint_verbose_dev(sc-sc_dev, P-states not supported\n);
+ aprint_verbose_dev(self, P-states not supported\n);
return;
default:
- aprint_error_dev(sc-sc_dev, failed to evaluate
+ aprint_error_dev(self, failed to evaluate
%s: %s\n, str, AcpiFormatException(rv));
}
}
@@ -164,7 +170,7 @@
if (ps-ps_freq == 0)
continue;
- aprint_debug_dev(sc-sc_dev, P%d: %3s,
+ aprint_verbose_dev(sc-sc_dev, P%d: %3s,
lat %3u us, pow %5u mW, %4u MHz\n, i, str,
ps-ps_latency, ps-ps_power, ps-ps_freq);
}
@@ -414,6 +420,8 @@
rv = acpicpu_pstate_pss_add(ps, obj-Package.Elements[i]);
if (ACPI_FAILURE(rv)) {
+ aprint_error_dev(sc-sc_dev, failed to add
+ P-state: %s\n, AcpiFormatException(rv));
ps-ps_freq = 0;
continue;
}
@@ -494,7 +502,7 @@
rv = acpi_eval_struct(sc-sc_node-ad_handle, XPSS, buf);
if (ACPI_FAILURE(rv))
- return rv;
+ goto out;
obj = buf.Pointer;
@@ -517,6 +525,10 @@
}
out:
+ if (ACPI_FAILURE(rv) rv != AE_NOT_FOUND)
+ aprint_error_dev(sc-sc_dev, failed to evaluate
+ XPSS: %s\n, AcpiFormatException(rv));
+
if (buf.Pointer != NULL)
ACPI_FREE(buf.Pointer);
Index: src/sys/dev/acpi/acpi_cpu_tstate.c
diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.18 src/sys/dev/acpi/acpi_cpu_tstate.c:1.19
--- src/sys/dev/acpi/acpi_cpu_tstate.c:1.18 Thu Dec 30 12:05:02 2010
+++ src/sys/dev/acpi/acpi_cpu_tstate.c Sun Jan 30 08:55:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_tstate.c,v 1.18 2010/12/30 12:05:02 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_tstate.c,v 1.19 2011/01/30 08:55:52 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 09:58:03 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/lock_stubs.S diff -u src/sys/arch/hppa/hppa/lock_stubs.S:1.18 src/sys/arch/hppa/hppa/lock_stubs.S:1.19 --- src/sys/arch/hppa/hppa/lock_stubs.S:1.18 Sat Jan 22 19:10:16 2011 +++ src/sys/arch/hppa/hppa/lock_stubs.S Sun Jan 30 09:58:03 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.18 2011/01/22 19:10:16 skrll Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.19 2011/01/30 09:58:03 skrll Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ comb, %arg1, %t1, 1f copy %t1,%ret0 _lock_cas_ras_end: - stw %arg2,0(%arg0) + stw %arg2, 0(%arg0) copy %arg1,%ret0 1: bv,n %r0(%rp) @@ -103,10 +103,10 @@ /* * If its a spin mutex or unowned, we have to take the slow path. */ - ldi MUTEX_ADAPTIVE_UNOWNED,%t1 + ldi MUTEX_ADAPTIVE_UNOWNED, %t1 ldw MTX_OWNER(%arg0),%t2 - depi 0,27,1,%t2 /* bit27 = 0 */ - comb,= %t1,%t2,.Lexit_slowpath + depi 0, 27, 1, %t2 /* bit27 = 0 */ + comb,= %t1, %t2, .Lexit_slowpath nop /* @@ -114,11 +114,11 @@ * field and release the lock. */ - ldi 1,%t2/* unlocked = 1 */ + ldi 1, %t2/* unlocked = 1 */ ldo (MTX_LOCK + HPPA_LDCW_ALIGN - 1)(%arg0), %t3 depi 0, 31, 4, %t3 - stw %t1,MTX_OWNER(%arg0) - stw %t2,0(%t3) /* %t3 is properly aligned */ + stw %t1, MTX_OWNER(%arg0) + stw %t2, 0(%t3) /* %t3 is properly aligned */ sync /* @@ -126,8 +126,8 @@ * will happen in sequence. If it's set then trap into mutex_wakeup() * to wake up any threads sleeping on the lock. */ - ldb MTX_WAITERS(%arg0),%t4 - comib,= 0,%t4,.Lexit_done + ldb MTX_WAITERS(%arg0), %t4 + comib,= 0, %t4, .Lexit_done nop ldil L%mutex_wakeup, %t1 @@ -157,9 +157,9 @@ * mutex_vector_enter() if the owners field is not clear. */ - ldi MUTEX_ADAPTIVE_UNOWNED,%t1 - ldw MTX_OWNER(%arg0),%t2 - comb,=,n %t1,%t2,.Lmutexunowned + ldi MUTEX_ADAPTIVE_UNOWNED, %t1 + ldw MTX_OWNER(%arg0), %t2 + comb,=,n %t1, %t2, .Lmutexunowned .Lenter_slowpath: ldil L%mutex_vector_enter, %t1 @@ -184,13 +184,13 @@ ldcw 0(%t1), %ret0 mutex_enter_crit_start: - comib,= 0,%ret0,.Lenter_slowpath + comib,= 0, %ret0, .Lenter_slowpath mfctl CR_CURLWP, %t2 bv %r0(%rp) mutex_enter_crit_end: - stw %t2,MTX_OWNER(%arg0) + stw %t2, MTX_OWNER(%arg0) EXIT(mutex_enter) #endif /* !LOCKDEBUG */ @@ -222,8 +222,6 @@ #define I64 \ I8 I8 I8 I8 I8 I8 I8 I8 - - .section .data .align 4096 .export _lock_hash, data @@ -255,17 +253,17 @@ /* %t3 is the interlock address */ ldcw 0(%t3), %ret0 - comib,,n 0,%ret0, _lock_cas_mp_interlocked + comib,,n 0, %ret0, _lock_cas_mp_interlocked _lock_cas_mp_spin: - ldw 0(%t3),%ret0 - comib,= 0,%ret0, _lock_cas_mp_spin - nop + ldw 0(%t3), %ret0 + comib,= 0, %ret0, _lock_cas_mp_spin + nop ldcw 0(%t3), %ret0 - comib,= 0,%ret0, _lock_cas_mp_spin - nop + comib,= 0, %ret0, _lock_cas_mp_spin + nop _lock_cas_mp_interlocked: - ldw 0(%arg0),%ret0 + ldw 0(%arg0), %ret0 comclr, %arg1, %ret0, %r0 /* If *ptr != old, then nullify */ stw %arg2, 0(%arg0)
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 10:09:23 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Don't use magic constant. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/lock_stubs.S diff -u src/sys/arch/hppa/hppa/lock_stubs.S:1.19 src/sys/arch/hppa/hppa/lock_stubs.S:1.20 --- src/sys/arch/hppa/hppa/lock_stubs.S:1.19 Sun Jan 30 09:58:03 2011 +++ src/sys/arch/hppa/hppa/lock_stubs.S Sun Jan 30 10:09:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.19 2011/01/30 09:58:03 skrll Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.20 2011/01/30 10:09:23 skrll Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -114,7 +114,7 @@ * field and release the lock. */ - ldi 1, %t2/* unlocked = 1 */ + ldi __SIMPLELOCK_RAW_UNLOCKED, %t2 /* unlocked = 1 */ ldo (MTX_LOCK + HPPA_LDCW_ALIGN - 1)(%arg0), %t3 depi 0, 31, 4, %t3 stw %t1, MTX_OWNER(%arg0)
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 11:33:33 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_getquota.sh
Log Message:
Remove unused function
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/t_getquota.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_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.1.2.1 src/tests/fs/ffs/t_getquota.sh:1.1.2.2
--- src/tests/fs/ffs/t_getquota.sh:1.1.2.1 Fri Jan 28 18:38:07 2011
+++ src/tests/fs/ffs/t_getquota.sh Sun Jan 30 11:33:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.1.2.1 2011/01/28 18:38:07 bouyer Exp $
+# $NetBSD: t_getquota.sh,v 1.1.2.2 2011/01/30 11:33:33 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -89,13 +89,3 @@
-o match:Phase 6 - Check Quotas \
fsck_ffs -nf -F ${IMG}
}
-
-quota_enabled_both()
-{
- create_with_quotas $*
-
-# check that the quota inode creation didn't corrupt the filesystem
- atf_check -s exit:0 -o match:already clean -o match:3 files \
- -o match:Phase 6 - Check Quotas \
- fsck_ffs -nf -F ${IMG}
-}
CVS commit: src/distrib/notes/common
Module Name:src Committed By: rumko Date: Sun Jan 30 11:50:44 UTC 2011 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.471 -r1.472 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.471 src/distrib/notes/common/main:1.472 --- src/distrib/notes/common/main:1.471 Mon Dec 20 19:51:03 2010 +++ src/distrib/notes/common/main Sun Jan 30 11:50:43 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.471 2010/12/20 19:51:03 ryo Exp $ +.\ $NetBSD: main,v 1.472 2011/01/30 11:50:43 rumko Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1301,6 +1301,7 @@ .It Ta Jeff Rizzo Ta Mt r...@netbsd.org .It Ta Hans Rosenfeld Ta Mt h...@netbsd.org .It Ta Steve Rumble Ta Mt rum...@netbsd.org +.It Ta Rumko Ta Mt ru...@netbsd.org .It Ta Jukka Ruohonen Ta Mt jru...@netbsd.org .It Ta Blair J. Sadewitz Ta Mt b...@netbsd.org .It Ta David Sainty Ta Mt dsai...@netbsd.org
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 12:37:34 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: Makefile quotas_common.sh
Added Files:
src/tests/fs/ffs [bouyer-quota2]: t_setquota.sh
Log Message:
Add tests cases for quotactl(set)
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/quotas_common.sh
cvs rdiff -u -r0 -r1.1.2.1 src/tests/fs/ffs/t_setquota.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.2 src/tests/fs/ffs/Makefile:1.14.2.3
--- src/tests/fs/ffs/Makefile:1.14.2.2 Fri Jan 28 18:38:07 2011
+++ src/tests/fs/ffs/Makefile Sun Jan 30 12:37:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14.2.2 2011/01/28 18:38:07 bouyer Exp $
+# $NetBSD: Makefile,v 1.14.2.3 2011/01/30 12:37:34 bouyer Exp $
#
.include bsd.own.mk
@@ -13,7 +13,7 @@
MAN.h_quota2_server= # empty
BINDIR.h_quota2_server= ${TESTSDIR}
-.for name in t_getquota
+.for name in t_getquota t_setquota
TESTS_SH+= ${name}
TESTS_SH_SRC_${name}= quotas_common.sh ${name}.sh
.endfor
Index: src/tests/fs/ffs/quotas_common.sh
diff -u src/tests/fs/ffs/quotas_common.sh:1.1.2.1 src/tests/fs/ffs/quotas_common.sh:1.1.2.2
--- src/tests/fs/ffs/quotas_common.sh:1.1.2.1 Fri Jan 28 18:38:07 2011
+++ src/tests/fs/ffs/quotas_common.sh Sun Jan 30 12:37:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: quotas_common.sh,v 1.1.2.1 2011/01/28 18:38:07 bouyer Exp $
+# $NetBSD: quotas_common.sh,v 1.1.2.2 2011/01/30 12:37:34 bouyer Exp $
create_with_quotas()
{
@@ -29,6 +29,29 @@
eval ${name}_head() { \
atf_set descr ${descr}
+ atf_set timeout 60
+ }
+ eval ${name}_body() { \
+ ${check_function} ${@} ; \
+ }
+ eval ${name}_cleanup() { \
+ atf_check -s exit:1 -o ignore -e ignore rump.halt; \
+ }
+ tests=${tests} ${name}
+}
+
+test_case_root()
+{
+ local name=${1}; shift
+ local check_function=${1}; shift
+ local descr=${1}; shift
+
+ atf_test_case ${name} cleanup
+
+ eval ${name}_head() { \
+ atf_set descr ${descr}
+ atf_set require.user root
+ atf_set timeout 60
}
eval ${name}_body() { \
${check_function} ${@} ; \
Added files:
Index: src/tests/fs/ffs/t_setquota.sh
diff -u /dev/null src/tests/fs/ffs/t_setquota.sh:1.1.2.1
--- /dev/null Sun Jan 30 12:37:34 2011
+++ src/tests/fs/ffs/t_setquota.sh Sun Jan 30 12:37:34 2011
@@ -0,0 +1,213 @@
+# $NetBSD: t_setquota.sh,v 1.1.2.1 2011/01/30 12:37:34 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.
+#
+
+for e in le be; do
+ for v in 1 2; do
+for q in user group; do
+ test_case_root set_${e}_${v}_${q} set_quota \
+ set quota with ${q} enabled ${e} ${v} ${q}
+ test_case_root set_new_${e}_${v}_${q} set_quota_new \
+ set quota for new id with ${q} enabled ${e} ${v} ${q}
+ test_case_root set_default_${e}_${v}_${q} set_quota_default \
+ set default quota with ${q} enabled ${e} ${v} ${q}
+done
+test_case_root set_${e}_${v}_both set_quota \
+ set quota with both enabled ${e} ${v} both
+test_case_root set_new_${e}_${v}_both set_quota_new \
+ set quota for new id with both enabled ${e} ${v} both
+test_case_root set_default_${e}_${v}_both set_quota_default \
+ set default quota with both enabled ${e} ${v} both
+ done
+done
+
+set_quota()
+{
+ create_with_quotas $*
+ local q=$3
+ local expect
+ local fail
+
+ case ${q} in
+ user)
+ expect=u
+ fail=g
+ ;;
+ group)
+ expect=g
+ fail=u
+ ;;
+ both)
+ expect=u g
+ fail=
+ ;;
+ *)
+
CVS commit: [bouyer-quota2] src/usr.sbin/edquota
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 12:38:32 UTC 2011
Modified Files:
src/usr.sbin/edquota [bouyer-quota2]: edquota.c
Log Message:
Handle humanized numbers for -h/-s
To generate a diff of this commit:
cvs rdiff -u -r1.29.16.1 -r1.29.16.2 src/usr.sbin/edquota/edquota.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/edquota/edquota.c
diff -u src/usr.sbin/edquota/edquota.c:1.29.16.1 src/usr.sbin/edquota/edquota.c:1.29.16.2
--- src/usr.sbin/edquota/edquota.c:1.29.16.1 Sun Jan 30 00:26:03 2011
+++ src/usr.sbin/edquota/edquota.c Sun Jan 30 12:38:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: edquota.c,v 1.29.16.1 2011/01/30 00:26:03 bouyer Exp $ */
+/* $NetBSD: edquota.c,v 1.29.16.2 2011/01/30 12:38:32 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = from: @(#)edquota.c 8.3 (Berkeley) 4/27/95;
#else
-__RCSID($NetBSD: edquota.c,v 1.29.16.1 2011/01/30 00:26:03 bouyer Exp $);
+__RCSID($NetBSD: edquota.c,v 1.29.16.2 2011/01/30 12:38:32 bouyer Exp $);
#endif
#endif /* not lint */
@@ -200,18 +200,29 @@
}
if (soft || hard) {
struct quotause *lqup;
- u_int32_t softb, hardb, softi, hardi;
+ u_int64_t softb, hardb, softi, hardi;
+ char *str;
if (tflag)
usage();
if (soft) {
- if (sscanf(soft, %d/%d, softb, softi) != 2)
+ str = strsep(soft, /);
+ if (str[0] == '\0' || soft == NULL || soft[0] == '\0')
usage();
- softb = btodb((u_quad_t)softb * 1024);
+
+ if (intrd(str, softb, HN_B) != 0)
+errx(1, %s: bad number, str);
+ if (intrd(soft, softi, 0) != 0)
+errx(1, %s: bad number, soft);
}
if (hard) {
- if (sscanf(hard, %d/%d, hardb, hardi) != 2)
+ str = strsep(hard, /);
+ if (str[0] == '\0' || hard == NULL || hard[0] == '\0')
usage();
- hardb = btodb((u_quad_t)hardb * 1024);
+
+ if (intrd(str, hardb, HN_B) != 0)
+errx(1, %s: bad number, str);
+ if (intrd(hard, hardi, 0) != 0)
+errx(1, %s: bad number, hard);
}
if (dflag) {
curprivs = getprivs(0, quotatype, fs, 1);
@@ -653,7 +664,7 @@
(void)lseek(outfd, (off_t)0, SEEK_SET);
if ((fd = fdopen(dup(outfd), w)) == NULL)
errx(1, fdopen `%s', tmpfil);
- if (quplist-flags DEFAULT) {
+ if (dflag) {
fprintf(fd, Default %s quotas:\n, qfextension[quotatype]);
} else {
fprintf(fd, Quotas for %s %s:\n,
@@ -776,8 +787,6 @@
for (qup = quplist; qup; qup = qup-next) {
if (strcmp(fsp, qup-fsname))
continue;
- printf(% PRIu64 % PRIu64 % PRIu64 % PRIu64 \n,
- softb, hardb, softi, hardi);
if (strcmp(intprt(qup-q2e.q2e_val[Q2V_BLOCK].q2v_cur,
HN_NOSPACE | HN_B | HN_PRIV_UNLIMITED, Hflag),
scurb) != 0 ||
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 13:15:14 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: h_quota2_server.c
Log Message:
Add a command-line flag to toggle foreground/background
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/h_quota2_server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/h_quota2_server.c
diff -u src/tests/fs/ffs/h_quota2_server.c:1.1.2.1 src/tests/fs/ffs/h_quota2_server.c:1.1.2.2
--- src/tests/fs/ffs/h_quota2_server.c:1.1.2.1 Thu Jan 20 14:25:04 2011
+++ src/tests/fs/ffs/h_quota2_server.c Sun Jan 30 13:15:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: h_quota2_server.c,v 1.1.2.1 2011/01/20 14:25:04 bouyer Exp $ */
+/* $NetBSD: h_quota2_server.c,v 1.1.2.2 2011/01/30 13:15:14 bouyer Exp $ */
/*
* rump server for advanced quota tests
@@ -12,6 +12,7 @@
#include sys/mount.h
#include stdlib.h
+#include unistd.h
#include ufs/ufs/ufsmount.h
@@ -20,10 +21,12 @@
#include ../../h_macros.h
+int background = 0;
+
static void
usage(void)
{
- fprintf(stderr, usage: %s diskimage bindurl\n, getprogname());
+ fprintf(stderr, usage: %s [-b] diskimage bindurl\n, getprogname());
exit(1);
}
@@ -32,7 +35,8 @@
{
warnx(%s: %s, reason, strerror(error));
- //rump_daemonize_done(error);
+ if (background)
+ rump_daemonize_done(error);
exit(1);
}
@@ -45,25 +49,38 @@
}
int
-main(int argc, const char *argv[])
+main(int argc, char **argv)
{
int error;
struct ufs_args uargs;
const char *filename;
const char *serverurl;
int log = 0;
+ int ch;
+
+ while ((ch = getopt(argc, argv, b)) != -1) {
+ switch(ch) {
+ case 'b':
+ background = 1;
+ break;
+ default:
+ usage();
+ }
+ }
+ argc -= optind;
+ argv += optind;
- if (argc != 3)
+ if (argc != 2)
usage();
- filename = argv[1];
- serverurl = argv[2];
+ filename = argv[0];
+ serverurl = argv[1];
-#if 0
- error = rump_daemonize_begin();
- if (error)
- errx(1, rump daemonize: %s, strerror(error));
-#endif
+ if (background) {
+ error = rump_daemonize_begin();
+ if (error)
+ errx(1, rump daemonize: %s, strerror(error));
+ }
error = rump_init();
if (error)
@@ -80,7 +97,8 @@
error = rump_init_server(serverurl);
if (error)
die(rump server init failed, error);
- //rump_daemonize_done(RUMP_DAEMONIZE_SUCCESS);
+ if (background)
+ rump_daemonize_done(RUMP_DAEMONIZE_SUCCESS);
sem_init(sigsem, 0, 0);
signal(SIGTERM, sigreboot);
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 13:23:27 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: quotas_common.sh t_getquota.sh
t_setquota.sh
Log Message:
Ask the rump server to background itself, to avoid a race at startup where
a rump command could be run before the server is available.
Add a sleep after shutdown to workaround a race where the fsck would run
before the server is fully showdown (testing for the existence of the
socket seems to not be enough).
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/tests/fs/ffs/quotas_common.sh \
src/tests/fs/ffs/t_getquota.sh
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/t_setquota.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/quotas_common.sh
diff -u src/tests/fs/ffs/quotas_common.sh:1.1.2.2 src/tests/fs/ffs/quotas_common.sh:1.1.2.3
--- src/tests/fs/ffs/quotas_common.sh:1.1.2.2 Sun Jan 30 12:37:34 2011
+++ src/tests/fs/ffs/quotas_common.sh Sun Jan 30 13:23:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: quotas_common.sh,v 1.1.2.2 2011/01/30 12:37:34 bouyer Exp $
+# $NetBSD: quotas_common.sh,v 1.1.2.3 2011/01/30 13:23:26 bouyer Exp $
create_with_quotas()
{
@@ -13,9 +13,8 @@
fi
atf_check -o ignore -e ignore newfs ${op} \
-B ${endian} -O ${vers} -s 4000 -F ${IMG}
- #atf_check -o ignore -e ignore $(atf_get_srcdir)/h_quota2_server \
- # ${IMG} ${RUMP_SERVER}
- $(atf_get_srcdir)/h_quota2_server ${IMG} ${RUMP_SERVER}
+ atf_check -o ignore -e ignore $(atf_get_srcdir)/h_quota2_server -b \
+ ${IMG} ${RUMP_SERVER}
}
# from tests/ipf/h_common.sh via tests/sbin/resize_ffs
@@ -66,7 +65,8 @@
{
IMG=fsimage
DIR=target
- RUMP_SERVER=unix:///tmp/test
+ RUMP_SOCKET=test
+ RUMP_SERVER=unix://${RUMP_SOCKET}
export RUMP_SERVER
for i in ${tests}; do
atf_add_test_case $i
Index: src/tests/fs/ffs/t_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.1.2.2 src/tests/fs/ffs/t_getquota.sh:1.1.2.3
--- src/tests/fs/ffs/t_getquota.sh:1.1.2.2 Sun Jan 30 11:33:33 2011
+++ src/tests/fs/ffs/t_getquota.sh Sun Jan 30 13:23:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.1.2.2 2011/01/30 11:33:33 bouyer Exp $
+# $NetBSD: t_getquota.sh,v 1.1.2.3 2011/01/30 13:23:26 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -83,7 +83,9 @@
$(atf_get_srcdir)/rump_repquota -${q} /mnt
done
atf_check -s exit:0 rump.halt
- wait $!
+#wait for rump server to be gone
+ while [ -e ${RUMP_SOCKET} ] ; do done
+ sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
Index: src/tests/fs/ffs/t_setquota.sh
diff -u src/tests/fs/ffs/t_setquota.sh:1.1.2.1 src/tests/fs/ffs/t_setquota.sh:1.1.2.2
--- src/tests/fs/ffs/t_setquota.sh:1.1.2.1 Sun Jan 30 12:37:34 2011
+++ src/tests/fs/ffs/t_setquota.sh Sun Jan 30 13:23:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_setquota.sh,v 1.1.2.1 2011/01/30 12:37:34 bouyer Exp $
+# $NetBSD: t_setquota.sh,v 1.1.2.2 2011/01/30 13:23:26 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -97,7 +97,9 @@
$(atf_get_srcdir)/rump_repquota -${q} /mnt
done
atf_check -s exit:0 rump.halt
- wait $!
+#wait for rump server to be gone
+ while [ -e ${RUMP_SOCKET} ] ; do done
+ sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
@@ -151,7 +153,9 @@
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
atf_check -s exit:0 rump.halt
- wait $!
+#wait for rump server to be gone
+ while [ -e ${RUMP_SOCKET} ] ; do done
+ sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
@@ -205,7 +209,9 @@
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
atf_check -s exit:0 rump.halt
- wait $!
+#wait for rump server to be gone
+ while [ -e ${RUMP_SOCKET} ] ; do done
+ sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
CVS commit: [bouyer-quota2] src/sbin/fsck_ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 14:26:31 UTC 2011 Modified Files: src/sbin/fsck_ffs [bouyer-quota2]: utilities.c Log Message: Fix cut-n-paste: compare gid against gid, not uid. To generate a diff of this commit: cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sbin/fsck_ffs/utilities.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/fsck_ffs/utilities.c diff -u src/sbin/fsck_ffs/utilities.c:1.58.2.1 src/sbin/fsck_ffs/utilities.c:1.58.2.2 --- src/sbin/fsck_ffs/utilities.c:1.58.2.1 Thu Jan 20 14:24:54 2011 +++ src/sbin/fsck_ffs/utilities.c Sun Jan 30 14:26:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: utilities.c,v 1.58.2.1 2011/01/20 14:24:54 bouyer Exp $ */ +/* $NetBSD: utilities.c,v 1.58.2.2 2011/01/30 14:26:31 bouyer Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)utilities.c 8.6 (Berkeley) 5/19/95; #else -__RCSID($NetBSD: utilities.c,v 1.58.2.1 2011/01/20 14:24:54 bouyer Exp $); +__RCSID($NetBSD: utilities.c,v 1.58.2.2 2011/01/30 14:26:31 bouyer Exp $); #endif #endif /* not lint */ @@ -786,7 +786,7 @@ uq_u = find_uquot(uquot_user_hash, uid, 1); uq_u-uq_b += bchange; uq_u-uq_i += ichange; - if (uq_g == NULL || uq_g-uq_uid != uid) + if (uq_g == NULL || uq_g-uq_uid != gid) uq_g = find_uquot(uquot_group_hash, gid, 1); uq_g-uq_b += bchange; uq_g-uq_i += ichange;
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 14:28:34 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_quota2_1.c
Log Message:
Use 8 for gid offset instead of 6, just in case ...
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/t_quota2_1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/t_quota2_1.c
diff -u src/tests/fs/ffs/t_quota2_1.c:1.1.2.1 src/tests/fs/ffs/t_quota2_1.c:1.1.2.2
--- src/tests/fs/ffs/t_quota2_1.c:1.1.2.1 Thu Jan 20 14:25:04 2011
+++ src/tests/fs/ffs/t_quota2_1.c Sun Jan 30 14:28:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_quota2_1.c,v 1.1.2.1 2011/01/20 14:25:04 bouyer Exp $ */
+/* $NetBSD: t_quota2_1.c,v 1.1.2.2 2011/01/30 14:28:33 bouyer Exp $ */
/*
* Basic tests for quota2
@@ -47,12 +47,13 @@
atf_tc_expect_pass();
FSTEST_ENTER();
+ RL(rump_sys_chown(., 0, 0));
for (i = 0 ; i n; i++) {
sprintf(buf, file%d, i);
RL(fd = rump_sys_open(buf, O_CREAT | O_RDWR, 0755));
sprintf(buf, test file no %d, i);
RL(rump_sys_write(fd, buf, strlen(buf)));
- RL(rump_sys_fchown(fd, i, i+6));
+ RL(rump_sys_fchown(fd, i, i+8));
rump_sys_close(fd);
}
FSTEST_EXIT();
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 16:31:42 UTC 2011
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Move rumpuser_sp_fini() after the kernel has completed shuwdown
(and especially, after filesystems have been unmounted).
This way, rump.halt returns once the rump kernel is really out of the
game, which avoids races issues in test scripts using a rump kernel.
OK pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.226 src/sys/rump/librump/rumpkern/rump.c:1.227
--- src/sys/rump/librump/rumpkern/rump.c:1.226 Fri Jan 28 19:21:29 2011
+++ src/sys/rump/librump/rumpkern/rump.c Sun Jan 30 16:31:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.226 2011/01/28 19:21:29 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.227 2011/01/30 16:31:42 bouyer 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.226 2011/01/28 19:21:29 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.227 2011/01/30 16:31:42 bouyer Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -536,7 +536,6 @@
finiarg = curproc-p_vmspace-vm_map.pmap;
else
finiarg = NULL;
- rumpuser_sp_fini(finiarg);
/* dump means we really take the dive here */
if ((howto RB_DUMP) || panicstr) {
@@ -552,6 +551,7 @@
/* your wish is my command */
if (howto RB_HALT) {
printf(rump kernel halted\n);
+ rumpuser_sp_fini(finiarg);
for (;;) {
uint64_t sec = 5, nsec = 0;
int error;
@@ -563,6 +563,7 @@
/* this function is __dead, we must exit */
out:
printf(halted\n);
+ rumpuser_sp_fini(finiarg);
rumpuser_exit(ruhow);
}
CVS commit: src/sys/netbt
Module Name:src
Committed By: plunky
Date: Sun Jan 30 17:23:23 UTC 2011
Modified Files:
src/sys/netbt: hci_socket.c
Log Message:
add (SOL_SOCKET, SO_TIMESTAMP) messages if requested
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/netbt/hci_socket.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_socket.c
diff -u src/sys/netbt/hci_socket.c:1.19 src/sys/netbt/hci_socket.c:1.20
--- src/sys/netbt/hci_socket.c:1.19 Mon Aug 10 20:22:06 2009
+++ src/sys/netbt/hci_socket.c Sun Jan 30 17:23:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hci_socket.c,v 1.19 2009/08/10 20:22:06 plunky Exp $ */
+/* $NetBSD: hci_socket.c,v 1.20 2011/01/30 17:23:23 plunky Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hci_socket.c,v 1.19 2009/08/10 20:22:06 plunky Exp $);
+__KERNEL_RCSID(0, $NetBSD: hci_socket.c,v 1.20 2011/01/30 17:23:23 plunky Exp $);
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -825,6 +825,16 @@
if (*ctl != NULL)
ctl = ((*ctl)-m_next);
}
+ if (pcb-hp_socket-so_options SO_TIMESTAMP) {
+ struct timeval tv;
+
+ microtime(tv);
+ *ctl = sbcreatecontrol(tv, sizeof(tv),
+ SCM_TIMESTAMP, SOL_SOCKET);
+
+ if (*ctl != NULL)
+ctl = ((*ctl)-m_next);
+ }
/*
* copy to socket
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sun Jan 30 17:48:04 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: xz-5.0.1 out. To generate a diff of this commit: cvs rdiff -u -r1.808 -r1.809 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.808 src/doc/3RDPARTY:1.809 --- src/doc/3RDPARTY:1.808 Sat Jan 29 10:51:42 2011 +++ src/doc/3RDPARTY Sun Jan 30 17:48:04 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.808 2011/01/29 10:51:42 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.809 2011/01/30 17:48:04 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1154,7 +1154,7 @@ Package: xz Version: 5.0.0 -Current Vers: 5.0.0 +Current Vers: 5.0.1 Maintainer: Lasse Collin lasse.col...@tukanni.org Archive Site: http://tukaani.org/xz/ Home Page: http://tukaani.org/xz/
CVS commit: src/distrib/notes
Module Name:src
Committed By: phx
Date: Sun Jan 30 18:04:41 UTC 2011
Modified Files:
src/distrib/notes/common: contents
src/distrib/notes/sandpoint: hardware install prep
Log Message:
Sandpoint bootloader was renamed from netboot to altboot.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/distrib/notes/common/contents
cvs rdiff -u -r1.7 -r1.8 src/distrib/notes/sandpoint/hardware
cvs rdiff -u -r1.6 -r1.7 src/distrib/notes/sandpoint/install
cvs rdiff -u -r1.5 -r1.6 src/distrib/notes/sandpoint/prep
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.164 src/distrib/notes/common/contents:1.165
--- src/distrib/notes/common/contents:1.164 Tue Jan 18 00:35:19 2011
+++ src/distrib/notes/common/contents Sun Jan 30 18:04:41 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: contents,v 1.164 2011/01/18 00:35:19 jym Exp $
+.\ $NetBSD: contents,v 1.165 2011/01/30 18:04:41 phx Exp $
.\
.\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -372,9 +372,9 @@
.\}
.
.if \n[sandpoint] \{\
-. It Pa netboot
+. It Pa altboot
\*M bootloader in ELF format; see below
-. It Pa netboot.bin
+. It Pa altboot.bin
\*M bootloader in binary format; see below
.\}
.
Index: src/distrib/notes/sandpoint/hardware
diff -u src/distrib/notes/sandpoint/hardware:1.7 src/distrib/notes/sandpoint/hardware:1.8
--- src/distrib/notes/sandpoint/hardware:1.7 Wed Jun 9 17:37:23 2010
+++ src/distrib/notes/sandpoint/hardware Sun Jan 30 18:04:41 2011
@@ -1,4 +1,4 @@
-.\$NetBSD: hardware,v 1.7 2010/06/09 17:37:23 phx Exp $
+.\$NetBSD: hardware,v 1.8 2011/01/30 18:04:41 phx Exp $
.
.Nx*M
is a port based on Motorola's
@@ -219,5 +219,5 @@
.Ss2 824x NAS supported boot devices and media
.Nx
is booted by
-.Pa netboot
+.Pa altboot
, which can load the kernel from NFS or from the local disk.
Index: src/distrib/notes/sandpoint/install
diff -u src/distrib/notes/sandpoint/install:1.6 src/distrib/notes/sandpoint/install:1.7
--- src/distrib/notes/sandpoint/install:1.6 Wed Jun 9 21:49:41 2010
+++ src/distrib/notes/sandpoint/install Sun Jan 30 18:04:41 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: install,v 1.6 2010/06/09 21:49:41 wiz Exp $
+.\ $NetBSD: install,v 1.7 2011/01/30 18:04:41 phx Exp $
.
.Ss2 Prepare the NFS server
.
@@ -17,7 +17,8 @@
KuroBox and LinkStation systems are known to have the console on the
second UART.
.Pp
-Now boot the kernel by running netboot.
+Now boot the kernel by running
+.Pa altboot .
The installation kernel will run
.Pa sysinst
from an internal memory disk image.
Index: src/distrib/notes/sandpoint/prep
diff -u src/distrib/notes/sandpoint/prep:1.5 src/distrib/notes/sandpoint/prep:1.6
--- src/distrib/notes/sandpoint/prep:1.5 Wed Jun 9 21:49:41 2010
+++ src/distrib/notes/sandpoint/prep Sun Jan 30 18:04:41 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: prep,v 1.5 2010/06/09 21:49:41 wiz Exp $
+.\ $NetBSD: prep,v 1.6 2011/01/30 18:04:41 phx Exp $
.
To install
.Nx \*V
@@ -11,9 +11,9 @@
The detailed procedure to build such a cable for your NAS system is not
part of this documentation.
.
-.Ss2 netboot
+.Ss2 altboot
The
-.Pa netboot.bin
+.Pa altboot.bin
binary loads a
.Nx
kernel from the root partition of a local disk or from NFS.
@@ -35,7 +35,7 @@
When auto-booting is enabled this will usually require to press a key
quickly after the system is switched on.
Then load the
-.Pa netboot.bin
+.Pa altboot.bin
file into memory at
.Pa 0x100
and start it with
CVS commit: src/distrib/notes/sandpoint
Module Name:src Committed By: phx Date: Sun Jan 30 18:13:31 UTC 2011 Modified Files: src/distrib/notes/sandpoint: hardware Log Message: As discussed with nisimura@ we remove the original Sandpoint evalulation platform from the installation instructions. Although it may still build the primary target are NAS boxes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/notes/sandpoint/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/sandpoint/hardware diff -u src/distrib/notes/sandpoint/hardware:1.8 src/distrib/notes/sandpoint/hardware:1.9 --- src/distrib/notes/sandpoint/hardware:1.8 Sun Jan 30 18:04:41 2011 +++ src/distrib/notes/sandpoint/hardware Sun Jan 30 18:13:31 2011 @@ -1,4 +1,4 @@ -.\$NetBSD: hardware,v 1.8 2011/01/30 18:04:41 phx Exp $ +.\$NetBSD: hardware,v 1.9 2011/01/30 18:13:31 phx Exp $ . .Nx*M is a port based on Motorola's @@ -16,152 +16,6 @@ The main focus of this port is on these systems, while the original evaluation boards are still supported. . -.Ss2 SandPoint X3 supported processor cards -.(bullet -offset indent -Unity X4 with MPC8240 -.It -Altimus X3 with either MPC755 or MPC7410 -.bullet) -.Pp -Other PMCs (Processor Mezzanine Cards) should work, but may need minor -adjustments or more substantial work to support additional functionality. -. -.Ss2 Supported SandPoint X3 devices -.(bullet -offset indent -Ethernet -.(bullet -compact -Asante Mac 10/100 PCI Rev A, part number 09-00169-01 -.Pq Em de -.It -Farallon Fast EtherTX 10/100, part number PN996L-TX -.Pq Em de -.It -SMC Etherpower II (9432TX) -.Pq Em epic -.It -SMC 83c170 -.Pq Em epic -.It -3Com 3c905 -.Pq Em ex -.It -Intel EtherExpress PRO/10+ PCI LAN Adapter -.Pq Em fxp -.It -Realtek 8029 Ethernet -.Pq Em ne -.It -VIA Technologies VT86C926 -.Pq Em ne -.It -D-Link DFE-530TX+ -.Pq Em rtk -.It -Realtek 8139 -.Pq Em rtk -.It -Netgear FA-311 -.Pq Em sip -.It -Lite-On PNIC -.Pq Em tlp -.It -D-Link DFE-530TX -.Pq Em vr -.It -Many other PCI Ethernet interfaces, such as -Tulip-compatible -.Pq Em de No and Em tlp , -3Com -.Pq Em ep , -SMC -.Pq Em epic , -Intel -.Pq Em fxp , -NE2000-compatible -.Pq Em ne , -and Realtek -.Pq Em rtk -.bullet) -.It -SCSI -.(bullet -compact -Adaptec PCI controllers 291x, 2920, 2930C, 294x, 295x, 39xx, 19160, 29160 -and AIC-78xx -.Pq Em ahc -.It -AdvanSys ABP-940UW[68], ABP-970UW[68], ASB3940UW-00 SCSI host adapters -.Pq Em adw -.It -AdvanSys 1200[A,B], 9xx[U,UA] SCSI controller -.Pq Em adv -.It -AMD 53c974 -.Pq Em pcscp -.It -DPT SmartCache/SmartRAID -.Pq Em dpt -.It -NCR/Symbios 53C8xx -.Pq Em siop No or Em esiop -.It -Many other PCI SCSI controllers should work, but no one has tried them -.It -Most SCSI disk/tape/CD-ROM devices should work -.bullet) -.It -IDE -.(bullet -compact -Promise Ultra66 -.Pq Em pciide -.It -Some other PCI IDE controllers should work, although no one has had much success -.It -Most IDE disk/CD-ROM/ATAPI devices should work -.bullet) -.It -Audio -.(bullet -compact -PCI audio cards, although none have been tested. -.bullet) -.It -Serial ports -.(bullet -compact -On-board serial ports (the modem and printer ports) -.Pq Em com0 No and Em com1 -.It -Some PCI serial ports should work, but no one has tried them -.bullet) -.It -PCI cards -.(bullet -compact -Most MI PCI cards should work, although very few have been tested with -.Nx*M -.Lk http://www.NetBSD.org/support/hardware/pci.html -.bullet) -.bullet) -. -.Ss2 Unsupported SandPoint X3 devices -.(bullet -offset indent -Built-in PS/2 keyboard mouse -.It -Built-in parallel -.It -Built-in floppy -.It -Built-in IDE -.bullet) -. -.Pp -The SandPoint X3 requires the use of Motorola's -.Tn DINK32 -ROM to load over a serial port. -This means that there is no way to boot from a local disk or PCI device. -. -.Ss2 SandPoint X3 supported boot devices and media -Currently, the only way to boot the system is with the DINK32 ROM -monitor's serial download or a JTAG device. -. .Ss2 Supported 824x based NAS systems The listed models of the following vendors are supported (installed NIC and disk device in brackets):
CVS commit: [bouyer-quota2] src
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 19:38:46 UTC 2011
Modified Files:
src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c
src/usr.bin/quota [bouyer-quota2]: getvfsquota.c getvfsquota.h
printquota.c printquota.h quota.c
src/usr.sbin/edquota [bouyer-quota2]: edquota.c
src/usr.sbin/repquota [bouyer-quota2]: repquota.c
Log Message:
Implement get version quotactl command, which return the filesystem's
enabled quota versiob (1 for legacy, 2 for new).
For quota2, make quota and repquota print the user's allowed grace period
if -v is given and not overquota (if overquota, the remaining time is
printed instead, as usual).
To generate a diff of this commit:
cvs rdiff -u -r1.68.4.4 -r1.68.4.5 src/sys/ufs/ufs/ufs_quota.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/usr.bin/quota/getvfsquota.c \
src/usr.bin/quota/getvfsquota.h
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/usr.bin/quota/printquota.c \
src/usr.bin/quota/printquota.h
cvs rdiff -u -r1.33.2.3 -r1.33.2.4 src/usr.bin/quota/quota.c
cvs rdiff -u -r1.29.16.2 -r1.29.16.3 src/usr.sbin/edquota/edquota.c
cvs rdiff -u -r1.25.2.2 -r1.25.2.3 src/usr.sbin/repquota/repquota.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_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.68.4.4 src/sys/ufs/ufs/ufs_quota.c:1.68.4.5
--- src/sys/ufs/ufs/ufs_quota.c:1.68.4.4 Sun Jan 30 00:25:19 2011
+++ src/sys/ufs/ufs/ufs_quota.c Sun Jan 30 19:38:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.68.4.4 2011/01/30 00:25:19 bouyer Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.68.4.5 2011/01/30 19:38:46 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.4 2011/01/30 00:25:19 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.5 2011/01/30 19:38:46 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include opt_quota.h
@@ -60,6 +60,8 @@
kmutex_t dqlock;
kcondvar_t dqcv;
+static int quota_handle_cmd_get_version(struct mount *, struct lwp *,
+prop_dictionary_t, prop_array_t);
static int quota_handle_cmd_get(struct mount *, struct lwp *,
prop_dictionary_t, int, prop_array_t);
static int quota_handle_cmd_set(struct mount *, struct lwp *,
@@ -151,6 +153,10 @@
prop_object_retain(datas);
prop_dictionary_remove(cmddict, data); /* prepare for return */
+ if (strcmp(cmd, get version) == 0) {
+ error = quota_handle_cmd_get_version(mp, l, cmddict, datas);
+ goto end;
+ }
if (strcmp(cmd, get) == 0) {
error = quota_handle_cmd_get(mp, l, cmddict, q2type, datas);
goto end;
@@ -171,6 +177,52 @@
return error;
}
+static int
+quota_handle_cmd_get_version(struct mount *mp, struct lwp *l,
+prop_dictionary_t cmddict, prop_array_t datas)
+{
+ struct ufsmount *ump = VFSTOUFS(mp);
+ prop_array_t replies;
+ prop_dictionary_t data;
+ int error = 0;
+
+ if ((ump-um_flags (UFS_QUOTA|UFS_QUOTA2)) == 0)
+ return EOPNOTSUPP;
+
+ replies = prop_array_create();
+ if (replies == NULL)
+ return ENOMEM;
+
+ data = prop_dictionary_create();
+ if (data == NULL) {
+ prop_object_release(replies);
+ return ENOMEM;
+ }
+
+#ifdef QUOTA
+ if (ump-um_flags UFS_QUOTA) {
+ if (!prop_dictionary_set_int8(data, version, 1))
+ error = ENOMEM;
+ } else
+#endif
+#ifdef QUOTA2
+ if (ump-um_flags UFS_QUOTA2) {
+ if (!prop_dictionary_set_int8(data, version, 2))
+ error = ENOMEM;
+ } else
+#endif
+ error = 0;
+ if (error)
+ prop_object_release(data);
+ else if (!prop_array_add_and_rel(replies, data))
+ error = ENOMEM;
+ if (error)
+ prop_object_release(replies);
+ else if (!prop_dictionary_set_and_rel(cmddict, data, replies))
+ error = ENOMEM;
+ return error;
+}
+
/* XXX shouldn't all this be in kauth ? */
static int
quota_get_auth(struct mount *mp, struct lwp *l, uid_t id) {
Index: src/usr.bin/quota/getvfsquota.c
diff -u src/usr.bin/quota/getvfsquota.c:1.1.2.1 src/usr.bin/quota/getvfsquota.c:1.1.2.2
--- src/usr.bin/quota/getvfsquota.c:1.1.2.1 Fri Jan 28 22:15:36 2011
+++ src/usr.bin/quota/getvfsquota.c Sun Jan 30 19:38:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getvfsquota.c,v 1.1.2.1 2011/01/28 22:15:36 bouyer Exp $ */
+/* $NetBSD: getvfsquota.c,v 1.1.2.2 2011/01/30 19:38:45 bouyer Exp $ */
/*-
* Copyright (c) 2011 Manuel Bouyer
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: getvfsquota.c,v 1.1.2.1 2011/01/28 22:15:36 bouyer Exp $);
+__RCSID($NetBSD: getvfsquota.c,v 1.1.2.2 2011/01/30 19:38:45 bouyer Exp $);
#include stdio.h
#include stdlib.h
@@ -48,15 +48,17 @@
/* retrieve quotas from vfs, for the given user id */
int
-getvfsquota(const char *mp, struct quota2_entry *q2e, long id, int type,
-int defaultq, int debug)
+getvfsquota(const char *mp, struct quota2_entry *q2e, int8_t *versp,
+long id, int type, int defaultq, int debug)
{
prop_dictionary_t dict, data, cmd;
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 19:49:48 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_getquota.sh t_setquota.sh
Log Message:
Remove rump.halt race workaround now that it's fixed in rump
Ajust for new quota tools output
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/t_getquota.sh
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/tests/fs/ffs/t_setquota.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_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.1.2.3 src/tests/fs/ffs/t_getquota.sh:1.1.2.4
--- src/tests/fs/ffs/t_getquota.sh:1.1.2.3 Sun Jan 30 13:23:26 2011
+++ src/tests/fs/ffs/t_getquota.sh Sun Jan 30 19:49:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.1.2.3 2011/01/30 13:23:26 bouyer Exp $
+# $NetBSD: t_getquota.sh,v 1.1.2.4 2011/01/30 19:49:48 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -64,7 +64,7 @@
#check that we can get the expected quota
for q in ${expect} ; do
atf_check -s exit:0 \
--o match:/mnt0-- 1 - - \
+-o match:/mnt0-- 7days 1 - - 7days \
-o match:Disk quotas for .*: $ \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
@@ -83,9 +83,6 @@
$(atf_get_srcdir)/rump_repquota -${q} /mnt
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
Index: src/tests/fs/ffs/t_setquota.sh
diff -u src/tests/fs/ffs/t_setquota.sh:1.1.2.2 src/tests/fs/ffs/t_setquota.sh:1.1.2.3
--- src/tests/fs/ffs/t_setquota.sh:1.1.2.2 Sun Jan 30 13:23:26 2011
+++ src/tests/fs/ffs/t_setquota.sh Sun Jan 30 19:49:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_setquota.sh,v 1.1.2.2 2011/01/30 13:23:26 bouyer Exp $
+# $NetBSD: t_setquota.sh,v 1.1.2.3 2011/01/30 19:49:48 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -75,7 +75,7 @@
atf_check -s exit:0 \
$(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
atf_check -s exit:0 \
--o match:/mnt0 1040960 1 20 51200 \
+-o match:/mnt0 1040960 7days 1 20 51200 7days \
-o match:Disk quotas for .*: $ \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
@@ -93,13 +93,10 @@
-o match:Disk quotas for .*: none$ \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
--o not-match:--0--1 - - \
+-o not-match:--0-- \
$(atf_get_srcdir)/rump_repquota -${q} /mnt
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
@@ -137,7 +134,7 @@
atf_check -s exit:0 \
$(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
atf_check -s exit:0 \
--o match:/mnt0 1040960 0 20 51200 \
+-o match:/mnt0 1040960 7days 0 20 51200 7days \
-o match:Disk quotas for .*: $ \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
@@ -153,9 +150,6 @@
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
@@ -193,7 +187,7 @@
atf_check -s exit:0 \
$(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
atf_check -s exit:0 \
--o match:/mnt0 1040960 0 20 51200 \
+-o match:/mnt0 1040960 7days 0 20 51200 7days \
-o match:Default (user|group) disk quotas: $ \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
@@ -209,9 +203,6 @@
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o match:already clean \
-o match:Phase 6 - Check Quotas \
CVS commit: [bouyer-quota2] src
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 20:54:23 UTC 2011
Modified Files:
src/usr.bin/quota [bouyer-quota2]: printquota.c printquota.h quota.c
src/usr.sbin/edquota [bouyer-quota2]: edquota.c
src/usr.sbin/repquota [bouyer-quota2]: repquota.c
Log Message:
Change timeprt to print in weeks, days, hours, minutes, seconds
Change timeprt and intprt to take the number of acceptable char as argument
Drop HN_PRIV_UNLIMITED, the printable space will decide how to print
unlimited
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/usr.bin/quota/printquota.c \
src/usr.bin/quota/printquota.h
cvs rdiff -u -r1.33.2.4 -r1.33.2.5 src/usr.bin/quota/quota.c
cvs rdiff -u -r1.29.16.3 -r1.29.16.4 src/usr.sbin/edquota/edquota.c
cvs rdiff -u -r1.25.2.3 -r1.25.2.4 src/usr.sbin/repquota/repquota.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/quota/printquota.c
diff -u src/usr.bin/quota/printquota.c:1.1.2.4 src/usr.bin/quota/printquota.c:1.1.2.5
--- src/usr.bin/quota/printquota.c:1.1.2.4 Sun Jan 30 19:38:45 2011
+++ src/usr.bin/quota/printquota.c Sun Jan 30 20:54:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: printquota.c,v 1.1.2.4 2011/01/30 19:38:45 bouyer Exp $ */
+/* $NetBSD: printquota.c,v 1.1.2.5 2011/01/30 20:54:22 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: printquota.c,v 1.1.2.4 2011/01/30 19:38:45 bouyer Exp $);
+__RCSID($NetBSD: printquota.c,v 1.1.2.5 2011/01/30 20:54:22 bouyer Exp $);
#endif
#endif /* not lint */
@@ -65,7 +65,7 @@
* convert 64bit value to a printable string
*/
const char *
-intprt(uint64_t val, u_int flags, int hflag)
+intprt(uint64_t val, u_int flags, int hflag, int space)
{
#define NBUFS 3
static char bufs[NBUFS][21];
@@ -77,22 +77,20 @@
i = 0;
#undef NBUFS
if (val == UQUAD_MAX)
- return((flags HN_PRIV_UNLIMITED) ? unlimited : -);
-
- flags = ~HN_PRIV_UNLIMITED;
+ return ((u_int)space strlen(unlimited)) ? unlimited : -;
if (flags HN_B)
val = dbtob(val);
if (hflag) {
- humanize_number(buf, 6, val, , HN_AUTOSCALE, flags);
+ humanize_number(buf, space + 1, val, , HN_AUTOSCALE, flags);
return buf;
}
if (flags HN_B) {
/* traditionnal display: blocks are in kilobytes */
val = val / 1024;
}
- snprintf(buf, sizeof(buf), % PRIu64, val);
+ snprintf(buf, space + 1, % PRIu64, val);
return buf;
}
@@ -100,27 +98,55 @@
* Calculate the grace period and return a printable string for it.
*/
const char *
-timeprt(time_t now, time_t seconds)
+timeprt(time_t now, time_t seconds, int space)
{
- time_t hours, minutes;
- static char buf[20];
+#define MINUTE 60
+#define HOUR (MINUTE * 60)
+#define DAY (HOUR * 24)
+#define WEEK (DAY * 7)
+
+ static char buf[20], *append;
+ int i, remain = space + 1;
if (now seconds)
return (none);
seconds -= now;
- minutes = (seconds + 30) / 60;
- hours = (minutes + 30) / 60;
- if (hours = 36) {
- (void)snprintf(buf, sizeof buf, %ddays,
- (int)((hours + 12) / 24));
+
+ append = buf[0];
+ if ((seconds / WEEK) 0) {
+ i = snprintf(append, remain, % PRId64 W, (seconds / WEEK));
+ append += i;
+ remain -=i;
+ seconds = seconds % WEEK;
+ }
+ if (remain 3 || seconds == 0)
return (buf);
+ if ((seconds / DAY) 0) {
+ i = snprintf(append, remain, % PRId64 D, (seconds / DAY));
+ append += i;
+ remain -=i;
+ seconds = seconds % DAY;
}
- if (minutes = 60) {
- (void)snprintf(buf, sizeof buf, %2d:%d,
- (int)(minutes / 60), (int)(minutes % 60));
+ if (remain 4 || seconds == 0)
return (buf);
+ if ((seconds / HOUR) 0) {
+ i = snprintf(append, remain, % PRId64 H, (seconds / HOUR));
+ append += i;
+ remain -=i;
+ seconds = seconds % HOUR;
}
- (void)snprintf(buf, sizeof buf, %2d, (int)minutes);
+ if (remain 4 || seconds == 0)
+ return (buf);
+ if ((seconds / MINUTE) 0) {
+ i = snprintf(append, remain, % PRId64 M,
+ (seconds / MINUTE));
+ append += i;
+ remain -=i;
+ seconds = seconds % MINUTE;
+ }
+ if (remain 4 || seconds == 0)
+ return (buf);
+ i = snprintf(append, remain, % PRId64 S, seconds);
return (buf);
}
Index: src/usr.bin/quota/printquota.h
diff -u src/usr.bin/quota/printquota.h:1.1.2.4 src/usr.bin/quota/printquota.h:1.1.2.5
--- src/usr.bin/quota/printquota.h:1.1.2.4 Sun Jan 30 19:38:45 2011
+++ src/usr.bin/quota/printquota.h Sun Jan 30 20:54:22 2011
@@ -1,7 +1,6 @@
-/* $NetBSD: printquota.h,v 1.1.2.4 2011/01/30 19:38:45 bouyer Exp $ */
+/* $NetBSD: printquota.h,v 1.1.2.5 2011/01/30 20:54:22 bouyer Exp $ */
-const char *intprt(uint64_t, u_int, int);
-#define HN_PRIV_UNLIMITED 0x8000 /* print unlimited instead of - */
-const char *timeprt(time_t, time_t);
+const char *intprt(uint64_t, u_int, int, int);
+const char *timeprt(time_t, time_t, int space);
int intrd(char *str,
CVS commit: src/distrib/notes/sandpoint
Module Name:src Committed By: phx Date: Sun Jan 30 21:18:51 UTC 2011 Modified Files: src/distrib/notes/sandpoint: hardware Log Message: Added missing .tag) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/notes/sandpoint/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/sandpoint/hardware diff -u src/distrib/notes/sandpoint/hardware:1.9 src/distrib/notes/sandpoint/hardware:1.10 --- src/distrib/notes/sandpoint/hardware:1.9 Sun Jan 30 18:13:31 2011 +++ src/distrib/notes/sandpoint/hardware Sun Jan 30 21:18:51 2011 @@ -1,4 +1,4 @@ -.\$NetBSD: hardware,v 1.9 2011/01/30 18:13:31 phx Exp $ +.\$NetBSD: hardware,v 1.10 2011/01/30 21:18:51 phx Exp $ . .Nx*M is a port based on Motorola's @@ -69,6 +69,7 @@ .Pq Em re/viaide StorCenter XXX .bullet) +.tag) . .Ss2 824x NAS supported boot devices and media .Nx
CVS commit: [bouyer-quota2] src/usr.bin/quota
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 21:37:39 UTC 2011
Modified Files:
src/usr.bin/quota [bouyer-quota2]: printquota.c printquota.h
Log Message:
Revert to previous format for timeprt, which is less precise but more
user-friendly. Introduce timepprt for cases where we want human-readable but
precise time display.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/usr.bin/quota/printquota.c \
src/usr.bin/quota/printquota.h
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/quota/printquota.c
diff -u src/usr.bin/quota/printquota.c:1.1.2.5 src/usr.bin/quota/printquota.c:1.1.2.6
--- src/usr.bin/quota/printquota.c:1.1.2.5 Sun Jan 30 20:54:22 2011
+++ src/usr.bin/quota/printquota.c Sun Jan 30 21:37:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: printquota.c,v 1.1.2.5 2011/01/30 20:54:22 bouyer Exp $ */
+/* $NetBSD: printquota.c,v 1.1.2.6 2011/01/30 21:37:39 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: printquota.c,v 1.1.2.5 2011/01/30 20:54:22 bouyer Exp $);
+__RCSID($NetBSD: printquota.c,v 1.1.2.6 2011/01/30 21:37:39 bouyer Exp $);
#endif
#endif /* not lint */
@@ -95,16 +95,64 @@
}
/*
- * Calculate the grace period and return a printable string for it.
+ * Calculate the grace period and return a user-friendly string for it.
*/
-const char *
-timeprt(time_t now, time_t seconds, int space)
-{
#define MINUTE 60
#define HOUR (MINUTE * 60)
#define DAY (HOUR * 24)
#define WEEK (DAY * 7)
+#define MONTH (DAY * 30)
+#define YEAR (DAY * 355)
+
+const char *
+timeprt(time_t now, time_t seconds, int space)
+{
+ time_t years, months, weeks, days, hours, minutes;
+ static char buf[20];
+
+ if (now seconds)
+ return (none);
+
+ seconds -= now;
+
+ minutes = (seconds + MINUTE / 2) / MINUTE;
+ hours = (seconds + HOUR / 2) / HOUR;
+ days = (seconds + DAY / 2) / DAY;
+ years = (seconds + YEAR / 2) / YEAR;
+ months = (seconds + MONTH / 2) / MONTH;
+ weeks = (seconds + WEEK / 2) / WEEK;
+
+ if (years = 2) {
+ (void)snprintf(buf, space+1, % PRId64 years, years);
+ return buf;
+ }
+ if (weeks 9) {
+ (void)snprintf(buf, space+1, % PRId64 months, months);
+ return buf;
+ }
+ if (days 9) {
+ (void)snprintf(buf, space+1, % PRId64 weeks, weeks);
+ return buf;
+ }
+ if (hours 36) {
+ (void)snprintf(buf, space+1, % PRId64 days, days);
+ return buf;
+ }
+ if (minutes 60) {
+ (void)snprintf(buf, space+1, %2d:%d,
+ (int)(minutes / 60), (int)(minutes % 60));
+ return buf;
+ }
+ (void)snprintf(buf, sizeof buf, %2d, (int)minutes);
+ return buf;
+}
+/*
+ * Calculate the grace period and return a precise string for it.
+ */
+const char *
+timepprt(time_t now, time_t seconds, int space)
+{
static char buf[20], *append;
int i, remain = space + 1;
Index: src/usr.bin/quota/printquota.h
diff -u src/usr.bin/quota/printquota.h:1.1.2.5 src/usr.bin/quota/printquota.h:1.1.2.6
--- src/usr.bin/quota/printquota.h:1.1.2.5 Sun Jan 30 20:54:22 2011
+++ src/usr.bin/quota/printquota.h Sun Jan 30 21:37:39 2011
@@ -1,6 +1,7 @@
-/* $NetBSD: printquota.h,v 1.1.2.5 2011/01/30 20:54:22 bouyer Exp $ */
+/* $NetBSD: printquota.h,v 1.1.2.6 2011/01/30 21:37:39 bouyer Exp $ */
const char *intprt(uint64_t, u_int, int, int);
const char *timeprt(time_t, time_t, int space);
+const char *timepprt(time_t, time_t, int space);
int intrd(char *str, uint64_t *val, u_int);
CVS commit: src/share/man/man3
Module Name:src Committed By: njoly Date: Sun Jan 30 21:48:48 UTC 2011 Modified Files: src/share/man/man3: tgmath.3 Log Message: Add missing Ta macro. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man3/tgmath.3 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/man3/tgmath.3 diff -u src/share/man/man3/tgmath.3:1.6 src/share/man/man3/tgmath.3:1.7 --- src/share/man/man3/tgmath.3:1.6 Tue Dec 14 17:27:32 2010 +++ src/share/man/man3/tgmath.3 Sun Jan 30 21:48:48 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: tgmath.3,v 1.6 2010/12/14 17:27:32 jruoho Exp $ +.\ $NetBSD: tgmath.3,v 1.7 2011/01/30 21:48:48 njoly Exp $ .\ .\ Copyright (c) 2004 Stefan Farfeleder .\ All rights reserved. @@ -125,7 +125,7 @@ .Pp The following macros always expand to a complex function: .Bl -column -offset indent .Fn cimag .Fn cimag .Fn cimag .Fn cimag .Fn cimag -.It Xr carg 3 Ta Xr cimag 3 Ta Xr conj 3 Ta Fn cproj Xr creal 3 +.It Xr carg 3 Ta Xr cimag 3 Ta Xr conj 3 Ta Fn cproj Ta Xr creal 3 .El .Pp This header includes
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 22:36:12 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Tweak a comment. Suggestion from rmind@. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/lock_stubs.S diff -u src/sys/arch/hppa/hppa/lock_stubs.S:1.20 src/sys/arch/hppa/hppa/lock_stubs.S:1.21 --- src/sys/arch/hppa/hppa/lock_stubs.S:1.20 Sun Jan 30 10:09:23 2011 +++ src/sys/arch/hppa/hppa/lock_stubs.S Sun Jan 30 22:36:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.20 2011/01/30 10:09:23 skrll Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.21 2011/01/30 22:36:12 skrll Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -152,9 +152,9 @@ LEAF_ENTRY(mutex_enter) /* - * It might be a spin lock, or might be already owned. - * We short circut the request and go straight into - * mutex_vector_enter() if the owners field is not clear. + * It might be a spin lock (c.f. MUTEX_SPIN_FLAG) or might be + * already owned. We short circut the request and go straight + * into mutex_vector_enter() if the owners field is not 'unowned'. */ ldi MUTEX_ADAPTIVE_UNOWNED, %t1
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 22:36:38 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Grammar. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/lock_stubs.S diff -u src/sys/arch/hppa/hppa/lock_stubs.S:1.21 src/sys/arch/hppa/hppa/lock_stubs.S:1.22 --- src/sys/arch/hppa/hppa/lock_stubs.S:1.21 Sun Jan 30 22:36:12 2011 +++ src/sys/arch/hppa/hppa/lock_stubs.S Sun Jan 30 22:36:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.21 2011/01/30 22:36:12 skrll Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.22 2011/01/30 22:36:37 skrll Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ LEAF_ENTRY(mutex_exit) /* - * If its a spin mutex or unowned, we have to take the slow path. + * If it's a spin mutex or unowned, we have to take the slow path. */ ldi MUTEX_ADAPTIVE_UNOWNED, %t1 ldw MTX_OWNER(%arg0),%t2
CVS commit: [bouyer-quota2] src
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 22:49:32 UTC 2011
Modified Files:
src/usr.bin/quota [bouyer-quota2]: printquota.c printquota.h
src/usr.sbin/edquota [bouyer-quota2]: edquota.c
Log Message:
Allow edquota to edit per-user grace times on quota2 (or the default, global
grace times on quota1). Use re-use -t to specify the grace time on command
line; editing the grace time on quota1 is done with -d now.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/usr.bin/quota/printquota.c \
src/usr.bin/quota/printquota.h
cvs rdiff -u -r1.29.16.4 -r1.29.16.5 src/usr.sbin/edquota/edquota.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/quota/printquota.c
diff -u src/usr.bin/quota/printquota.c:1.1.2.6 src/usr.bin/quota/printquota.c:1.1.2.7
--- src/usr.bin/quota/printquota.c:1.1.2.6 Sun Jan 30 21:37:39 2011
+++ src/usr.bin/quota/printquota.c Sun Jan 30 22:49:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: printquota.c,v 1.1.2.6 2011/01/30 21:37:39 bouyer Exp $ */
+/* $NetBSD: printquota.c,v 1.1.2.7 2011/01/30 22:49:31 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: printquota.c,v 1.1.2.6 2011/01/30 21:37:39 bouyer Exp $);
+__RCSID($NetBSD: printquota.c,v 1.1.2.7 2011/01/30 22:49:31 bouyer Exp $);
#endif
#endif /* not lint */
@@ -148,17 +148,19 @@
}
/*
- * Calculate the grace period and return a precise string for it.
+ * Calculate the grace period and return a precise string for it,
+ * either in seconds or in format xWyDzHtMuS
*/
const char *
-timepprt(time_t now, time_t seconds, int space)
+timepprt(time_t seconds, int hflag, int space)
{
static char buf[20], *append;
int i, remain = space + 1;
- if (now seconds)
- return (none);
- seconds -= now;
+ if (hflag == 0) {
+ snprintf(buf, remain, % PRId64, seconds);
+ return buf;
+ }
append = buf[0];
if ((seconds / WEEK) 0) {
@@ -199,6 +201,55 @@
}
/*
+ * convert a string of the form xWyDzHtMuS, or plain decimal, to
+ * a time in seconds
+ */
+int
+timeprd(const char *str, time_t *valp)
+{
+ char buf[20];
+ char *cur, *next, *end;
+ time_t val= 0;
+
+ strncpy(buf, str, sizeof(buf));
+ next = buf;
+ cur = strsep(next, Ww);
+ if (next != NULL) {
+ val = strtoumax(cur, end, 10) * WEEK;
+ if (end[0] != '\0')
+ return EINVAL;
+ } else
+ next = cur;
+ cur = strsep(next, Dd);
+ if (next != NULL) {
+ val += strtoumax(cur, end, 10) * DAY;
+ if (end[0] != '\0')
+ return EINVAL;
+ } else
+ next = cur;
+ cur = strsep(next, Hh);
+ if (next != NULL) {
+ val += strtoumax(cur, end, 10) * HOUR;
+ if (end[0] != '\0')
+ return EINVAL;
+ } else
+ next = cur;
+ cur = strsep(next, Mm);
+ if (next != NULL) {
+ val += strtoumax(cur, end, 10) * MINUTE;
+ if (end[0] != '\0')
+ return EINVAL;
+ } else
+ next = cur;
+ cur = strsep(next, Ss);
+ val += strtoumax(cur, end, 10);
+ if (end[0] != '\0')
+ return EINVAL;
+ *valp = val;
+ return 0;
+}
+
+/*
* convert a string to a uint64 value
*/
int
Index: src/usr.bin/quota/printquota.h
diff -u src/usr.bin/quota/printquota.h:1.1.2.6 src/usr.bin/quota/printquota.h:1.1.2.7
--- src/usr.bin/quota/printquota.h:1.1.2.6 Sun Jan 30 21:37:39 2011
+++ src/usr.bin/quota/printquota.h Sun Jan 30 22:49:32 2011
@@ -1,7 +1,8 @@
-/* $NetBSD: printquota.h,v 1.1.2.6 2011/01/30 21:37:39 bouyer Exp $ */
+/* $NetBSD: printquota.h,v 1.1.2.7 2011/01/30 22:49:32 bouyer Exp $ */
const char *intprt(uint64_t, u_int, int, int);
-const char *timeprt(time_t, time_t, int space);
-const char *timepprt(time_t, time_t, int space);
+const char *timeprt(time_t, time_t, int);
+const char *timepprt(time_t, int, int);
+int timeprd(const char *, time_t *);
int intrd(char *str, uint64_t *val, u_int);
Index: src/usr.sbin/edquota/edquota.c
diff -u src/usr.sbin/edquota/edquota.c:1.29.16.4 src/usr.sbin/edquota/edquota.c:1.29.16.5
--- src/usr.sbin/edquota/edquota.c:1.29.16.4 Sun Jan 30 20:54:22 2011
+++ src/usr.sbin/edquota/edquota.c Sun Jan 30 22:49:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: edquota.c,v 1.29.16.4 2011/01/30 20:54:22 bouyer Exp $ */
+/* $NetBSD: edquota.c,v 1.29.16.5 2011/01/30 22:49:32 bouyer Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = from: @(#)edquota.c 8.3 (Berkeley) 4/27/95;
#else
-__RCSID($NetBSD: edquota.c,v 1.29.16.4 2011/01/30 20:54:22 bouyer Exp $);
+__RCSID($NetBSD: edquota.c,v 1.29.16.5 2011/01/30 22:49:32 bouyer Exp $);
#endif
#endif /* not lint */
@@ -130,10 +130,10 @@
long id, protoid;
int quotatype, tmpfd;
char *protoname;
- char *soft = NULL, *hard = NULL;
+ char *soft = NULL, *hard = NULL, *grace = NULL;
char *fs = NULL;
int ch;
- int tflag = 0, pflag = 0;
+ int pflag = 0;
if (argc 2)
usage();
@@ -141,7 +141,7 @@
errx(1, permission
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src
Committed By: bouyer
Date: Sun Jan 30 23:04:52 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_setquota.sh
Log Message:
Also set and check the grace time in edquota tests.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/t_setquota.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_setquota.sh
diff -u src/tests/fs/ffs/t_setquota.sh:1.1.2.3 src/tests/fs/ffs/t_setquota.sh:1.1.2.4
--- src/tests/fs/ffs/t_setquota.sh:1.1.2.3 Sun Jan 30 19:49:48 2011
+++ src/tests/fs/ffs/t_setquota.sh Sun Jan 30 23:04:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_setquota.sh,v 1.1.2.3 2011/01/30 19:49:48 bouyer Exp $
+# $NetBSD: t_setquota.sh,v 1.1.2.4 2011/01/30 23:04:52 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -73,9 +73,10 @@
for q in ${expect} ; do
local id=$(id -${q})
atf_check -s exit:0 \
- $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+ $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+ -t 2W/3D ${id}
atf_check -s exit:0 \
--o match:/mnt0 1040960 7days 1 20 51200 7days \
+-o match:/mnt0 1040960 2weeks 1 20 51200 3days \
-o match:Disk quotas for .*: $ \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
@@ -132,9 +133,10 @@
for q in ${expect} ; do
local id=1
atf_check -s exit:0 \
- $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+ $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+ -t 120W/255D ${id}
atf_check -s exit:0 \
--o match:/mnt0 1040960 7days 0 20 51200 7days \
+-o match:/mnt0 1040960 2years 0 20 51200 9months \
-o match:Disk quotas for .*: $ \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
@@ -185,9 +187,10 @@
for q in ${expect} ; do
local id=-d
atf_check -s exit:0 \
- $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+ $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+ -t 2H2M/3540 ${id}
atf_check -s exit:0 \
--o match:/mnt0 1040960 7days 0 20 51200 7days \
+-o match:/mnt0 1040960 2:2 0 20 51200 59 \
-o match:Default (user|group) disk quotas: $ \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
CVS commit: src/share/man/man4
Module Name:src Committed By: njoly Date: Sun Jan 30 23:29:25 UTC 2011 Modified Files: src/share/man/man4: bwi.4 Log Message: Move -offset option before column width arguments. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/bwi.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/bwi.4 diff -u src/share/man/man4/bwi.4:1.5 src/share/man/man4/bwi.4:1.6 --- src/share/man/man4/bwi.4:1.5 Fri Aug 21 23:46:20 2009 +++ src/share/man/man4/bwi.4 Sun Jan 30 23:29:24 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: bwi.4,v 1.5 2009/08/21 23:46:20 joerg Exp $ +.\ $NetBSD: bwi.4,v 1.6 2011/01/30 23:29:24 njoly Exp $ .\ .\ Copyright (c) 2007 The DragonFly Project. All rights reserved. .\ @@ -68,7 +68,7 @@ .Nm driver: .Pp -.Bl -column -compact Apple AirPort Extreme BCM4318 Mini PCI b/g -offset 6n +.Bl -column -offset 6n -compact Apple AirPort Extreme BCM4318 Mini PCI b/g .It Em Card Chip Bus Standard .It Buffalo WLI-PCI-G54S BCM4306 PCI b/g .It Dell Wireless 1370 BCM4318 Mini PCI b/g
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: gsutre
Date: Sun Jan 30 23:43:09 UTC 2011
Modified Files:
src/sys/dev/pci: agp_i810.c
Log Message:
Enable 36-bit addressing for chipsets that support it. While there,
factorize offset computation. Inspired from OpenBSD and Intel docs.
Note: agp_i810_bind/unbind_page will now fail with EINVAL if the
physical address is too large for the chipset (instead of silently
truncating it).
ok jmcneill@
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/agp_i810.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/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.70 src/sys/dev/pci/agp_i810.c:1.71
--- src/sys/dev/pci/agp_i810.c:1.70 Tue Jan 25 10:52:11 2011
+++ src/sys/dev/pci/agp_i810.c Sun Jan 30 23:43:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.70 2011/01/25 10:52:11 gsutre Exp $ */
+/* $NetBSD: agp_i810.c,v 1.71 2011/01/30 23:43:08 gsutre Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.70 2011/01/25 10:52:11 gsutre Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_i810.c,v 1.71 2011/01/30 23:43:08 gsutre Exp $);
#include sys/param.h
#include sys/systm.h
@@ -100,8 +100,8 @@
static int agp_i810_init(struct agp_softc *);
static int agp_i810_init(struct agp_softc *);
-static void agp_i810_write_gtt_entry(struct agp_i810_softc *, off_t,
- u_int32_t);
+static int agp_i810_write_gtt_entry(struct agp_i810_softc *, off_t,
+bus_addr_t);
static struct agp_methods agp_i810_methods = {
agp_i810_get_aperture,
@@ -116,12 +116,37 @@
agp_i810_unbind_memory,
};
-static void
-agp_i810_write_gtt_entry(struct agp_i810_softc *isc, off_t off, u_int32_t v)
+static int
+agp_i810_write_gtt_entry(struct agp_i810_softc *isc, off_t off, bus_addr_t v)
{
- u_int32_t base_off;
+ u_int32_t pte;
+ bus_size_t base_off, wroff;
+
+ /* Bits 11:4 (physical start address extension) should be zero. */
+ if ((v 0xff0) != 0)
+ return EINVAL;
+
+ pte = (u_int32_t)v;
+ /*
+ * We need to massage the pte if bus_addr_t is wider than 32 bits.
+ * The compiler isn't smart enough, hence the casts to uintmax_t.
+ */
+ if (sizeof(bus_addr_t) sizeof(u_int32_t)) {
+ /* 965+ can do 36-bit addressing, add in the extra bits. */
+ if (isc-chiptype == CHIP_I965 ||
+ isc-chiptype == CHIP_G33 ||
+ isc-chiptype == CHIP_G4X) {
+ if (((uintmax_t)v 36) != 0)
+return EINVAL;
+ pte |= (v 28) 0xf0;
+ } else {
+ if (((uintmax_t)v 32) != 0)
+return EINVAL;
+ }
+ }
base_off = 0;
+ wroff = (off AGP_PAGE_SHIFT) * 4;
switch (isc-chiptype) {
case CHIP_I810:
@@ -137,12 +162,12 @@
break;
case CHIP_I915:
case CHIP_G33:
- bus_space_write_4(isc-gtt_bst, isc-gtt_bsh,
- (u_int32_t)((off) AGP_PAGE_SHIFT) * 4, (v));
- return;
+ bus_space_write_4(isc-gtt_bst, isc-gtt_bsh, wroff, pte);
+ return 0;
}
-
- WRITE4(base_off + (u_int32_t)(off AGP_PAGE_SHIFT) * 4, v);
+
+ WRITE4(base_off + wroff, pte);
+ return 0;
}
/* XXXthorpej -- duplicated code (see arch/x86/pci/pchb.c) */
@@ -829,8 +854,7 @@
}
}
- agp_i810_write_gtt_entry(isc, offset, physical | 1);
- return 0;
+ return agp_i810_write_gtt_entry(isc, offset, physical | 1);
}
static int
@@ -851,8 +875,7 @@
}
}
- agp_i810_write_gtt_entry(isc, offset, 0);
- return 0;
+ return agp_i810_write_gtt_entry(isc, offset, 0);
}
/*
CVS commit: src/sys/dev/pci
Module Name:src Committed By: christos Date: Mon Jan 31 00:01:07 UTC 2011 Modified Files: src/sys/dev/pci: if_iwi.c Log Message: clear register 0x41 as FreeBSD and OpenBSD do. Update copyright to the latest. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pci/if_iwi.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/if_iwi.c diff -u src/sys/dev/pci/if_iwi.c:1.85 src/sys/dev/pci/if_iwi.c:1.86 --- src/sys/dev/pci/if_iwi.c:1.85 Mon Nov 15 00:57:24 2010 +++ src/sys/dev/pci/if_iwi.c Sun Jan 30 19:01:07 2011 @@ -1,34 +1,25 @@ -/* $NetBSD: if_iwi.c,v 1.85 2010/11/15 05:57:24 uebayasi Exp $ */ +/* $NetBSD: if_iwi.c,v 1.86 2011/01/31 00:01:07 christos Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */ /*- - * Copyright (c) 2004, 2005 + * Copyright (c) 2004-2008 * Damien Bergamini damien.bergam...@free.fr. 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 unmodified, 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. + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * 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 THE 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. + * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_iwi.c,v 1.85 2010/11/15 05:57:24 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: if_iwi.c,v 1.86 2011/01/31 00:01:07 christos Exp $); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -239,6 +230,12 @@ return; } + /* clear device specific PCI configuration register 0x41 */ + data = pci_conf_read(sc-sc_pct, sc-sc_pcitag, 0x40); + data = ~0xff00; + pci_conf_write(sc-sc_pct, sc-sc_pcitag, 0x40, data); + + /* enable bus-mastering */ data = pci_conf_read(sc-sc_pct, sc-sc_pcitag, PCI_COMMAND_STATUS_REG); data |= PCI_COMMAND_MASTER_ENABLE;
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Mon Jan 31 00:05:29 UTC 2011
Modified Files:
src/sys/kern: syscalls.master
Log Message:
make syscalls match documentation as far as pid_t goes.
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/sys/kern/syscalls.master
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/syscalls.master
diff -u src/sys/kern/syscalls.master:1.242 src/sys/kern/syscalls.master:1.243
--- src/sys/kern/syscalls.master:1.242 Mon Jan 17 13:24:17 2011
+++ src/sys/kern/syscalls.master Sun Jan 30 19:05:29 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.242 2011/01/17 18:24:17 pooka Exp $
+ $NetBSD: syscalls.master,v 1.243 2011/01/31 00:05:29 christos Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -72,7 +72,7 @@
5 STD RUMP { int|sys||open(const char *path, \
int flags, ... mode_t mode); }
6 STD RUMP { int|sys||close(int fd); }
-7 COMPAT_50 MODULAR { int|sys||wait4(int pid, int *status, \
+7 COMPAT_50 MODULAR { int|sys||wait4(pid_t pid, int *status, \
int options, struct rusage50 *rusage); }
8 COMPAT_43 MODULAR { int|sys||creat(const char *path, mode_t mode); } ocreat
9 STD RUMP { int|sys||link(const char *path, const char *link); }
@@ -116,7 +116,7 @@
34 STD RUMP { int|sys||chflags(const char *path, u_long flags); }
35 STD RUMP { int|sys||fchflags(int fd, u_long flags); }
36 STD RUMP { void|sys||sync(void); }
-37 STD { int|sys||kill(int pid, int signum); }
+37 STD { int|sys||kill(pid_t pid, int signum); }
38 COMPAT_43 MODULAR { int|sys||stat(const char *path, struct stat43 *ub); } \
stat43
39 STD RUMP { pid_t|sys||getppid(void); }
@@ -128,7 +128,7 @@
44 STD { int|sys||profil(char *samples, size_t size, \
u_long offset, u_int scale); }
45 STD { int|sys||ktrace(const char *fname, int ops, \
- int facs, int pid); }
+ int facs, pid_t pid); }
46 COMPAT_13 MODULAR { int|sys||sigaction(int signum, \
const struct sigaction13 *nsa, \
struct sigaction13 *osa); } sigaction13
@@ -182,7 +182,7 @@
80 STD RUMP { int|sys||setgroups(int gidsetsize, \
const gid_t *gidset); }
81 STD RUMP { int|sys||getpgrp(void); }
-82 STD RUMP { int|sys||setpgid(int pid, int pgid); }
+82 STD RUMP { int|sys||setpgid(pid_t pid, pid_t pgid); }
83 COMPAT_50 MODULAR { int|sys||setitimer(int which, \
const struct itimerval50 *itv, \
struct itimerval50 *oitv); }
@@ -546,7 +546,7 @@
286 STD RUMP { pid_t|sys||getsid(pid_t pid); }
287 STD { pid_t|sys||__clone(int flags, void *stack); }
288 STD { int|sys||fktrace(int fd, int ops, \
- int facs, int pid); }
+ int facs, pid_t pid); }
289 STD { ssize_t|sys||preadv(int fd, \
const struct iovec *iovp, int iovcnt, \
int PAD, off_t offset); }
@@ -877,7 +877,7 @@
#else
448 EXCL ___ntp_gettime50
#endif
-449 STD { int|sys|50|wait4(int pid, int *status, \
+449 STD { int|sys|50|wait4(pid_t pid, int *status, \
int options, struct rusage *rusage); }
450 STD RUMP { int|sys|50|mknod(const char *path, mode_t mode, \
dev_t dev); }
CVS commit: src/sys
Module Name:src Committed By: christos Date: Mon Jan 31 00:06:57 UTC 2011 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.252 src/sys/kern/init_sysent.c cvs rdiff -u -r1.242 -r1.243 src/sys/kern/syscalls.c cvs rdiff -u -r1.238 -r1.239 src/sys/sys/syscall.h cvs rdiff -u -r1.221 -r1.222 src/sys/sys/syscallargs.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/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.251 src/sys/kern/init_sysent.c:1.252 --- src/sys/kern/init_sysent.c:1.251 Tue Jan 18 12:34:28 2011 +++ src/sys/kern/init_sysent.c Sun Jan 30 19:06:57 2011 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.251 2011/01/18 17:34:28 pooka Exp $ */ +/* $NetBSD: init_sysent.c,v 1.252 2011/01/31 00:06:57 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.242 2011/01/17 18:24:17 pooka Exp + * created from NetBSD: syscalls.master,v 1.243 2011/01/31 00:05:29 christos Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.251 2011/01/18 17:34:28 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.252 2011/01/31 00:06:57 christos Exp $); #include opt_modular.h #include opt_ntp.h Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.242 src/sys/kern/syscalls.c:1.243 --- src/sys/kern/syscalls.c:1.242 Tue Jan 18 12:34:28 2011 +++ src/sys/kern/syscalls.c Sun Jan 30 19:06:57 2011 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.242 2011/01/18 17:34:28 pooka Exp $ */ +/* $NetBSD: syscalls.c,v 1.243 2011/01/31 00:06:57 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.242 2011/01/17 18:24:17 pooka Exp + * created from NetBSD: syscalls.master,v 1.243 2011/01/31 00:05:29 christos Exp */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.242 2011/01/18 17:34:28 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.243 2011/01/31 00:06:57 christos Exp $); #if defined(_KERNEL_OPT) #include opt_modular.h Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.238 src/sys/sys/syscall.h:1.239 --- src/sys/sys/syscall.h:1.238 Tue Jan 18 12:34:28 2011 +++ src/sys/sys/syscall.h Sun Jan 30 19:06:57 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.238 2011/01/18 17:34:28 pooka Exp $ */ +/* $NetBSD: syscall.h,v 1.239 2011/01/31 00:06:57 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.242 2011/01/17 18:24:17 pooka Exp + * created from NetBSD: syscalls.master,v 1.243 2011/01/31 00:05:29 christos Exp */ #ifndef _SYS_SYSCALL_H_ @@ -33,7 +33,7 @@ /* syscall: close ret: int args: int */ #define SYS_close 6 -/* syscall: compat_50_wait4 ret: int args: int int * int struct rusage50 * */ +/* syscall: compat_50_wait4 ret: int args: pid_t int * int struct rusage50 * */ #define SYS_compat_50_wait4 7 /* syscall: compat_43_ocreat ret: int args: const char * mode_t */ @@ -121,7 +121,7 @@ /* syscall: sync ret: void args: */ #define SYS_sync 36 -/* syscall: kill ret: int args: int int */ +/* syscall: kill ret: int args: pid_t int */ #define SYS_kill 37 /* syscall: compat_43_stat43 ret: int args: const char * struct stat43 * */ @@ -145,7 +145,7 @@ /* syscall: profil ret: int args: char * size_t u_long u_int */ #define SYS_profil 44 -/* syscall: ktrace ret: int args: const char * int int int */ +/* syscall: ktrace ret: int args: const char * int int pid_t */ #define SYS_ktrace 45 /* syscall: compat_13_sigaction13 ret: int args: int const struct sigaction13 * struct sigaction13 * */ @@ -248,7 +248,7 @@ /* syscall: getpgrp ret: int args: */ #define SYS_getpgrp 81 -/* syscall: setpgid ret: int args: int int */ +/* syscall: setpgid ret: int args: pid_t pid_t */ #define SYS_setpgid 82 /* syscall: compat_50_setitimer ret: int args: int const struct itimerval50 * struct itimerval50 * */ @@ -802,7 +802,7 @@ /* syscall: __clone ret: pid_t args: int void * */ #define SYS___clone 287 -/* syscall: fktrace ret: int args: int int int int */ +/* syscall: fktrace ret: int args: int int int pid_t */ #define SYS_fktrace 288 /* syscall: preadv ret: ssize_t args: int const struct iovec * int int off_t */ @@ -1270,7 +1270,7 @@ #else /* 448 is excluded ___ntp_gettime50 */ #endif -/* syscall: __wait450 ret: int args: int int * int struct rusage * */ +/* syscall: __wait450 ret: int args: pid_t int * int struct rusage * */ #define SYS___wait450 449 /* syscall: __mknod50 ret: int args: const char * mode_t dev_t */ Index: src/sys/sys/syscallargs.h diff -u
CVS commit: src/sys/rump/dev/lib/libusb
Module Name:src
Committed By: christos
Date: Mon Jan 31 00:10:06 UTC 2011
Modified Files:
src/sys/rump/dev/lib/libusb: Makefile
Log Message:
enable this for amd64 too.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libusb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.5 src/sys/rump/dev/lib/libusb/Makefile:1.6
--- src/sys/rump/dev/lib/libusb/Makefile:1.5 Sun Dec 5 11:51:00 2010
+++ src/sys/rump/dev/lib/libusb/Makefile Sun Jan 30 19:10:06 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2010/12/05 16:51:00 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2011/01/31 00:10:06 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
LIB= rumpdev_usb
-.if ${MACHINE} == i386
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
IOCONF= USB.ioconf
SRCS= usb.c usbdi.c usbdi_util.c usb_mem.c usb_subr.c usb_quirks.c \
CVS commit: src
Module Name:src
Committed By: christos
Date: Mon Jan 31 00:19:34 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.sparc64
src/include: fenv.h
src/lib/libm: Makefile
src/sys/arch/sparc64/include: Makefile
Added Files:
src/lib/libm/arch/sparc64: fenv.c
src/sys/arch/sparc64/include: fenv.h
Log Message:
fenv support for sparc64 from Stathis Kamperis
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.2 -r1.3 src/include/fenv.h
cvs rdiff -u -r1.101 -r1.102 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/sparc64/fenv.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc64/include/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/include/fenv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.79 src/distrib/sets/lists/comp/md.sparc64:1.80
--- src/distrib/sets/lists/comp/md.sparc64:1.79 Tue Jan 18 16:07:51 2011
+++ src/distrib/sets/lists/comp/md.sparc64 Sun Jan 30 19:19:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.79 2011/01/18 21:07:51 pooka Exp $
+# $NetBSD: md.sparc64,v 1.80 2011/01/31 00:19:33 christos Exp $
./usr/include/ieeefp.hcomp-c-include
./usr/include/sparccomp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -85,6 +85,7 @@
./usr/include/sparc64/endian_machdep.h comp-c-include
./usr/include/sparc64/fbio.h comp-obsolete obsolete
./usr/include/sparc64/fbvar.h comp-obsolete obsolete
+./usr/include/sparc64/fenv.h comp-c-include
./usr/include/sparc64/float.h comp-c-include
./usr/include/sparc64/frame.h comp-c-include
./usr/include/sparc64/fsr.h comp-c-include
Index: src/include/fenv.h
diff -u src/include/fenv.h:1.2 src/include/fenv.h:1.3
--- src/include/fenv.h:1.2 Mon Aug 2 13:49:04 2010
+++ src/include/fenv.h Sun Jan 30 19:19:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.h,v 1.2 2010/08/02 17:49:04 joerg Exp $ */
+/* $NetBSD: fenv.h,v 1.3 2011/01/31 00:19:33 christos Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if !defined(__i386__) !defined(__amd64__)
+#if !defined(__i386__) !defined(__amd64__) !defined(__sparc__)
#error fenv.h is currently not supported for this architecture
#endif
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.101 src/lib/libm/Makefile:1.102
--- src/lib/libm/Makefile:1.101 Wed Jan 12 18:03:56 2011
+++ src/lib/libm/Makefile Sun Jan 30 19:19:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2011/01/12 23:03:56 joerg Exp $
+# $NetBSD: Makefile,v 1.102 2011/01/31 00:19:33 christos Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -50,6 +50,8 @@
.if (${MACHINE_ARCH} == alpha)
.PATH: ${.CURDIR}/arch/alpha
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
+.elif (${MACHINE_ARCH} == sparc64)
+.PATH: ${.CURDIR}/arch/sparc64
.elif ((${MACHINE_ARCH} == i386) || (${MACHINE_ARCH} == x86_64))
.if (${MACHINE_ARCH} == x86_64)
@@ -174,7 +176,7 @@
.if (${MACHINE_ARCH} == vax)
SRCS= ${NOIEEE_SRCS} ${NOIEEE_ARCH}
.else
-SRCS= ${COMMON_SRCS}
+SRCS= ${COMMON_SRCS} fenv.c
.endif
.ifdef ARCH_ADDS
Index: src/sys/arch/sparc64/include/Makefile
diff -u src/sys/arch/sparc64/include/Makefile:1.24 src/sys/arch/sparc64/include/Makefile:1.25
--- src/sys/arch/sparc64/include/Makefile:1.24 Fri Feb 9 16:55:12 2007
+++ src/sys/arch/sparc64/include/Makefile Sun Jan 30 19:19:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/02/09 21:55:12 ad Exp $
+# $NetBSD: Makefile,v 1.25 2011/01/31 00:19:34 christos Exp $
INCSDIR= /usr/include/sparc64
@@ -7,7 +7,7 @@
cdefs.h cgtworeg.h cpu.h ctlreg.h \
disklabel.h \
eeprom.h elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h fsr.h \
+ fenv.h float.h frame.h fsr.h \
idprom.h ieee.h ieeefp.h instr.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
joystick.h \
Added files:
Index: src/lib/libm/arch/sparc64/fenv.c
diff -u /dev/null src/lib/libm/arch/sparc64/fenv.c:1.1
--- /dev/null Sun Jan 30 19:19:34 2011
+++ src/lib/libm/arch/sparc64/fenv.c Sun Jan 30 19:19:33 2011
@@ -0,0 +1,329 @@
+/* $NetBSD: fenv.c,v 1.1 2011/01/31 00:19:33 christos Exp $ */
+
+/*-
+ * Copyright (c) 2004-2005 David Schultz d...@freebsd.org
+ * 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
CVS commit: src/usr.bin/mkubootimage
Module Name:src
Committed By: matt
Date: Mon Jan 31 03:37:29 UTC 2011
Modified Files:
src/usr.bin/mkubootimage: mkubootimage.c uboot.h
Log Message:
Add mips/mips64 support.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/mkubootimage/mkubootimage.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/mkubootimage/uboot.h
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/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.4 src/usr.bin/mkubootimage/mkubootimage.c:1.5
--- src/usr.bin/mkubootimage/mkubootimage.c:1.4 Sat Jul 10 07:48:25 2010
+++ src/usr.bin/mkubootimage/mkubootimage.c Mon Jan 31 03:37:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.4 2010/07/10 07:48:25 kiyohara Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.5 2011/01/31 03:37:28 matt Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkubootimage.c,v 1.4 2010/07/10 07:48:25 kiyohara Exp $);
+__RCSID($NetBSD: mkubootimage.c,v 1.5 2011/01/31 03:37:28 matt Exp $);
#include sys/mman.h
#include sys/stat.h
@@ -65,6 +65,8 @@
const char *name;
} uboot_arch[] = {
{ IH_ARCH_ARM, arm },
+ { IH_ARCH_MIPS, mips },
+ { IH_ARCH_MIPS64, mips64 },
{ IH_ARCH_PPC, powerpc },
};
@@ -128,7 +130,7 @@
static void
usage(void)
{
- fprintf(stderr, usage: mkubootimage -A arm|powerpc);
+ fprintf(stderr, usage: mkubootimage -A arm|mips|mips64|powerpc);
fprintf(stderr, -T kernel|ramdisk|fs);
fprintf(stderr, -C none|gz|bz2);
fprintf(stderr, -a addr [-e ep] -n name);
Index: src/usr.bin/mkubootimage/uboot.h
diff -u src/usr.bin/mkubootimage/uboot.h:1.1 src/usr.bin/mkubootimage/uboot.h:1.2
--- src/usr.bin/mkubootimage/uboot.h:1.1 Fri Jun 18 18:55:48 2010
+++ src/usr.bin/mkubootimage/uboot.h Mon Jan 31 03:37:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uboot.h,v 1.1 2010/06/18 18:55:48 jmcneill Exp $ */
+/* $NetBSD: uboot.h,v 1.2 2011/01/31 03:37:28 matt Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -33,6 +33,8 @@
enum uboot_image_arch {
IH_ARCH_UNKNOWN = 0,
IH_ARCH_ARM = 2,
+ IH_ARCH_MIPS = 5,
+ IH_ARCH_MIPS64 = 6,
IH_ARCH_PPC = 7
};
CVS commit: src/tools
Module Name:src
Committed By: matt
Date: Mon Jan 31 03:41:10 UTC 2011
Modified Files:
src/tools: Makefile
Log Message:
Make mkubootimage for evbmips and evbppc too.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.140 src/tools/Makefile:1.141
--- src/tools/Makefile:1.140 Sun Aug 15 07:27:33 2010
+++ src/tools/Makefile Mon Jan 31 03:41:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2010/08/15 07:27:33 mrg Exp $
+# $NetBSD: Makefile,v 1.141 2011/01/31 03:41:10 matt Exp $
.include bsd.own.mk
@@ -119,7 +119,7 @@
SUBDIR+= hp300-mkboot
.endif
-.if ${MACHINE} == evbarm
+.if ${MACHINE} == evbarm || ${MACHINE} == evbmips || ${MACHINE} == evbppc
SUBDIR+= mkubootimage
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Mon Jan 31 03:42:01 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add TOOL_MKUBOOTIMAGE
To generate a diff of this commit:
cvs rdiff -u -r1.649 -r1.650 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/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.649 src/share/mk/bsd.own.mk:1.650
--- src/share/mk/bsd.own.mk:1.649 Wed Jan 26 01:18:49 2011
+++ src/share/mk/bsd.own.mk Mon Jan 31 03:42:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.649 2011/01/26 01:18:49 pooka Exp $
+# $NetBSD: bsd.own.mk,v 1.650 2011/01/31 03:42:01 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -278,6 +278,7 @@
TOOL_MKLOCALE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
TOOL_MKMAGIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}file
TOOL_MKTEMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp
+TOOL_MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
TOOL_MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
TOOL_MTREE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}nbperf
@@ -355,6 +356,7 @@
TOOL_MKLOCALE= mklocale
TOOL_MKMAGIC= file
TOOL_MKTEMP= mktemp
+TOOL_MKUBOOTIMAGE= mkubootimage
TOOL_MSGC= msgc
TOOL_MTREE= mtree
TOOL_NBPERF= nbperf
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Mon Jan 31 04:20:50 UTC 2011
Modified Files:
src/lib/libc/gen: fnmatch.c
Log Message:
Limit recursions to avoid DoS attacks from Maksymilian Arciemowicz
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/fnmatch.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/gen/fnmatch.c
diff -u src/lib/libc/gen/fnmatch.c:1.21 src/lib/libc/gen/fnmatch.c:1.22
--- src/lib/libc/gen/fnmatch.c:1.21 Sat Dec 24 16:11:16 2005
+++ src/lib/libc/gen/fnmatch.c Sun Jan 30 23:20:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fnmatch.c,v 1.21 2005/12/24 21:11:16 perry Exp $ */
+/* $NetBSD: fnmatch.c,v 1.22 2011/01/31 04:20:50 christos Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)fnmatch.c 8.2 (Berkeley) 4/16/94;
#else
-__RCSID($NetBSD: fnmatch.c,v 1.21 2005/12/24 21:11:16 perry Exp $);
+__RCSID($NetBSD: fnmatch.c,v 1.22 2011/01/31 04:20:50 christos Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,23 +59,59 @@
#define EOS '\0'
-static const char *rangematch __P((const char *, int, int));
-
static inline int
foldcase(int ch, int flags)
{
if ((flags FNM_CASEFOLD) != 0 isupper(ch))
- return (tolower(ch));
- return (ch);
+ return tolower(ch);
+ return ch;
}
#define FOLDCASE(ch, flags) foldcase((unsigned char)(ch), (flags))
-int
-fnmatch(pattern, string, flags)
- const char *pattern, *string;
- int flags;
+static const char *
+rangematch(const char *pattern, int test, int flags)
+{
+ int negate, ok;
+ char c, c2;
+
+ _DIAGASSERT(pattern != NULL);
+
+ /*
+ * A bracket expression starting with an unquoted circumflex
+ * character produces unspecified results (IEEE 1003.2-1992,
+ * 3.13.2). This implementation treats it like '!', for
+ * consistency with the regular expression syntax.
+ * J.T. Conklin (conk...@ngai.kaleida.com)
+ */
+ if ((negate = (*pattern == '!' || *pattern == '^')) != 0)
+ ++pattern;
+
+ for (ok = 0; (c = FOLDCASE(*pattern++, flags)) != ']';) {
+ if (c == '\\' !(flags FNM_NOESCAPE))
+ c = FOLDCASE(*pattern++, flags);
+ if (c == EOS)
+ return NULL;
+ if (*pattern == '-'
+ (c2 = FOLDCASE(*(pattern + 1), flags)) != EOS
+ c2 != ']') {
+ pattern += 2;
+ if (c2 == '\\' !(flags FNM_NOESCAPE))
+c2 = FOLDCASE(*pattern++, flags);
+ if (c2 == EOS)
+return NULL;
+ if (c = test test = c2)
+ok = 1;
+ } else if (c == test)
+ ok = 1;
+ }
+ return ok == negate ? NULL : pattern;
+}
+
+
+static int
+fnmatchx(const char *pattern, const char *string, int flags, size_t recursion)
{
const char *stringstart;
char c, test;
@@ -83,21 +119,24 @@
_DIAGASSERT(pattern != NULL);
_DIAGASSERT(string != NULL);
+ if (recursion-- == 0)
+ return FNM_NORES;
+
for (stringstart = string;;)
switch (c = FOLDCASE(*pattern++, flags)) {
case EOS:
if ((flags FNM_LEADING_DIR) *string == '/')
-return (0);
- return (*string == EOS ? 0 : FNM_NOMATCH);
+return 0;
+ return *string == EOS ? 0 : FNM_NOMATCH;
case '?':
if (*string == EOS)
-return (FNM_NOMATCH);
+return FNM_NOMATCH;
if (*string == '/' (flags FNM_PATHNAME))
-return (FNM_NOMATCH);
+return FNM_NOMATCH;
if (*string == '.' (flags FNM_PERIOD)
(string == stringstart ||
((flags FNM_PATHNAME) *(string - 1) == '/')))
-return (FNM_NOMATCH);
+return FNM_NOMATCH;
++string;
break;
case '*':
@@ -109,41 +148,45 @@
if (*string == '.' (flags FNM_PERIOD)
(string == stringstart ||
((flags FNM_PATHNAME) *(string - 1) == '/')))
-return (FNM_NOMATCH);
+return FNM_NOMATCH;
/* Optimize for pattern with * at end or before /. */
if (c == EOS) {
if (flags FNM_PATHNAME)
- return ((flags FNM_LEADING_DIR) ||
+ return (flags FNM_LEADING_DIR) ||
strchr(string, '/') == NULL ?
- 0 : FNM_NOMATCH);
+ 0 : FNM_NOMATCH;
else
- return (0);
+ return 0;
} else if (c == '/' flags FNM_PATHNAME) {
if ((string = strchr(string, '/')) == NULL)
- return (FNM_NOMATCH);
+ return FNM_NOMATCH;
break;
}
/* General case, use recursion. */
while ((test = FOLDCASE(*string, flags)) != EOS) {
-if (!fnmatch(pattern, string,
- flags ~FNM_PERIOD))
- return (0);
+int e;
+switch ((e = fnmatchx(pattern, string,
+flags ~FNM_PERIOD, recursion))) {
+case FNM_NOMATCH:
+ break;
+default:
+ return e;
+}
if (test == '/' flags FNM_PATHNAME)
break;
++string;
}
- return (FNM_NOMATCH);
+ return FNM_NOMATCH;
case '[':
if (*string == EOS)
-return (FNM_NOMATCH);
+return FNM_NOMATCH;
if (*string == '/' flags FNM_PATHNAME)
-return (FNM_NOMATCH);
- if ((pattern =
- rangematch(pattern,
CVS commit: src/include
Module Name:src Committed By: christos Date: Mon Jan 31 04:49:46 UTC 2011 Modified Files: src/include: fnmatch.h Log Message: new error. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/include/fnmatch.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/fnmatch.h diff -u src/include/fnmatch.h:1.12 src/include/fnmatch.h:1.13 --- src/include/fnmatch.h:1.12 Wed Feb 2 23:39:32 2005 +++ src/include/fnmatch.h Sun Jan 30 23:49:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fnmatch.h,v 1.12 2005/02/03 04:39:32 perry Exp $ */ +/* $NetBSD: fnmatch.h,v 1.13 2011/01/31 04:49:46 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,6 +38,7 @@ #define FNM_NOMATCH 1 /* Match failed. */ #define FNM_NOSYS 2 /* Function not implemented. */ +#define FNM_NORES 3 /* Out of resources */ #define FNM_NOESCAPE 0x01 /* Disable backslash escaping. */ #define FNM_PATHNAME 0x02 /* Slash must be matched by slash. */
CVS commit: src/crypto/dist/heimdal/kuser
Module Name:src Committed By: dholland Date: Mon Jan 31 06:05:54 UTC 2011 Modified Files: src/crypto/dist/heimdal/kuser: kimpersonate.1 Log Message: typo fix, from Ryo HAYASAKA in PR 44495. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/dist/heimdal/kuser/kimpersonate.1 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/heimdal/kuser/kimpersonate.1 diff -u src/crypto/dist/heimdal/kuser/kimpersonate.1:1.3 src/crypto/dist/heimdal/kuser/kimpersonate.1:1.4 --- src/crypto/dist/heimdal/kuser/kimpersonate.1:1.3 Sat Oct 24 11:09:31 2009 +++ src/crypto/dist/heimdal/kuser/kimpersonate.1 Mon Jan 31 06:05:54 2011 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: kimpersonate.1 20259 2007-02-17 23:49:54Z lha $ -.\ $NetBSD: kimpersonate.1,v 1.3 2009/10/24 11:09:31 reed Exp $ +.\ $NetBSD: kimpersonate.1,v 1.4 2011/01/31 06:05:54 dholland Exp $ .\ .Dd September 18, 2006 .Dt KIMPERSONATE 1 @@ -88,7 +88,7 @@ .Pa /etc/srvtab and .Pa /usr/afs/etc/KeyFile -when avalible and the the +when available and the the .Fl k is used with appropriate prefix. .Sh EXAMPLES
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: matt
Date: Mon Jan 31 06:09:32 UTC 2011
Modified Files:
src/sys/arch/evbarm/conf: Makefile.evbarm.inc mk.beagle mk.gemini
mk.gumstix mk.marvell
Log Message:
Change to use TOOL_MKUBOOTIMAGE
Make sure we cleanup everything.
gemini now has its own genassym.cf
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.beagle
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.gemini \
src/sys/arch/evbarm/conf/mk.gumstix
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.marvell
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/evbarm/conf/Makefile.evbarm.inc
diff -u src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.19 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.20
--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.19 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Mon Jan 31 06:09:32 2011
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.19 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.20 2011/01/31 06:09:32 matt Exp $
.if defined(BOARDMKFRAG) # Must be a full pathname.
.include ${BOARDMKFRAG}
.endif
+EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map}
+
.if defined(KERNEL_BASE_PHYS)
LINKFLAGS= -T ldscript
netbsd: ldscript # XXX
-EXTRA_CLEAN+= ldscript tmp
# generate ldscript from common template
ldscript: ${THISARM}/conf/ldscript.evbarm ${THISARM}/conf/Makefile.evbarm.inc Makefile ${BOARDMKFRAG}
Index: src/sys/arch/evbarm/conf/mk.beagle
diff -u src/sys/arch/evbarm/conf/mk.beagle:1.3 src/sys/arch/evbarm/conf/mk.beagle:1.4
--- src/sys/arch/evbarm/conf/mk.beagle:1.3 Fri Jun 18 19:19:05 2010
+++ src/sys/arch/evbarm/conf/mk.beagle Mon Jan 31 06:09:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.beagle,v 1.3 2010/06/18 19:19:05 jmcneill Exp $
+# $NetBSD: mk.beagle,v 1.4 2011/01/31 06:09:32 matt Exp $
# gcc doesn't know about cortex-a8
CPPFLAGS+= -mcpu=arm1136jf-s
@@ -7,11 +7,6 @@
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
-.if ${USETOOLS} == yes
-MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
-.else
-MKUBOOTIMAGE= mkubootimage
-.endif
MKUBOOTIMAGEARGS= -A arm -T kernel -C none
MKUBOOTIMAGEARGS+= -a $(LOADADDRESS) -e $(LOADADDRESS)
MKUBOOTIMAGEARGS+= -n NetBSD/$(BOARDTYPE) ${_OSRELEASE}
@@ -22,8 +17,8 @@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
- echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
- ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
echo
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
Index: src/sys/arch/evbarm/conf/mk.gemini
diff -u src/sys/arch/evbarm/conf/mk.gemini:1.2 src/sys/arch/evbarm/conf/mk.gemini:1.3
--- src/sys/arch/evbarm/conf/mk.gemini:1.2 Tue Oct 28 17:12:05 2008
+++ src/sys/arch/evbarm/conf/mk.gemini Mon Jan 31 06:09:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.gemini,v 1.2 2008/10/28 17:12:05 matt Exp $
+# $NetBSD: mk.gemini,v 1.3 2011/01/31 06:09:32 matt Exp $
CPUFLAGS+=-march=armv4
@@ -7,6 +7,8 @@
SYSTEM_FIRST_OBJ= gemini_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/gemini/gemini_start.S
+GENASSYM_EXTRAS+= ${THISARM}/gemini/genassym.cf
+
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
${OBJCOPY} -S -O binary $@ $@.bin; \
Index: src/sys/arch/evbarm/conf/mk.gumstix
diff -u src/sys/arch/evbarm/conf/mk.gumstix:1.2 src/sys/arch/evbarm/conf/mk.gumstix:1.3
--- src/sys/arch/evbarm/conf/mk.gumstix:1.2 Sat Jul 10 08:17:48 2010
+++ src/sys/arch/evbarm/conf/mk.gumstix Mon Jan 31 06:09:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mk.gumstix,v 1.2 2010/07/10 08:17:48 kiyohara Exp $
+# $NetBSD: mk.gumstix,v 1.3 2011/01/31 06:09:32 matt Exp $
SYSTEM_FIRST_OBJ= gumstix_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/gumstix/gumstix_start.S
@@ -12,11 +12,6 @@
.endif
KERNEL_BASE_VIRT=$(LOADADDRESS)
-.if ${USETOOLS} == yes
-MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
-.else
-MKUBOOTIMAGE= mkubootimage
-.endif
MKUBOOTIMAGEARGS= -A arm -T kernel
MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS)
MKUBOOTIMAGEARGS+= -n NetBSD/$(BOARDTYPE) ${_OSRELEASE}
@@ -31,20 +26,25 @@
${OBJCOPY} -S -O binary $@ $@.bin; \
echo gzip -c $@.bin $@.bin.gz; \
gzip -c $@.bin $@.bin.gz; \
- echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
- ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+
.if ${BOARDTYPE} == gumstix
#
# These not have expanding buffer over 4Mbyte. (before version 1.1.5)
# And these cannot handle the endian of entry point. (1.1.4 and older)
CVS commit: src/sys/arch/evbarm/gemini
Module Name:src Committed By: matt Date: Mon Jan 31 06:10:25 UTC 2011 Added Files: src/sys/arch/evbarm/gemini: genassym.cf Log Message: Generate addresses from this instead of including gemini.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/gemini/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/gemini/genassym.cf diff -u /dev/null src/sys/arch/evbarm/gemini/genassym.cf:1.1 --- /dev/null Mon Jan 31 06:10:25 2011 +++ src/sys/arch/evbarm/gemini/genassym.cf Mon Jan 31 06:10:25 2011 @@ -0,0 +1,45 @@ +# $NetBSD: genassym.cf,v 1.1 2011/01/31 06:10:25 matt Exp $ + +#- +# Copyright (c) 2011 The NetBSD Foundation, Inc. +# All rights reserved. +# +# This code is derived from software contributed to The NetBSD Foundation +# by Matt Thomas m...@3am-software.com +# +# 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 evbarm/gemini/gemini.h + +#define KERNEL_BASE_phys KERNEL_BASE_phys +#define KERNEL_BASE_virt KERNEL_BASE_virt +define GEMINI_GLOBAL_VBASE GEMINI_GLOBAL_VBASE +define GEMINI_GLOBAL_BASE GEMINI_GLOBAL_BASE +define GEMINI_UART_VBASE GEMINI_UART_VBASE +define GEMINI_UART_BASE GEMINI_UART_BASE +define GEMINI_LPCHC_VBASE GEMINI_LPCHC_VBASE +define GEMINI_LPCHC_BASE GEMINI_LPCHC_BASE +define GEMINI_LPCIO_VBASE GEMINI_LPCIO_VBASE +define GEMINI_LPCIO_BASE GEMINI_LPCIO_BASE +define GEMINI_DRAMC_VBASE GEMINI_DRAMC_VBASE +define GEMINI_DRAMC_BASE GEMINI_DRAMC_BASE
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Mon Jan 31 06:26:55 UTC 2011 Modified Files: src/sys/arch/arm/arm32: genassym.cf Log Message: Define the L1* pte values. Now pmap.h and pte.h no longer needed in .S files. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/arm32/genassym.cf 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/arm/arm32/genassym.cf diff -u src/sys/arch/arm/arm32/genassym.cf:1.44 src/sys/arch/arm/arm32/genassym.cf:1.45 --- src/sys/arch/arm/arm32/genassym.cf:1.44 Fri Jan 14 02:06:23 2011 +++ src/sys/arch/arm/arm32/genassym.cf Mon Jan 31 06:26:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.44 2011/01/14 02:06:23 rmind Exp $ +# $NetBSD: genassym.cf,v 1.45 2011/01/31 06:26:54 matt Exp $ # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -47,6 +47,7 @@ include arm/fiq.h +include arm/arm32/pte.h include machine/pmap.h include machine/frame.h include machine/vmparam.h @@ -73,6 +74,23 @@ define VM_MAXUSER_ADDRESS VM_MAXUSER_ADDRESS define PMAP_DOMAIN_KERNEL PMAP_DOMAIN_KERNEL +define DOMAIN_CLIENT DOMAIN_CLIENT +define L1_S_PROTO_generic L1_S_PROTO_generic +define L1_S_PROTO_armv7 L1_S_PROTO_armv7 +define L1_S_PROTO_xscale L1_S_PROTO_xscale +if ARM_NMMUS == 1 +define L1_S_PROTO L1_S_PROTO +endif +define L1_S_FRAME L1_S_FRAME +define L1_S_SHIFT L1_S_SHIFT +define L1_S_SIZE L1_S_SIZE +define L1_S_B L1_S_B +define L1_S_C L1_S_C +define L1_S_AP_KRW L1_S_AP(AP_KRW) +define L1_S_APv7_KRW L1_S_AP(AP7_KRW) +define L1_TABLE_SIZE L1_TABLE_SIZE +define L1_TYPE_S L1_TYPE_S +define L1_S_DOM_KERNEL L1_S_DOM(PMAP_DOMAIN_KERNEL) ifdef PMAP_INCLUDE_PTE_SYNC define PMAP_INCLUDE_PTE_SYNC 1
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: matt Date: Mon Jan 31 06:28:06 UTC 2011 Modified Files: src/sys/arch/evbarm/adi_brh: brh_start.S src/sys/arch/evbarm/armadillo: armadillo9_start.S src/sys/arch/evbarm/beagle: beagle_start.S src/sys/arch/evbarm/g42xxeb: g42xxeb_start.S src/sys/arch/evbarm/gemini: gemini_start.S src/sys/arch/evbarm/gumstix: gumstix_start.S src/sys/arch/evbarm/hdl_g: hdlg_start.S src/sys/arch/evbarm/imx31: imx31lk_start.S src/sys/arch/evbarm/integrator: intmmu.S src/sys/arch/evbarm/iq80310: iq80310_start.S src/sys/arch/evbarm/iq80321: iq80321_start.S src/sys/arch/evbarm/ixdp425: ixdp425_start.S src/sys/arch/evbarm/ixm1200: ixm1200_start.S src/sys/arch/evbarm/lubbock: lubbock_start.S src/sys/arch/evbarm/marvell: marvell_start.S src/sys/arch/evbarm/mpcsa: mpcsa_start.S src/sys/arch/evbarm/netwalker: netwalker_start.S src/sys/arch/evbarm/nslu2: nslu2_start.S src/sys/arch/evbarm/smdk2xx0: smdk2410_start.S smdk2800_start.S src/sys/arch/evbarm/tisdp24xx: sdp24xx_start.S src/sys/arch/evbarm/tsarm: tsarm_start.S src/sys/arch/evbarm/viper: viper_start.S Log Message: Add RCSID when needed. Don't include pmap.h or pte.h, include assym.h instead. Use assym.h provided values. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/adi_brh/brh_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/armadillo/armadillo9_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/beagle/beagle_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/gemini/gemini_start.S cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/gumstix/gumstix_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/hdl_g/hdlg_start.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/imx31/imx31lk_start.S cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/integrator/intmmu.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq80310/iq80310_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq80321/iq80321_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/ixdp425/ixdp425_start.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/ixm1200/ixm1200_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/lubbock/lubbock_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/marvell/marvell_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/mpcsa/mpcsa_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/netwalker/netwalker_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/nslu2/nslu2_start.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/tsarm/tsarm_start.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/viper/viper_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/adi_brh/brh_start.S diff -u src/sys/arch/evbarm/adi_brh/brh_start.S:1.1 src/sys/arch/evbarm/adi_brh/brh_start.S:1.2 --- src/sys/arch/evbarm/adi_brh/brh_start.S:1.1 Sat Jan 25 02:00:17 2003 +++ src/sys/arch/evbarm/adi_brh/brh_start.S Mon Jan 31 06:28:02 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: brh_start.S,v 1.1 2003/01/25 02:00:17 thorpej Exp $ */ +/* $NetBSD: brh_start.S,v 1.2 2011/01/31 06:28:02 matt Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -35,14 +35,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ + #include machine/asm.h #include arm/armreg.h -#include arm/arm32/pte.h +#include assym.h #include arm/xscale/beccreg.h #include evbarm/adi_brh/brhreg.h +RCSID($NetBSD: brh_start.S,v 1.2 2011/01/31 06:28:02 matt Exp $) + .section .start,ax,%progbits .global _C_LABEL(brh_start) @@ -96,7 +99,7 @@ add r0, pc, #(.Ltable - . - 8) ldr r0, [r0] /* r0 = l1table */ - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) mov r2, #0x10 /* advance by 1MB */ mov r1, #0x1000 /* 4096MB */ @@ -114,7 +117,7 @@ add r0, pc, #(.Ltable - . - 8) /* r0 = l1table */ ldr r0, [r0] - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) orr r3, r3, #(BECC_PCI_CONF_BASE) add r0, r0, #((BRH_PCI_CONF_VBASE L1_S_SHIFT) * 4) @@ -132,7 +135,7 @@ add r0, pc, #(.Ltable - . - 8) /* r0 = l1table */ ldr r0, [r0] - mov r3, #(L1_S_AP(AP_KRW)) + mov r3, #(L1_S_AP_KRW) orr r3, r3, #(L1_TYPE_S) orr r3, r3, #(BECC_REG_BASE) Index: src/sys/arch/evbarm/armadillo/armadillo9_start.S diff -u src/sys/arch/evbarm/armadillo/armadillo9_start.S:1.4 src/sys/arch/evbarm/armadillo/armadillo9_start.S:1.5 --- src/sys/arch/evbarm/armadillo/armadillo9_start.S:1.4 Wed Oct 21 14:15:51 2009 +++ src/sys/arch/evbarm/armadillo/armadillo9_start.S Mon Jan 31 06:28:02
CVS commit: src/sys/arch/mvmeppc/conf
Module Name:src Committed By: matt Date: Mon Jan 31 06:33:05 UTC 2011 Modified Files: src/sys/arch/mvmeppc/conf: GENERIC Log Message: Fix ident. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/conf/GENERIC 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/mvmeppc/conf/GENERIC diff -u src/sys/arch/mvmeppc/conf/GENERIC:1.10 src/sys/arch/mvmeppc/conf/GENERIC:1.11 --- src/sys/arch/mvmeppc/conf/GENERIC:1.10 Tue Nov 23 11:14:02 2010 +++ src/sys/arch/mvmeppc/conf/GENERIC Mon Jan 31 06:33:05 2011 @@ -1,11 +1,11 @@ -# $NetBSD: GENERIC,v 1.10 2010/11/23 11:14:02 hannken Exp $ +# $NetBSD: GENERIC,v 1.11 2011/01/31 06:33:05 matt Exp $ # include arch/mvmeppc/conf/std.mvmeppc #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MVME1600-$Revision: 1.10 $ +ident GENERIC-$Revision: 1.11 $ maxusers 8
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sun Jan 30 08:55:52 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_cpu_cstate.c acpi_cpu_pstate.c acpi_cpu_tstate.c Log Message: Improve error reporting. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/acpi_cpu_cstate.c \ src/sys/dev/acpi/acpi_cpu_pstate.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/acpi_cpu_tstate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 09:58:03 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 10:09:23 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Don't use magic constant. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 11:33:33 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: t_getquota.sh Log Message: Remove unused function To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/t_getquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: rumko Date: Sun Jan 30 11:50:44 UTC 2011 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.471 -r1.472 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 12:37:34 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: Makefile quotas_common.sh Added Files: src/tests/fs/ffs [bouyer-quota2]: t_setquota.sh Log Message: Add tests cases for quotactl(set) To generate a diff of this commit: cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/tests/fs/ffs/Makefile cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/quotas_common.sh cvs rdiff -u -r0 -r1.1.2.1 src/tests/fs/ffs/t_setquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/usr.sbin/edquota
Module Name:src Committed By: bouyer Date: Sun Jan 30 12:38:32 UTC 2011 Modified Files: src/usr.sbin/edquota [bouyer-quota2]: edquota.c Log Message: Handle humanized numbers for -h/-s To generate a diff of this commit: cvs rdiff -u -r1.29.16.1 -r1.29.16.2 src/usr.sbin/edquota/edquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 13:15:14 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: h_quota2_server.c Log Message: Add a command-line flag to toggle foreground/background To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/h_quota2_server.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 13:23:27 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: quotas_common.sh t_getquota.sh t_setquota.sh Log Message: Ask the rump server to background itself, to avoid a race at startup where a rump command could be run before the server is available. Add a sleep after shutdown to workaround a race where the fsck would run before the server is fully showdown (testing for the existence of the socket seems to not be enough). To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/tests/fs/ffs/quotas_common.sh \ src/tests/fs/ffs/t_getquota.sh cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/ffs/t_setquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/sbin/fsck_ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 14:26:31 UTC 2011 Modified Files: src/sbin/fsck_ffs [bouyer-quota2]: utilities.c Log Message: Fix cut-n-paste: compare gid against gid, not uid. To generate a diff of this commit: cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sbin/fsck_ffs/utilities.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: bouyer Date: Sun Jan 30 16:31:42 UTC 2011 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: Move rumpuser_sp_fini() after the kernel has completed shuwdown (and especially, after filesystems have been unmounted). This way, rump.halt returns once the rump kernel is really out of the game, which avoids races issues in test scripts using a rump kernel. OK pooka@ To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 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.
CVS commit: src/sys/netbt
Module Name:src Committed By: plunky Date: Sun Jan 30 17:23:23 UTC 2011 Modified Files: src/sys/netbt: hci_socket.c Log Message: add (SOL_SOCKET, SO_TIMESTAMP) messages if requested To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/netbt/hci_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sun Jan 30 17:48:04 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: xz-5.0.1 out. To generate a diff of this commit: cvs rdiff -u -r1.808 -r1.809 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src Committed By: phx Date: Sun Jan 30 18:04:41 UTC 2011 Modified Files: src/distrib/notes/common: contents src/distrib/notes/sandpoint: hardware install prep Log Message: Sandpoint bootloader was renamed from netboot to altboot. To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/distrib/notes/common/contents cvs rdiff -u -r1.7 -r1.8 src/distrib/notes/sandpoint/hardware cvs rdiff -u -r1.6 -r1.7 src/distrib/notes/sandpoint/install cvs rdiff -u -r1.5 -r1.6 src/distrib/notes/sandpoint/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/sandpoint
Module Name:src Committed By: phx Date: Sun Jan 30 18:13:31 UTC 2011 Modified Files: src/distrib/notes/sandpoint: hardware Log Message: As discussed with nisimura@ we remove the original Sandpoint evalulation platform from the installation instructions. Although it may still build the primary target are NAS boxes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/notes/sandpoint/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src
Module Name:src Committed By: bouyer Date: Sun Jan 30 19:38:46 UTC 2011 Modified Files: src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c src/usr.bin/quota [bouyer-quota2]: getvfsquota.c getvfsquota.h printquota.c printquota.h quota.c src/usr.sbin/edquota [bouyer-quota2]: edquota.c src/usr.sbin/repquota [bouyer-quota2]: repquota.c Log Message: Implement get version quotactl command, which return the filesystem's enabled quota versiob (1 for legacy, 2 for new). For quota2, make quota and repquota print the user's allowed grace period if -v is given and not overquota (if overquota, the remaining time is printed instead, as usual). To generate a diff of this commit: cvs rdiff -u -r1.68.4.4 -r1.68.4.5 src/sys/ufs/ufs/ufs_quota.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/usr.bin/quota/getvfsquota.c \ src/usr.bin/quota/getvfsquota.h cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/usr.bin/quota/printquota.c \ src/usr.bin/quota/printquota.h cvs rdiff -u -r1.33.2.3 -r1.33.2.4 src/usr.bin/quota/quota.c cvs rdiff -u -r1.29.16.2 -r1.29.16.3 src/usr.sbin/edquota/edquota.c cvs rdiff -u -r1.25.2.2 -r1.25.2.3 src/usr.sbin/repquota/repquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 19:49:48 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: t_getquota.sh t_setquota.sh Log Message: Remove rump.halt race workaround now that it's fixed in rump Ajust for new quota tools output To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/t_getquota.sh cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/tests/fs/ffs/t_setquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src
Module Name:src Committed By: bouyer Date: Sun Jan 30 20:54:23 UTC 2011 Modified Files: src/usr.bin/quota [bouyer-quota2]: printquota.c printquota.h quota.c src/usr.sbin/edquota [bouyer-quota2]: edquota.c src/usr.sbin/repquota [bouyer-quota2]: repquota.c Log Message: Change timeprt to print in weeks, days, hours, minutes, seconds Change timeprt and intprt to take the number of acceptable char as argument Drop HN_PRIV_UNLIMITED, the printable space will decide how to print unlimited To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/usr.bin/quota/printquota.c \ src/usr.bin/quota/printquota.h cvs rdiff -u -r1.33.2.4 -r1.33.2.5 src/usr.bin/quota/quota.c cvs rdiff -u -r1.29.16.3 -r1.29.16.4 src/usr.sbin/edquota/edquota.c cvs rdiff -u -r1.25.2.3 -r1.25.2.4 src/usr.sbin/repquota/repquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/usr.bin/quota
Module Name:src Committed By: bouyer Date: Sun Jan 30 21:37:39 UTC 2011 Modified Files: src/usr.bin/quota [bouyer-quota2]: printquota.c printquota.h Log Message: Revert to previous format for timeprt, which is less precise but more user-friendly. Introduce timepprt for cases where we want human-readable but precise time display. To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/usr.bin/quota/printquota.c \ src/usr.bin/quota/printquota.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: njoly Date: Sun Jan 30 21:48:48 UTC 2011 Modified Files: src/share/man/man3: tgmath.3 Log Message: Add missing Ta macro. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man3/tgmath.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 22:36:12 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Tweak a comment. Suggestion from rmind@. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sun Jan 30 22:36:38 UTC 2011 Modified Files: src/sys/arch/hppa/hppa: lock_stubs.S Log Message: Grammar. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/hppa/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src
Module Name:src Committed By: bouyer Date: Sun Jan 30 22:49:32 UTC 2011 Modified Files: src/usr.bin/quota [bouyer-quota2]: printquota.c printquota.h src/usr.sbin/edquota [bouyer-quota2]: edquota.c Log Message: Allow edquota to edit per-user grace times on quota2 (or the default, global grace times on quota1). Use re-use -t to specify the grace time on command line; editing the grace time on quota1 is done with -d now. To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/usr.bin/quota/printquota.c \ src/usr.bin/quota/printquota.h cvs rdiff -u -r1.29.16.4 -r1.29.16.5 src/usr.sbin/edquota/edquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Sun Jan 30 23:04:52 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: t_setquota.sh Log Message: Also set and check the grace time in edquota tests. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/t_setquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: njoly Date: Sun Jan 30 23:29:25 UTC 2011 Modified Files: src/share/man/man4: bwi.4 Log Message: Move -offset option before column width arguments. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/bwi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: gsutre Date: Sun Jan 30 23:43:09 UTC 2011 Modified Files: src/sys/dev/pci: agp_i810.c Log Message: Enable 36-bit addressing for chipsets that support it. While there, factorize offset computation. Inspired from OpenBSD and Intel docs. Note: agp_i810_bind/unbind_page will now fail with EINVAL if the physical address is too large for the chipset (instead of silently truncating it). ok jmcneill@ To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/agp_i810.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: christos Date: Mon Jan 31 00:01:07 UTC 2011 Modified Files: src/sys/dev/pci: if_iwi.c Log Message: clear register 0x41 as FreeBSD and OpenBSD do. Update copyright to the latest. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pci/if_iwi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Mon Jan 31 00:05:29 UTC 2011 Modified Files: src/sys/kern: syscalls.master Log Message: make syscalls match documentation as far as pid_t goes. To generate a diff of this commit: cvs rdiff -u -r1.242 -r1.243 src/sys/kern/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Mon Jan 31 00:06:57 UTC 2011 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.252 src/sys/kern/init_sysent.c cvs rdiff -u -r1.242 -r1.243 src/sys/kern/syscalls.c cvs rdiff -u -r1.238 -r1.239 src/sys/sys/syscall.h cvs rdiff -u -r1.221 -r1.222 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/lib/libusb
Module Name:src Committed By: christos Date: Mon Jan 31 00:10:06 UTC 2011 Modified Files: src/sys/rump/dev/lib/libusb: Makefile Log Message: enable this for amd64 too. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libusb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Mon Jan 31 00:19:34 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.sparc64 src/include: fenv.h src/lib/libm: Makefile src/sys/arch/sparc64/include: Makefile Added Files: src/lib/libm/arch/sparc64: fenv.c src/sys/arch/sparc64/include: fenv.h Log Message: fenv support for sparc64 from Stathis Kamperis To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.2 -r1.3 src/include/fenv.h cvs rdiff -u -r1.101 -r1.102 src/lib/libm/Makefile cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/sparc64/fenv.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc64/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/include/fenv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/mkubootimage
Module Name:src Committed By: matt Date: Mon Jan 31 03:37:29 UTC 2011 Modified Files: src/usr.bin/mkubootimage: mkubootimage.c uboot.h Log Message: Add mips/mips64 support. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/mkubootimage/mkubootimage.c cvs rdiff -u -r1.1 -r1.2 src/usr.bin/mkubootimage/uboot.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src Committed By: matt Date: Mon Jan 31 03:41:10 UTC 2011 Modified Files: src/tools: Makefile Log Message: Make mkubootimage for evbmips and evbppc too. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/tools/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: matt Date: Mon Jan 31 03:42:01 UTC 2011 Modified Files: src/share/mk: bsd.own.mk Log Message: Add TOOL_MKUBOOTIMAGE To generate a diff of this commit: cvs rdiff -u -r1.649 -r1.650 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.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Mon Jan 31 04:20:50 UTC 2011 Modified Files: src/lib/libc/gen: fnmatch.c Log Message: Limit recursions to avoid DoS attacks from Maksymilian Arciemowicz To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/fnmatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: christos Date: Mon Jan 31 04:49:46 UTC 2011 Modified Files: src/include: fnmatch.h Log Message: new error. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/include/fnmatch.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Mon Jan 31 06:09:32 UTC 2011 Modified Files: src/sys/arch/evbarm/conf: Makefile.evbarm.inc mk.beagle mk.gemini mk.gumstix mk.marvell Log Message: Change to use TOOL_MKUBOOTIMAGE Make sure we cleanup everything. gemini now has its own genassym.cf To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/Makefile.evbarm.inc cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.beagle cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.gemini \ src/sys/arch/evbarm/conf/mk.gumstix cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.marvell Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Mon Jan 31 06:26:55 UTC 2011 Modified Files: src/sys/arch/arm/arm32: genassym.cf Log Message: Define the L1* pte values. Now pmap.h and pte.h no longer needed in .S files. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/arm32/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: matt Date: Mon Jan 31 06:28:06 UTC 2011 Modified Files: src/sys/arch/evbarm/adi_brh: brh_start.S src/sys/arch/evbarm/armadillo: armadillo9_start.S src/sys/arch/evbarm/beagle: beagle_start.S src/sys/arch/evbarm/g42xxeb: g42xxeb_start.S src/sys/arch/evbarm/gemini: gemini_start.S src/sys/arch/evbarm/gumstix: gumstix_start.S src/sys/arch/evbarm/hdl_g: hdlg_start.S src/sys/arch/evbarm/imx31: imx31lk_start.S src/sys/arch/evbarm/integrator: intmmu.S src/sys/arch/evbarm/iq80310: iq80310_start.S src/sys/arch/evbarm/iq80321: iq80321_start.S src/sys/arch/evbarm/ixdp425: ixdp425_start.S src/sys/arch/evbarm/ixm1200: ixm1200_start.S src/sys/arch/evbarm/lubbock: lubbock_start.S src/sys/arch/evbarm/marvell: marvell_start.S src/sys/arch/evbarm/mpcsa: mpcsa_start.S src/sys/arch/evbarm/netwalker: netwalker_start.S src/sys/arch/evbarm/nslu2: nslu2_start.S src/sys/arch/evbarm/smdk2xx0: smdk2410_start.S smdk2800_start.S src/sys/arch/evbarm/tisdp24xx: sdp24xx_start.S src/sys/arch/evbarm/tsarm: tsarm_start.S src/sys/arch/evbarm/viper: viper_start.S Log Message: Add RCSID when needed. Don't include pmap.h or pte.h, include assym.h instead. Use assym.h provided values. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/adi_brh/brh_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/armadillo/armadillo9_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/beagle/beagle_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/g42xxeb/g42xxeb_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/gemini/gemini_start.S cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/gumstix/gumstix_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/hdl_g/hdlg_start.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/imx31/imx31lk_start.S cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/integrator/intmmu.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq80310/iq80310_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/iq80321/iq80321_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/ixdp425/ixdp425_start.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/ixm1200/ixm1200_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/lubbock/lubbock_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/marvell/marvell_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/mpcsa/mpcsa_start.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/netwalker/netwalker_start.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/nslu2/nslu2_start.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/smdk2xx0/smdk2410_start.S cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/smdk2xx0/smdk2800_start.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/tsarm/tsarm_start.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/viper/viper_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mvmeppc/conf
Module Name:src Committed By: matt Date: Mon Jan 31 06:33:05 UTC 2011 Modified Files: src/sys/arch/mvmeppc/conf: GENERIC Log Message: Fix ident. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
