Re: svn commit: r201289 - in head/usr.bin: lex yacc
On Wed, Dec 30, 2009 at 10:46:09PM +, Ed Schouten wrote: Author: ed Date: Wed Dec 30 22:46:08 2009 New Revision: 201289 URL: http://svn.freebsd.org/changeset/base/201289 Log: Let both yacc and lex generate code that passes -Wold-style-definition. Both these tools emit code where several functions have no `void' keyword placed in the arugment list when the function has no arguments. Modified: head/usr.bin/lex/flex.skl head/usr.bin/lex/initscan.c head/usr.bin/yacc/skeleton.c yacc update is in progress. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201333 - in head/tools/regression/usr.bin/make: archives/fmt_44bsd archives/fmt_44bsd_mod archives/fmt_oldbsd basic/t0 basic/t1 basic/t2 basic/t3 shell/builtin shell/path shell/path_se...
Author: obrien Date: Thu Dec 31 09:33:18 2009 New Revision: 201333 URL: http://svn.freebsd.org/changeset/base/201333 Log: Delete the svn:mime-type property from these text files. Modified: Directory Properties: head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 (props changed) head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 (props changed) head/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 (props changed)
svn commit: r201334 - head
Author: obrien Date: Thu Dec 31 10:00:37 2009 New Revision: 201334 URL: http://svn.freebsd.org/changeset/base/201334 Log: Happy New Year 2010! :-) Modified: head/COPYRIGHT Modified: head/COPYRIGHT == --- head/COPYRIGHT Thu Dec 31 09:33:18 2009(r201333) +++ head/COPYRIGHT Thu Dec 31 10:00:37 2009(r201334) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201336 - stable/7
Author: obrien Date: Thu Dec 31 10:00:55 2009 New Revision: 201336 URL: http://svn.freebsd.org/changeset/base/201336 Log: Happy New Year 2010! :-) Modified: stable/7/COPYRIGHT Modified: stable/7/COPYRIGHT == --- stable/7/COPYRIGHT Thu Dec 31 10:00:49 2009(r201335) +++ stable/7/COPYRIGHT Thu Dec 31 10:00:55 2009(r201336) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201337 - stable/8/sys/kern
Author: ed
Date: Thu Dec 31 10:53:04 2009
New Revision: 201337
URL: http://svn.freebsd.org/changeset/base/201337
Log:
MFC r198185:
Print backspaces after echoing an EOF.
Applications like shells expect EOF to give no graphical output, while
our implementation prints ^D by default (tunable with stty echoctl).
Make the new implementation behave like the old TTY code. Print two
backspaces afterwards.
I totally forgot to MFC this, because the 8.0 freeze took a little
longer than I expected.
Reminded by: koitsu
Modified:
stable/8/sys/kern/tty_ttydisc.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/kern/tty_ttydisc.c
==
--- stable/8/sys/kern/tty_ttydisc.c Thu Dec 31 10:00:55 2009
(r201336)
+++ stable/8/sys/kern/tty_ttydisc.c Thu Dec 31 10:53:04 2009
(r201337)
@@ -624,15 +624,21 @@ ttydisc_echo_force(struct tty *tp, char
/*
* Only use ^X notation when ECHOCTL is turned on and
* we've got an quoted control character.
+*
+* Print backspaces when echoing an end-of-file.
*/
- char ob[2] = { '^', '?' };
+ char ob[4] = ^?\b\b;
/* Print ^X notation. */
if (c != 0x7f)
ob[1] = c + 'A' - 1;
- tp-t_column += 2;
- return ttyoutq_write_nofrag(tp-t_outq, ob, 2);
+ if (!quote CMP_CC(VEOF, c)) {
+ return ttyoutq_write_nofrag(tp-t_outq, ob, 4);
+ } else {
+ tp-t_column += 2;
+ return ttyoutq_write_nofrag(tp-t_outq, ob, 2);
+ }
} else {
/* Can just be printed. */
tp-t_column++;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201338 - stable/8/sys/kern
Author: kib
Date: Thu Dec 31 11:49:13 2009
New Revision: 201338
URL: http://svn.freebsd.org/changeset/base/201338
Log:
MFC r201134:
Add a knob to allow reclaim of the directory vnodes that are source of
the namecache records.
Modified:
stable/8/sys/kern/vfs_subr.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/kern/vfs_subr.c
==
--- stable/8/sys/kern/vfs_subr.cThu Dec 31 10:53:04 2009
(r201337)
+++ stable/8/sys/kern/vfs_subr.cThu Dec 31 11:49:13 2009
(r201338)
@@ -152,6 +152,10 @@ SYSCTL_LONG(_vfs, OID_AUTO, wantfreevnod
static u_long freevnodes;
SYSCTL_LONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, freevnodes, 0, );
+static int vlru_allow_cache_src;
+SYSCTL_INT(_vfs, OID_AUTO, vlru_allow_cache_src, CTLFLAG_RW,
+vlru_allow_cache_src, 0, Allow vlru to reclaim source vnode);
+
/*
* Various variables used for debugging the new implementation of
* reassignbuf().
@@ -643,7 +647,9 @@ vlrureclaim(struct mount *mp)
* If it's been deconstructed already, it's still
* referenced, or it exceeds the trigger, skip it.
*/
- if (vp-v_usecount || !LIST_EMPTY((vp)-v_cache_src) ||
+ if (vp-v_usecount ||
+ (!vlru_allow_cache_src
+ !LIST_EMPTY((vp)-v_cache_src)) ||
(vp-v_iflag VI_DOOMED) != 0 || (vp-v_object != NULL
vp-v_object-resident_page_count trigger)) {
VI_UNLOCK(vp);
@@ -668,7 +674,9 @@ vlrureclaim(struct mount *mp)
* interlock, the other thread will be unable to drop the
* vnode lock before our VOP_LOCK() call fails.
*/
- if (vp-v_usecount || !LIST_EMPTY((vp)-v_cache_src) ||
+ if (vp-v_usecount ||
+ (!vlru_allow_cache_src
+ !LIST_EMPTY((vp)-v_cache_src)) ||
(vp-v_object != NULL
vp-v_object-resident_page_count trigger)) {
VOP_UNLOCK(vp, LK_INTERLOCK);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201339 - in head/sys/boot/pc98: libpc98 loader
Author: nyan
Date: Thu Dec 31 12:05:48 2009
New Revision: 201339
URL: http://svn.freebsd.org/changeset/base/201339
Log:
Add setting machine type support to the loader.
MFC after:2 week
Added:
head/sys/boot/pc98/libpc98/libpc98.h (contents, props changed)
head/sys/boot/pc98/libpc98/pc98_sys.c (contents, props changed)
Modified:
head/sys/boot/pc98/libpc98/Makefile
head/sys/boot/pc98/loader/main.c
Modified: head/sys/boot/pc98/libpc98/Makefile
==
--- head/sys/boot/pc98/libpc98/Makefile Thu Dec 31 11:49:13 2009
(r201338)
+++ head/sys/boot/pc98/libpc98/Makefile Thu Dec 31 12:05:48 2009
(r201339)
@@ -8,7 +8,7 @@ INTERNALLIB=
SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c \
biospci.c biossmap.c bootinfo.c bootinfo32.c \
comconsole.c devicename.c elf32_freebsd.c \
- i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
+ i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \
time.c vidconsole.c
# Enable PXE TFTP or NFS support, not both.
Added: head/sys/boot/pc98/libpc98/libpc98.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/pc98/libpc98/libpc98.hThu Dec 31 12:05:48 2009
(r201339)
@@ -0,0 +1,29 @@
+/*-
+ * Copyright (c) 2009 TAKAHASHI Yoshihiro n...@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 provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL 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.
+ *
+ * $FreeBSD$
+ */
+
+void set_machine_type(void);
Added: head/sys/boot/pc98/libpc98/pc98_sys.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/boot/pc98/libpc98/pc98_sys.c Thu Dec 31 12:05:48 2009
(r201339)
@@ -0,0 +1,78 @@
+/*-
+ * Copyright (c) 2009 TAKAHASHI Yoshihiro n...@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 provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL 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.
+ *
+ */
+
+#include sys/cdefs.h
+__FBSDID($FreeBSD$);
+
+#include btxv86.h
+#include machine/cpufunc.h
+#define _KERNEL
+#include pc98/pc98/pc98_machdep.h
+
+/*
+ * Set machine type to PC98_SYSTEM_PARAMETER.
+ */
+void
+set_machine_type(void)
+{
+ int i;
+ u_long ret, data;
+
+ /* PC98_SYSTEM_PARAMETER (0x501) */
+ ret = ((*(u_char *)PTOV(0xA1501)) 0x08) 3;
+
+ /* Wait V-SYNC */
+
svn commit: r201340 - in head/sys/boot: common pc98
Author: nyan
Date: Thu Dec 31 12:17:38 2009
New Revision: 201340
URL: http://svn.freebsd.org/changeset/base/201340
Log:
Don't use 15M-16M area on pc98. It's reserved for some devices.
MFC after:2 week
Modified:
head/sys/boot/common/module.c
head/sys/boot/pc98/Makefile.inc
Modified: head/sys/boot/common/module.c
==
--- head/sys/boot/common/module.c Thu Dec 31 12:05:48 2009
(r201339)
+++ head/sys/boot/common/module.c Thu Dec 31 12:17:38 2009
(r201340)
@@ -351,6 +351,9 @@ file_loadraw(char *type, char *name)
char *cp;
intfd, got;
vm_offset_tladdr;
+#ifdef PC98
+struct statst;
+#endif
/* We can't load first */
if ((file_findfile(NULL, NULL)) == NULL) {
@@ -372,6 +375,14 @@ file_loadraw(char *type, char *name)
return(CMD_ERROR);
}
+#ifdef PC98
+/* We cannot use 15M-16M area on pc98. */
+if (loadaddr 0x100
+ fstat(fd, st) == 0
+ (st.st_size == -1 || loadaddr + st.st_size 0xf0))
+ loadaddr = 0x100;
+#endif
+
laddr = loadaddr;
for (;;) {
/* read in 4k chunks; size is not really important */
@@ -477,6 +488,14 @@ mod_loadkld(const char *kldname, int arg
;
do {
+#ifdef PC98
+ /* We cannot use 15M-16M area on pc98. */
+ struct stat st;
+ if (loadaddr 0x100
+ stat(filename, st) == 0
+ (st.st_size == -1 || loadaddr + st.st_size 0xf0))
+ loadaddr = 0x100;
+#endif
err = file_load(filename, loadaddr, fp);
if (err)
break;
Modified: head/sys/boot/pc98/Makefile.inc
==
--- head/sys/boot/pc98/Makefile.inc Thu Dec 31 12:05:48 2009
(r201339)
+++ head/sys/boot/pc98/Makefile.inc Thu Dec 31 12:17:38 2009
(r201340)
@@ -7,7 +7,7 @@ BINDIR?=/boot
LOADER_ADDRESS?=0x20
CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \
-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
- -Os
+ -Os -DPC98
LDFLAGS+= -nostdlib
# BTX components
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201339 - in head/sys/boot/pc98: libpc98 loader
Author: nyan Date: Thu Dec 31 12:05:48 2009 New Revision: 201339 URL: http://svn.freebsd.org/changeset/base/201339 Log: Add setting machine type support to the loader. Author: nyan Date: Thu Dec 31 12:17:38 2009 New Revision: 201340 URL: http://svn.freebsd.org/changeset/base/201340 Log: Don't use 15M-16M area on pc98. It's reserved for some devices. Oops, I forgot to add the following. Tested by: SATOU Tomokazu ( tomo1770 _ maple _ ocn _ ne _ jp ), WATANABE Kazuhiro ( CQG00620 _ nifty _ ne _ jp ) and nyan --- TAKAHASHI Yoshihiro n...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201266 - stable/7/sys/boot/i386
On Wednesday 30 December 2009 4:35:03 pm Oliver Pinter wrote:
remove duplocated .include bsd.own.mk
--
--- Makefile.orig 2009-12-30 22:33:30.0 +0100
+++ Makefile 2009-12-30 22:33:36.0 +0100
@@ -1,8 +1,6 @@
# $FreeBSD$
.include bsd.own.mk
-.include bsd.own.mk
-
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr
\
libi386 libfirewire loader
Oops, will fix, thanks!
On 12/30/09, John Baldwin j...@freebsd.org wrote:
Author: jhb
Date: Wed Dec 30 17:45:35 2009
New Revision: 201266
URL: http://svn.freebsd.org/changeset/base/201266
Log:
MFC 200872:
Don't build zfsboot, gptzfsboot, and zfsloader if WITHOUT_ZFS is
enabled.
Modified:
stable/7/sys/boot/i386/Makefile
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/boot/i386/Makefile
==
--- stable/7/sys/boot/i386/Makefile Wed Dec 30 17:42:41 2009
(r201265)
+++ stable/7/sys/boot/i386/Makefile Wed Dec 30 17:45:35 2009
(r201266)
@@ -1,10 +1,16 @@
# $FreeBSD$
.include bsd.own.mk
-SUBDIR=mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot
zfsboot \
- gptzfsboot kgzldr libi386 libfirewire loader zfsloader
+.include bsd.own.mk
+
+SUBDIR=mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr
\
+ libi386 libfirewire loader
# special boot programs, 'self-extracting boot2+loader'
SUBDIR+= pxeldr
+.if ${MK_ZFS} != no
+SUBDIR+= zfsboot gptzfsboot zfsloader
+.endif
+
.include bsd.subdir.mk
___
svn-src-sta...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable
To unsubscribe, send any mail to svn-src-stable-unsubscr...@freebsd.org
--
John Baldwin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201287 - head/sys/kern
On Wednesday 30 December 2009 5:37:28 pm John Baldwin wrote: Author: jhb Date: Wed Dec 30 22:37:28 2009 New Revision: 201287 URL: http://svn.freebsd.org/changeset/base/201287 Log: Actually set RLE_ALLOCATED when allocating a reserved resource so that resource_list_release() will later release the resource instead of failing. In theory this change along with several others committed today should resolve many (most?) of the cardbus panics since my changes to the PCI bus driver to use resource_list_reserve(). For folks willing to be guinea pigs there are some further refinements to the PCI/cardbus code for removing PCI devices in the current version of http://www.FreeBSD.org/~jhb/patches/cardbus.patch -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201341 - stable/8/sys/dev/ciss
Author: gavin
Date: Thu Dec 31 12:58:08 2009
New Revision: 201341
URL: http://svn.freebsd.org/changeset/base/201341
Log:
MFC 200637:
Don't panic due to unlocking an unowned mutex if we fail during attach.
PR: kern/139053
Reviewed by: scottl
Approved by: ed (mentor)
Modified:
stable/8/sys/dev/ciss/ciss.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/ciss/ciss.c
==
--- stable/8/sys/dev/ciss/ciss.cThu Dec 31 12:17:38 2009
(r201340)
+++ stable/8/sys/dev/ciss/ciss.cThu Dec 31 12:58:08 2009
(r201341)
@@ -418,6 +418,7 @@ ciss_attach(device_t dev)
sc = device_get_softc(dev);
sc-ciss_dev = dev;
+mtx_init(sc-ciss_mtx, cissmtx, NULL, MTX_DEF);
/*
* Do PCI-specific init.
@@ -430,7 +431,6 @@ ciss_attach(device_t dev)
*/
ciss_initq_free(sc);
ciss_initq_notify(sc);
-mtx_init(sc-ciss_mtx, cissmtx, NULL, MTX_DEF);
callout_init_mtx(sc-ciss_periodic, sc-ciss_mtx, 0);
/*
@@ -496,8 +496,11 @@ ciss_attach(device_t dev)
error = 0;
out:
-if (error != 0)
+if (error != 0) {
+ /* ciss_free() expects the mutex to be held */
+ mtx_lock(sc-ciss_mtx);
ciss_free(sc);
+}
return(error);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201342 - head/sys/boot/pc98/boot2
Author: nyan
Date: Thu Dec 31 15:03:33 2009
New Revision: 201342
URL: http://svn.freebsd.org/changeset/base/201342
Log:
Reimplement the boot2 for pc98 completely.
It's based on the newest i386's one and has the advantage of:
- ELF binary support.
- UFS2 filesystem support.
- Many FreeBSD slices support on a disk.
Tested by:SATOU Tomokazu ( tomo1770 _ maple _ ocn _ ne _ jp ),
WATANABE Kazuhiro ( CQG00620 _ nifty _ ne _ jp ) and
nyan
MFC after:2 week
Happy New Year in Japan!!
Added:
head/sys/boot/pc98/boot2/boot1.S (contents, props changed)
head/sys/boot/pc98/boot2/boot2.c (contents, props changed)
Deleted:
head/sys/boot/pc98/boot2/asm.S
head/sys/boot/pc98/boot2/asm.h
head/sys/boot/pc98/boot2/bios.S
head/sys/boot/pc98/boot2/boot.c
head/sys/boot/pc98/boot2/boot.h
head/sys/boot/pc98/boot2/boot2.S
head/sys/boot/pc98/boot2/dinode.h
head/sys/boot/pc98/boot2/disk.c
head/sys/boot/pc98/boot2/fs.h
head/sys/boot/pc98/boot2/inode.h
head/sys/boot/pc98/boot2/io.c
head/sys/boot/pc98/boot2/probe_keyboard.c
head/sys/boot/pc98/boot2/quota.h
head/sys/boot/pc98/boot2/serial.S
head/sys/boot/pc98/boot2/serial_16550.S
head/sys/boot/pc98/boot2/serial_8251.S
head/sys/boot/pc98/boot2/start.S
head/sys/boot/pc98/boot2/sys.c
head/sys/boot/pc98/boot2/table.c
Modified:
head/sys/boot/pc98/boot2/Makefile
Modified: head/sys/boot/pc98/boot2/Makefile
==
--- head/sys/boot/pc98/boot2/Makefile Thu Dec 31 12:58:08 2009
(r201341)
+++ head/sys/boot/pc98/boot2/Makefile Thu Dec 31 15:03:33 2009
(r201342)
@@ -1,119 +1,104 @@
# $FreeBSD$
-#
-PROG= boot
-# Order is very important on the SRCS line for this prog
-SRCS= start.S table.c boot2.S boot.c asm.S bios.S serial.S
-SRCS+= probe_keyboard.c io.c disk.c sys.c
-
-BINMODE= 444
-CFLAGS=-Os -mrtd \
- -fno-guess-branch-probability \
- -fno-unit-at-a-time \
- -D_KERNEL -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT}
-CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
-CFLAGS+= -I${.CURDIR}/../../.. -I.
-
-# By default, if a serial port is going to be used as console, use COM1
-# (aka /dev/ttyd0).
-#BOOT_COMCONSOLE_PORT?=0x30
-BOOT_COMCONSOLE_PORT?=0x238
-BOOT_COMCONSOLE_CLK?=16
-BOOT_COMCONSOLE_MODE=0x0c
-CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
- -DCOMCONSOLE_CLK=${BOOT_COMCONSOLE_CLK} \
- -DCOMCONSOLE_MODE=${BOOT_COMCONSOLE_MODE}
-
-# feature not implemented
-BOOT_COMCONSOLE_SPEED?=9600
-CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
+FILES= boot boot1 boot2
+
+NM?= nm
+
+BOOT_COMCONSOLE_PORT?= 0x238
+BOOT_COMCONSOLE_SPEED?= 9600
+B2SIOFMT?= 0x3
+
+REL1= 0x700
+ORG1= 0
+ORG2= 0x2000
+
+# Decide level of UFS support.
+BOOT2_UFS?=UFS1_AND_UFS2
+#BOOT2_UFS?= UFS2_ONLY
+#BOOT2_UFS?= UFS1_ONLY
+
+CFLAGS=-Os \
+ -fno-guess-branch-probability \
+ -fomit-frame-pointer \
+ -fno-unit-at-a-time \
+ -mno-align-long-strings \
+ -mrtd \
+ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
+ -D${BOOT2_UFS} \
+ -DFLAGS=${BOOT_BOOT1_FLAGS} \
+ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \
+ -DSIOFMT=${B2SIOFMT} \
+ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
+ -I${.CURDIR}/../../.. \
+ -I${.CURDIR}/../../i386/boot2 \
+ -I${.CURDIR}/../../common \
+ -I${.CURDIR}/../btx/lib -I. \
+ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
+ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
+ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+ -Winline --param max-inline-insns-single=100
# Set machine type to PC98_SYSTEM_PARAMETER
-CFLAGS+= -DSET_MACHINE_TYPE
+#CFLAGS+= -DSET_MACHINE_TYPE
# Initialize the bi_bios_geom using the BIOS geometry
-CFLAGS+= -DGET_BIOSGEOM
+#CFLAGS+= -DGET_BIOSGEOM
+
+LDFLAGS=-static -N --gc-sections
+
+# Pick up ../Makefile.inc early.
+.include bsd.init.mk
+
+.PATH: ${.CURDIR}/../../i386/boot2
+
+CLEANFILES=boot
+
+boot: boot1 boot2
+ cat boot1 boot2 boot
+
+CLEANFILES+= boot1 boot1.out boot1.o
+
+boot1: boot1.out
+ objcopy -S -O binary boot1.out ${.TARGET}
+
+boot1.out: boot1.o
+ ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
+
+CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \
+ boot2.s boot2.s.tmp boot2.h sio.o
+
+boot2: boot2.ld
+ @set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \
+ echo $$x bytes available; test $$x -ge 0
+ dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync
+
+boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
+ btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
+ -o ${.TARGET} -P 1 boot2.bin
+
+boot2.ldr:
+ dd if=/dev/zero of=${.TARGET} bs=276
svn commit: r201343 - in head: bin/sh tools/regression/bin/sh/builtins
Author: jilles
Date: Thu Dec 31 16:13:33 2009
New Revision: 201343
URL: http://svn.freebsd.org/changeset/base/201343
Log:
sh: Allow command -pv and command -pV (lookup using _PATH_STDPATH).
Added:
head/tools/regression/bin/sh/builtins/command6.0 (contents, props changed)
head/tools/regression/bin/sh/builtins/command6.0.stdout (contents, props
changed)
head/tools/regression/bin/sh/builtins/command7.0 (contents, props changed)
Modified:
head/bin/sh/eval.c
head/bin/sh/exec.c
head/bin/sh/exec.h
Modified: head/bin/sh/eval.c
==
--- head/bin/sh/eval.c Thu Dec 31 15:03:33 2009(r201342)
+++ head/bin/sh/eval.c Thu Dec 31 16:13:33 2009(r201343)
@@ -1023,7 +1023,7 @@ commandcmd(int argc, char **argv)
if (cmd != -1) {
if (argc != 1)
error(wrong number of arguments);
- return typecmd_impl(2, argv - 1, cmd);
+ return typecmd_impl(2, argv - 1, cmd, path);
}
if (argc != 0) {
old = handler;
Modified: head/bin/sh/exec.c
==
--- head/bin/sh/exec.c Thu Dec 31 15:03:33 2009(r201342)
+++ head/bin/sh/exec.c Thu Dec 31 16:13:33 2009(r201343)
@@ -720,7 +720,7 @@ unsetfunc(const char *name)
*/
int
-typecmd_impl(int argc, char **argv, int cmd)
+typecmd_impl(int argc, char **argv, int cmd, const char *path)
{
struct cmdentry entry;
struct tblentry *cmdp;
@@ -729,6 +729,9 @@ typecmd_impl(int argc, char **argv, int
int i;
int error1 = 0;
+ if (path != pathval())
+ clearcmdentry(0);
+
for (i = 1; i argc; i++) {
/* First look at the keywords */
for (pp = parsekwd; *pp; pp++)
@@ -761,17 +764,17 @@ typecmd_impl(int argc, char **argv, int
}
else {
/* Finally use brute force */
- find_command(argv[i], entry, 0, pathval());
+ find_command(argv[i], entry, 0, path);
}
switch (entry.cmdtype) {
case CMDNORMAL: {
if (strchr(argv[i], '/') == NULL) {
- const char *path = pathval();
+ const char *path2 = path;
char *name;
int j = entry.u.index;
do {
- name = padvance(path, argv[i]);
+ name = padvance(path2, argv[i]);
stunalloc(name);
} while (--j = 0);
if (cmd == TYPECMD_SMALLV)
@@ -821,6 +824,10 @@ typecmd_impl(int argc, char **argv, int
break;
}
}
+
+ if (path != pathval())
+ clearcmdentry(0);
+
return error1;
}
@@ -831,5 +838,5 @@ typecmd_impl(int argc, char **argv, int
int
typecmd(int argc, char **argv)
{
- return typecmd_impl(argc, argv, TYPECMD_TYPE);
+ return typecmd_impl(argc, argv, TYPECMD_TYPE, pathval());
}
Modified: head/bin/sh/exec.h
==
--- head/bin/sh/exec.h Thu Dec 31 15:03:33 2009(r201342)
+++ head/bin/sh/exec.h Thu Dec 31 16:13:33 2009(r201343)
@@ -71,6 +71,6 @@ void deletefuncs(void);
void addcmdentry(const char *, struct cmdentry *);
void defun(const char *, union node *);
int unsetfunc(const char *);
-int typecmd_impl(int, char **, int);
+int typecmd_impl(int, char **, int, const char *);
int typecmd(int, char **);
void clearcmdentry(int);
Added: head/tools/regression/bin/sh/builtins/command6.0
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/bin/sh/builtins/command6.0Thu Dec 31 16:13:33
2009(r201343)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+PATH=/var/empty
+command -pV ls
+command -pV true
+command -pV /bin/ls
+
+fun() {
+}
+command -pV fun
+command -pV break
+command -pV if
+command -pV {
+
+alias foo=bar
+command -pV foo
Added: head/tools/regression/bin/sh/builtins/command6.0.stdout
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/bin/sh/builtins/command6.0.stdout Thu Dec 31
16:13:33 2009(r201343)
@@ -0,0 +1,8 @@
+ls is /bin/ls
+true is a shell builtin
+/bin/ls is /bin/ls
+fun is a shell function
+break is a special shell builtin
+if is a shell keyword
+{ is a shell keyword
+foo is an alias for bar
Added: head/tools/regression/bin/sh/builtins/command7.0
svn commit: r201344 - in head: bin/sh tools/regression/bin/sh/builtins
Author: jilles
Date: Thu Dec 31 17:44:24 2009
New Revision: 201344
URL: http://svn.freebsd.org/changeset/base/201344
Log:
sh: Use PATH= assignment in type.
Example:
PATH=/var/empty; PATH=/bin type ls
Added:
head/tools/regression/bin/sh/builtins/type2.0 (contents, props changed)
Modified:
head/bin/sh/exec.c
Modified: head/bin/sh/exec.c
==
--- head/bin/sh/exec.c Thu Dec 31 16:13:33 2009(r201343)
+++ head/bin/sh/exec.c Thu Dec 31 17:44:24 2009(r201344)
@@ -838,5 +838,5 @@ typecmd_impl(int argc, char **argv, int
int
typecmd(int argc, char **argv)
{
- return typecmd_impl(argc, argv, TYPECMD_TYPE, pathval());
+ return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup(PATH, 1));
}
Added: head/tools/regression/bin/sh/builtins/type2.0
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/bin/sh/builtins/type2.0 Thu Dec 31 17:44:24
2009(r201344)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+failures=0
+
+check() {
+ if ! eval $*; then
+ echo Failed: $*
+ : $((failures += 1))
+ fi
+}
+
+check 'PATH=/libexec type ld-elf.so.1 /dev/null'
+check '! PATH=/libexec type ls 2/dev/null'
+
+PATH=/libexec:$PATH
+
+check 'type ld-elf.so.1 /dev/null'
+
+PATH=/libexec
+
+check 'type ld-elf.so.1 /dev/null'
+check '! type ls 2/dev/null'
+check 'PATH=/bin type ls /dev/null'
+check '! PATH=/bin type ld-elf.so.1 2/dev/null'
+
+exit $((failures 0))
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201345 - head/sys/fs/nfsclient
Author: rmacklem
Date: Thu Dec 31 18:02:48 2009
New Revision: 201345
URL: http://svn.freebsd.org/changeset/base/201345
Log:
Fix the experimental NFS client so that it can create Unix
domain sockets on an NFSv4 mount point. It was generating
incorrect XDR in the request for this case.
Tested by:infofarmer
MFC after:2 weeks
Modified:
head/sys/fs/nfsclient/nfs_clrpcops.c
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==
--- head/sys/fs/nfsclient/nfs_clrpcops.cThu Dec 31 17:44:24 2009
(r201344)
+++ head/sys/fs/nfsclient/nfs_clrpcops.cThu Dec 31 18:02:48 2009
(r201345)
@@ -1626,10 +1626,15 @@ nfsrpc_mknod(vnode_t dvp, char *name, in
return (ENAMETOOLONG);
NFSCL_REQSTART(nd, NFSPROC_MKNOD, dvp);
if (nd-nd_flag ND_NFSV4) {
- NFSM_BUILD(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
- *tl++ = vtonfsv34_type(vtyp);
- *tl++ = txdr_unsigned(NFSMAJOR(rdev));
- *tl = txdr_unsigned(NFSMINOR(rdev));
+ if (vtyp == VBLK || vtyp == VCHR) {
+ NFSM_BUILD(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
+ *tl++ = vtonfsv34_type(vtyp);
+ *tl++ = txdr_unsigned(NFSMAJOR(rdev));
+ *tl = txdr_unsigned(NFSMINOR(rdev));
+ } else {
+ NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
+ *tl = vtonfsv34_type(vtyp);
+ }
}
(void) nfsm_strtom(nd, name, namelen);
if (nd-nd_flag ND_NFSV3) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201347 - head/sys/kern
Author: kib Date: Thu Dec 31 18:52:58 2009 New Revision: 201347 URL: http://svn.freebsd.org/changeset/base/201347 Log: Allow swap out of the kernel stack for the thread with priority greater or equial then PSOCK, not less or equial. Higher priority has lesser numerical value. Existing test does not allow for swapout of the thread waiting for advisory lock, for exiting child or sleeping for timeout. On the other hand, high-priority waiters of VFS/VM events can be swapped out. Tested by:pho Reviewed by: jhb MFC after:1 week Modified: head/sys/kern/sched_4bsd.c head/sys/kern/sched_ule.c Modified: head/sys/kern/sched_4bsd.c == --- head/sys/kern/sched_4bsd.c Thu Dec 31 18:28:40 2009(r201346) +++ head/sys/kern/sched_4bsd.c Thu Dec 31 18:52:58 2009(r201347) @@ -913,7 +913,7 @@ sched_sleep(struct thread *td, int pri) td-td_sched-ts_slptime = 0; if (pri) sched_prio(td, pri); - if (TD_IS_SUSPENDED(td) || pri = PSOCK) + if (TD_IS_SUSPENDED(td) || pri = PSOCK) td-td_flags |= TDF_CANSWAP; } Modified: head/sys/kern/sched_ule.c == --- head/sys/kern/sched_ule.c Thu Dec 31 18:28:40 2009(r201346) +++ head/sys/kern/sched_ule.c Thu Dec 31 18:52:58 2009(r201347) @@ -1909,7 +1909,7 @@ sched_sleep(struct thread *td, int prio) THREAD_LOCK_ASSERT(td, MA_OWNED); td-td_slptick = ticks; - if (TD_IS_SUSPENDED(td) || prio = PSOCK) + if (TD_IS_SUSPENDED(td) || prio = PSOCK) td-td_flags |= TDF_CANSWAP; if (static_boost == 1 prio) sched_prio(td, prio); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201348 - head/share/misc
Author: maxim Date: Thu Dec 31 19:36:51 2009 New Revision: 201348 URL: http://svn.freebsd.org/changeset/base/201348 Log: o Correct URL to announcements collection. PR: docs/142204 Submitted by: Jason Helfman MFC after:1 week Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree == --- head/share/misc/bsd-family-tree Thu Dec 31 18:52:58 2009 (r201347) +++ head/share/misc/bsd-family-tree Thu Dec 31 19:36:51 2009 (r201348) @@ -543,7 +543,7 @@ Andreas Klemm, Lars K�ller. If you're go Die freien BSD-Varianten von Unix. c't April 1997, page 368ff. BSD Release Announcements collection. -URL: http://www.de.FreeBSD.org/de/ftp/releases/ +URL: http://www.FreeBSD.org/releases/ BSD Hypertext Man Pages URL: http://www.FreeBSD.org/cgi/man.cgi ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201349 - head/sys
Author: brooks Date: Thu Dec 31 19:40:51 2009 New Revision: 201349 URL: http://svn.freebsd.org/changeset/base/201349 Log: Ignore .glimpse_* files as generated by the glimpse target. Also ignore cscope.* files. Modified: Directory Properties: head/sys/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201350 - in head: lib/libc/sys sys/kern sys/net sys/sys tools/regression/fifo/fifo_misc usr.bin/truss
Author: brooks
Date: Thu Dec 31 20:29:58 2009
New Revision: 201350
URL: http://svn.freebsd.org/changeset/base/201350
Log:
The devices that supported EVFILT_NETDEV kqueue filters were removed in
r195175. Remove all definitions, documentation, and usage.
fifo_misc.c:
Remove all kqueue tests as fifo_io.c performs all those that
would have remained.
Reviewed by: rwatson
MFC after:3 weeks
X-MFC note: don't change vlan_link_state() function signature
Modified:
head/lib/libc/sys/kqueue.2
head/sys/kern/kern_event.c
head/sys/net/if.c
head/sys/net/if_vlan.c
head/sys/sys/event.h
head/tools/regression/fifo/fifo_misc/fifo_misc.c
head/usr.bin/truss/syscalls.c
Modified: head/lib/libc/sys/kqueue.2
==
--- head/lib/libc/sys/kqueue.2 Thu Dec 31 19:40:51 2009(r201349)
+++ head/lib/libc/sys/kqueue.2 Thu Dec 31 20:29:58 2009(r201350)
@@ -438,19 +438,6 @@ There is a system wide limit on the numb
which is controlled by the
.Va kern.kq_calloutmax
sysctl.
-.It Dv EVFILT_NETDEV
-Takes a descriptor to a network interface as the identifier, and the events to
watch for in
-.Va fflags .
-It returns, when one or more of the requested events occur on the descriptor.
-The events to monitor are:
-.Bl -tag -width XXNOTE_LINKDOWN
-.It Dv NOTE_LINKUP
-The link is up.
-.It Dv NOTE_LINKDOWN
-The link is down.
-.It Dv NOTE_LINKINV
-The link state is invalid.
-.El
.Pp
On return,
.Va fflags
@@ -595,13 +582,6 @@ system and this manual page were written
.An Jonathan Lemon Aq jle...@freebsd.org .
.Sh BUGS
The
-.Dv EVFILT_NETDEV
-filter is currently only implemented for devices that use the
-.Xr miibus 4
-driver for LINKUP and LINKDOWN operations.
-Therefore, it will not work with many non-ethernet devices.
-.Pp
-The
.Fa timeout
value is limited to 24 hours; longer timeouts will be silently
reinterpreted as 24 hours.
Modified: head/sys/kern/kern_event.c
==
--- head/sys/kern/kern_event.c Thu Dec 31 19:40:51 2009(r201349)
+++ head/sys/kern/kern_event.c Thu Dec 31 20:29:58 2009(r201350)
@@ -279,7 +279,7 @@ static struct {
{ proc_filtops }, /* EVFILT_PROC */
{ sig_filtops }, /* EVFILT_SIGNAL */
{ timer_filtops }, /* EVFILT_TIMER */
- { file_filtops }, /* EVFILT_NETDEV */
+ { null_filtops }, /* former EVFILT_NETDEV */
{ fs_filtops },/* EVFILT_FS */
{ null_filtops }, /* EVFILT_LIO */
{ user_filtops }, /* EVFILT_USER */
Modified: head/sys/net/if.c
==
--- head/sys/net/if.c Thu Dec 31 19:40:51 2009(r201349)
+++ head/sys/net/if.c Thu Dec 31 20:29:58 2009(r201350)
@@ -1819,7 +1819,7 @@ if_route(struct ifnet *ifp, int flag, in
#endif
}
-void (*vlan_link_state_p)(struct ifnet *, int); /* XXX: private from
if_vlan */
+void (*vlan_link_state_p)(struct ifnet *); /* XXX: private from if_vlan */
void (*vlan_trunk_cap_p)(struct ifnet *);/* XXX: private from
if_vlan */
/*
@@ -1845,19 +1845,12 @@ do_link_state_change(void *arg, int pend
{
struct ifnet *ifp = (struct ifnet *)arg;
int link_state = ifp-if_link_state;
- int link;
CURVNET_SET(ifp-if_vnet);
/* Notify that the link state has changed. */
rt_ifmsg(ifp);
- if (link_state == LINK_STATE_UP)
- link = NOTE_LINKUP;
- else if (link_state == LINK_STATE_DOWN)
- link = NOTE_LINKDOWN;
- else
- link = NOTE_LINKINV;
if (ifp-if_vlantrunk != NULL)
- (*vlan_link_state_p)(ifp, link);
+ (*vlan_link_state_p)(ifp);
if ((ifp-if_type == IFT_ETHER || ifp-if_type == IFT_L2VLAN)
IFP2AC(ifp)-ac_netgraph != NULL)
Modified: head/sys/net/if_vlan.c
==
--- head/sys/net/if_vlan.c Thu Dec 31 19:40:51 2009(r201349)
+++ head/sys/net/if_vlan.c Thu Dec 31 20:29:58 2009(r201350)
@@ -188,7 +188,7 @@ static int vlan_setmulti(struct ifnet *i
static int vlan_unconfig(struct ifnet *ifp);
static int vlan_unconfig_locked(struct ifnet *ifp);
static int vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t tag);
-static void vlan_link_state(struct ifnet *ifp, int link);
+static void vlan_link_state(struct ifnet *ifp);
static void vlan_capabilities(struct ifvlan *ifv);
static void vlan_trunk_capabilities(struct ifnet *ifp);
@@ -525,7 +525,7 @@ restart:
extern void (*vlan_input_p)(struct ifnet *, struct mbuf *);
/* For if_link_state_change() eyes only... */
-extern
svn commit: r201351 - head/sys/net
Author: jhb
Date: Thu Dec 31 20:44:38 2009
New Revision: 201351
URL: http://svn.freebsd.org/changeset/base/201351
Log:
Use stricter checking to match possible vlan clones by not allowing extra
garbage characters around or within the tag.
Reviewed by: brooks
MFC after:3 days
Modified:
head/sys/net/if_vlan.c
Modified: head/sys/net/if_vlan.c
==
--- head/sys/net/if_vlan.c Thu Dec 31 20:29:58 2009(r201350)
+++ head/sys/net/if_vlan.c Thu Dec 31 20:44:38 2009(r201351)
@@ -582,7 +582,7 @@ vlan_clone_match_ethertag(struct if_clon
{
const char *cp;
struct ifnet *ifp;
- int t = 0;
+ int t;
/* Check for etherif.vlan style interface names. */
IFNET_RLOCK_NOSLEEP();
@@ -592,13 +592,15 @@ vlan_clone_match_ethertag(struct if_clon
if (strncmp(ifp-if_xname, name, strlen(ifp-if_xname)) != 0)
continue;
cp = name + strlen(ifp-if_xname);
- if (*cp != '.')
+ if (*cp++ != '.')
continue;
- for(; *cp != '\0'; cp++) {
- if (*cp '0' || *cp '9')
- continue;
+ if (*cp == '\0')
+ continue;
+ t = 0;
+ for(; *cp = '0' *cp = '9'; cp++)
t = (t * 10) + (*cp - '0');
- }
+ if (*cp != '\0')
+ continue;
if (tag != NULL)
*tag = t;
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201351 - head/sys/net
On Thursday 31 December 2009 3:44:38 pm John Baldwin wrote: Author: jhb Date: Thu Dec 31 20:44:38 2009 New Revision: 201351 URL: http://svn.freebsd.org/changeset/base/201351 Log: Use stricter checking to match possible vlan clones by not allowing extra garbage characters around or within the tag. Previously some odd clone requests such as 'em0.102a', 'em0.10a3bc', and 'em0.foo.104' would have succeeded creating interfaces equivalent to em0.102, em0.103, and em0.104. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201352 - head/sys/kern
Author: brooks
Date: Thu Dec 31 20:56:28 2009
New Revision: 201352
URL: http://svn.freebsd.org/changeset/base/201352
Log:
If a filter has already been added, actually return EEXIST when trying
at add it again.
MFC after:1 week
Modified:
head/sys/kern/kern_event.c
Modified: head/sys/kern/kern_event.c
==
--- head/sys/kern/kern_event.c Thu Dec 31 20:44:38 2009(r201351)
+++ head/sys/kern/kern_event.c Thu Dec 31 20:56:28 2009(r201352)
@@ -867,6 +867,7 @@ kqueue_add_filteropts(int filt, struct f
{
int error;
+ error = 0;
if (filt 0 || filt + EVFILT_SYSCOUNT 0) {
printf(
trying to add a filterop that is out of range: %d is beyond %d\n,
@@ -883,7 +884,7 @@ kqueue_add_filteropts(int filt, struct f
}
mtx_unlock(filterops_lock);
- return (0);
+ return (error);
}
int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201143 - in head: cddl/contrib/opensolaris/cmd/zpool sys/cddl/boot/zfs sys/cddl/contrib/opensolaris/common/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensola
Question,
So this is not like when we went from v6 to v13 and you had to do both
installkernel + installworld for zfs to re-initialize correctly on the
next reboot ?
If it is its a pretty big issue for people with ZFSROOT or zfs only
systems as it forces them to get the kernel right on the 1st go b/c our
loader can't boot off of snapshots (like sun).
In that case, I (non src/ person) object to any mfc, it its not the
case, excellent!
Xin LI wrote:
Author: delphij
Date: Mon Dec 28 22:15:11 2009
New Revision: 201143
URL: http://svn.freebsd.org/changeset/base/201143
Log:
Apply OpenSolaris revision 8012 which brings our zpool to version 14,
making it possible for zpools created on OpenSolaris 2009.06 be used
on FreeBSD.
PR: kern/141800
Submitted by: mm
Reviewed by: pjd, trasz
Obtained from:OpenSolaris
MFC after:2 weeks
Modified:
head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
head/sys/cddl/boot/zfs/zfsimpl.h
head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cMon Dec 28
22:14:49 2009(r201142)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cMon Dec 28
22:15:11 2009(r201143)
@@ -3488,6 +3488,8 @@ zpool_do_upgrade(int argc, char **argv)
(void) printf(gettext( 11 Improved scrub performance\n));
(void) printf(gettext( 12 Snapshot properties\n));
(void) printf(gettext( 13 snapused property\n));
+ (void) printf(gettext( 14 passthrough-x aclinherit
+ support\n));
(void) printf(gettext(For more information on a particular
version, including supported releases, see:\n\n));
(void) printf(http://www.opensolaris.org/os/community/zfs/;
Modified: head/sys/cddl/boot/zfs/zfsimpl.h
==
--- head/sys/cddl/boot/zfs/zfsimpl.hMon Dec 28 22:14:49 2009
(r201142)
+++ head/sys/cddl/boot/zfs/zfsimpl.hMon Dec 28 22:15:11 2009
(r201143)
@@ -479,13 +479,14 @@ typedef enum {
#defineSPA_VERSION_11 11ULL
#defineSPA_VERSION_12 12ULL
#defineSPA_VERSION_13 13ULL
+#defineSPA_VERSION_14 14ULL
/*
* When bumping up SPA_VERSION, make sure GRUB ZFS understand the on-disk
* format change. Go to usr/src/grub/grub-0.95/stage2/{zfs-include/,
fsys_zfs*},
* and do the appropriate changes.
*/
-#defineSPA_VERSION SPA_VERSION_13
-#defineSPA_VERSION_STRING 13
+#defineSPA_VERSION SPA_VERSION_14
+#defineSPA_VERSION_STRING 14
/*
* Symbolic names for the changes that caused a SPA_VERSION switch.
@@ -520,6 +521,7 @@ typedef enum {
#defineSPA_VERSION_DSL_SCRUB SPA_VERSION_11
#defineSPA_VERSION_SNAP_PROPS SPA_VERSION_12
#defineSPA_VERSION_USED_BREAKDOWN SPA_VERSION_13
+#defineSPA_VERSION_PASSTHROUGH_X SPA_VERSION_14
/*
* The following are configuration names used in the nvlist describing a pool's
Modified: head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
==
--- head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c Mon Dec 28
22:14:49 2009(r201142)
+++ head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c Mon Dec 28
22:15:11 2009(r201143)
@@ -97,6 +97,7 @@ zfs_prop_init(void)
{ restricted, ZFS_ACL_RESTRICTED },
{ passthrough, ZFS_ACL_PASSTHROUGH },
{ secure, ZFS_ACL_RESTRICTED }, /* bkwrd compatability */
+ { passthrough-x, ZFS_ACL_PASSTHROUGH_X },
{ NULL }
};
@@ -173,7 +174,7 @@ zfs_prop_init(void)
discard | groupmask | passthrough, ACLMODE, acl_mode_table);
register_index(ZFS_PROP_ACLINHERIT, aclinherit, ZFS_ACL_RESTRICTED,
PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
- discard | noallow | restricted | passthrough,
+ discard | noallow | restricted | passthrough | passthrough-x,
ACLINHERIT, acl_inherit_table);
register_index(ZFS_PROP_COPIES, copies, 1,
PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
Re: svn commit: r201143 - in head: cddl/contrib/opensolaris/cmd/zpool sys/cddl/boot/zfs sys/cddl/contrib/opensolaris/common/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/openso
Hi, Philip, On Thu, Dec 31, 2009 at 2:12 PM, Philip M. Gollucci pgollu...@p6m7g8.com wrote: Question, So this is not like when we went from v6 to v13 and you had to do both installkernel + installworld for zfs to re-initialize correctly on the next reboot ? If it is its a pretty big issue for people with ZFSROOT or zfs only systems as it forces them to get the kernel right on the 1st go b/c our loader can't boot off of snapshots (like sun). I'm not very sure what are you talking about (I never had a problem during the ZFSv6 - ZFSv13 transistion when I had ZFS as root), maybe I have overlooked something? What was the problem you had when going from ZFSv6 to ZFSv13? The change between ZFSv13 and ZFSv14 (actually, this commit only adds ZFSv14 support which is necessary for importing OpenSolaris 2009.06 zpools, we are still a few revisions behind) is quite minimal one and have almost no impact to our codebase at this moment. Importing older zpool won't change anything on it (say, if it was v6, it's still v6, etc), and I personally didn't have any manual interaction on my desktop (the only difference is that it's using UFS as / and boot and mount ZFS in a sparse manner). What I would do is to build and install a kernel that supports ZFSv14, see how it's going, then upgrade the zpool at a later time when I have full backup, for zfs as root the 'zpool upgrade' may have some problem IIRC (the reason why I don't use ZFS as root FS anymore is because I couldn't rollback root ZFS to a previously taken snapshot, and once the ZFS gets screwed up one have to boot from a rescue disc) but others should be just fine. Cheers, -- Xin LI delp...@delphij.net http://www.delphij.net ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201355 - head/bin/sh
Author: jilles Date: Thu Dec 31 22:33:58 2009 New Revision: 201355 URL: http://svn.freebsd.org/changeset/base/201355 Log: sh(1): document ulimit -w (swapuse rlimit). MFC after:1 week Modified: head/bin/sh/sh.1 Modified: head/bin/sh/sh.1 == --- head/bin/sh/sh.1Thu Dec 31 22:01:17 2009(r201354) +++ head/bin/sh/sh.1Thu Dec 31 22:33:58 2009(r201355) @@ -32,7 +32,7 @@ .\from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\ $FreeBSD$ .\ -.Dd October 24, 2009 +.Dd December 31, 2009 .Dt SH 1 .Os .Sh NAME @@ -2137,7 +2137,7 @@ and not found. For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdflmnpstuv Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdflmnpstuvw Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2201,6 +2201,9 @@ The maximal amount of CPU time to be use The maximal number of simultaneous processes for this user ID. .It Fl v Ar virtualmem The maximal virtual size of a process, in kilobytes. +.It Fl w Ar swapuse +The maximum amount of swap space reserved or used for this user ID, +in kilobytes. .El .It Ic umask Oo Fl S Oc Op Ar mask Set the file creation mask (see ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201351 - head/sys/net
On Thursday 31 December 2009 21:47:54 John Baldwin wrote: On Thursday 31 December 2009 3:44:38 pm John Baldwin wrote: Author: jhb Date: Thu Dec 31 20:44:38 2009 New Revision: 201351 URL: http://svn.freebsd.org/changeset/base/201351 Log: Use stricter checking to match possible vlan clones by not allowing extra garbage characters around or within the tag. Previously some odd clone requests such as 'em0.102a', 'em0.10a3bc', and 'em0.foo.104' would have succeeded creating interfaces equivalent to em0.102, em0.103, and em0.104. The em0.foo.104 case seems quite useful, though. Maybe we can keep that /feature/? -- Max ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
