svn commit: r235216 - in head/cddl/contrib/opensolaris: cmd/zfs lib/libzfs/common
Author: mm
Date: Thu May 10 08:57:58 2012
New Revision: 235216
URL: http://svn.freebsd.org/changeset/base/235216
Log:
Add support for force unmounting ZFS filesystems during "zfs rename"
with the -f flag.
Reimplementation of the illumos changeset 13677:a0cbef703c12
2635 'zfs rename -f' to perform force unmount
References:
https://www.illumos.org/issues/2635
PR: kern/164447
Suggested by: Marcelo Araujo
Obtained from:illumos (issue #2635)
MFC after:1 week
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu May 10 08:05:41 2012
(r235215)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu May 10 08:57:58 2012
(r235216)
@@ -18,7 +18,7 @@
.\" information: Portions Copyright [] [name of copyright owner]
.\"
.\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
-.\" Copyright (c) 2011 by Delphix. All rights reserved.
+.\" Copyright (c) 2012 by Delphix. All rights reserved.
.\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved.
.\" Copyright (c) 2011, Pawel Jakub Dawidek
.\"
@@ -77,10 +77,12 @@
.Ar clone-filesystem
.Nm
.Cm rename
+.Op Fl f
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
.Nm
.Cm rename
+.Op Fl f
.Fl p
.Ar filesystem Ns | Ns Ar volume
.Ar filesystem Ns | Ns Ar volume
@@ -1646,12 +1648,14 @@ subcommand can be used to rename any con
.It Xo
.Nm
.Cm rename
+.Op Fl f
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
.Xc
.It Xo
.Nm
.Cm rename
+.Op Fl f
.Fl p
.Ar filesystem Ns | Ns Ar volume
.Ar filesystem Ns | Ns Ar volume
@@ -1685,6 +1689,11 @@ property is set to
or
.Cm none ,
file system is not unmounted even if this option is not given.
+.It Fl f
+Force unmount any filesystems that need to be unmounted in the process.
+This flag has no effect if used together with the
+.Fl u
+flag.
.El
.It Xo
.Nm
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cThu May 10 08:05:41
2012(r235215)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cThu May 10 08:57:58
2012(r235216)
@@ -22,10 +22,10 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
* Copyright (c) 2011-2012 Pawel Jakub Dawidek .
* All rights reserved.
- * Copyright (c) 2011 Martin Matuska . All rights reserved.
+ * Copyright (c) 2012 Martin Matuska . All rights reserved.
*/
#include
@@ -256,9 +256,10 @@ get_usage(zfs_help_t idx)
"snapshot>\n"
"\treceive [-vnFu] [-d | -e] \n"));
case HELP_RENAME:
- return (gettext("\trename "
+ return (gettext("\trename [-f] "
"\n"
- "\trename -p \n"
+ "\trename [-f] -p "
+ "\n"
"\trename -r \n"
"\trename -u [-p] "));
case HELP_ROLLBACK:
@@ -3091,8 +3092,8 @@ zfs_do_list(int argc, char **argv)
}
/*
- * zfs rename
- * zfs rename -p
+ * zfs rename [-f]
+ * zfs rename [-f] -p
* zfs rename -r
* zfs rename -u [-p]
*
@@ -3112,7 +3113,7 @@ zfs_do_rename(int argc, char **argv)
boolean_t parents = B_FALSE;
/* check options */
- while ((c = getopt(argc, argv, "pru")) != -1) {
+ while ((c = getopt(argc, argv, "fpru")) != -1) {
switch (c) {
case 'p':
parents = B_TRUE;
@@ -3123,6 +3124,9 @@ zfs_do_rename(int argc, char **argv)
case 'u':
flags.nounmount = B_TRUE;
break;
+ case 'f':
+ flags.forceunmount = B_TRUE;
+ break;
case '?':
default:
(void) fprintf(stderr, gettext("invalid option '%c'\n"),
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.hThu May 10
08:05:41 2012(r235215)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.hThu May 10
08:57:58 2012(r235216)
@@ -26,6 +26,7 @@
* All righ
svn commit: r235217 - head/cddl/contrib/opensolaris/cmd/zfs
Author: mm
Date: Thu May 10 09:10:31 2012
New Revision: 235217
URL: http://svn.freebsd.org/changeset/base/235217
Log:
Remove unreachable break in zfs_main.c
Partial import of illumos changeset 13622:e5889df1eaac
2077 lots of unreachable breaks in illumos gate
References:
https://www.illumos.org/issues/2077
PR: kern/167370
Submitted by: Marcelo Araujo
Obtained from:illumos (issue #2077)
MFC after:1 week
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cThu May 10 08:57:58
2012(r235216)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cThu May 10 09:10:31
2012(r235217)
@@ -23,6 +23,7 @@
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright 2012 Milan Jurik. All rights reserved.
* Copyright (c) 2011-2012 Pawel Jakub Dawidek .
* All rights reserved.
* Copyright (c) 2012 Martin Matuska . All rights reserved.
@@ -765,7 +766,6 @@ zfs_do_create(int argc, char **argv)
(void) fprintf(stderr, gettext("missing size "
"argument\n"));
goto badusage;
- break;
case '?':
(void) fprintf(stderr, gettext("invalid option '%c'\n"),
optopt);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235218 - head/lib/libthr/thread
Author: davidxu
Date: Thu May 10 09:30:37 2012
New Revision: 235218
URL: http://svn.freebsd.org/changeset/base/235218
Log:
Create a common function lookup() to search a chan, this eliminates
redundant SC_LOOKUP() calling.
Modified:
head/lib/libthr/thread/thr_sleepq.c
Modified: head/lib/libthr/thread/thr_sleepq.c
==
--- head/lib/libthr/thread/thr_sleepq.c Thu May 10 09:10:31 2012
(r235217)
+++ head/lib/libthr/thread/thr_sleepq.c Thu May 10 09:30:37 2012
(r235218)
@@ -94,19 +94,23 @@ _sleepq_unlock(void *wchan)
THR_LOCK_RELEASE(curthread, &sc->sc_lock);
}
-struct sleepqueue *
-_sleepq_lookup(void *wchan)
+static inline struct sleepqueue *
+lookup(struct sleepqueue_chain *sc, void *wchan)
{
- struct sleepqueue_chain *sc;
struct sleepqueue *sq;
- sc = SC_LOOKUP(wchan);
LIST_FOREACH(sq, &sc->sc_queues, sq_hash)
if (sq->sq_wchan == wchan)
return (sq);
return (NULL);
}
+struct sleepqueue *
+_sleepq_lookup(void *wchan)
+{
+ return (lookup(SC_LOOKUP(wchan), wchan));
+}
+
void
_sleepq_add(void *wchan, struct pthread *td)
{
@@ -114,7 +118,7 @@ _sleepq_add(void *wchan, struct pthread
struct sleepqueue *sq;
sc = SC_LOOKUP(wchan);
- sq = _sleepq_lookup(wchan);
+ sq = lookup(sc, wchan);
if (sq != NULL) {
SLIST_INSERT_HEAD(&sq->sq_freeq, td->sleepqueue, sq_flink);
} else {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235219 - in head/sys/boot/i386: cdboot pxeldr
Author: avg
Date: Thu May 10 09:47:04 2012
New Revision: 235219
URL: http://svn.freebsd.org/changeset/base/235219
Log:
cdboot, pxeldr: make use of bootargs.h instead of redefining flag constants
Reviewed by: jhb
MFC after:1 month
Added:
head/sys/boot/i386/cdboot/cdboot.S
- copied, changed from r235152, head/sys/boot/i386/cdboot/cdboot.s
Deleted:
head/sys/boot/i386/cdboot/cdboot.s
Modified:
head/sys/boot/i386/cdboot/Makefile
head/sys/boot/i386/pxeldr/Makefile
head/sys/boot/i386/pxeldr/pxeldr.S
Modified: head/sys/boot/i386/cdboot/Makefile
==
--- head/sys/boot/i386/cdboot/Makefile Thu May 10 09:30:37 2012
(r235218)
+++ head/sys/boot/i386/cdboot/Makefile Thu May 10 09:47:04 2012
(r235219)
@@ -4,7 +4,9 @@ PROG= cdboot
STRIP=
BINMODE=${NOBINMODE}
NO_MAN=
-SRCS= ${PROG}.s
+SRCS= ${PROG}.S
+
+CFLAGS+=-I${.CURDIR}/../common
ORG= 0x7c00
Copied and modified: head/sys/boot/i386/cdboot/cdboot.S (from r235152,
head/sys/boot/i386/cdboot/cdboot.s)
==
--- head/sys/boot/i386/cdboot/cdboot.s Wed May 9 04:54:50 2012
(r235152, copy source)
+++ head/sys/boot/i386/cdboot/cdboot.S Thu May 10 09:47:04 2012
(r235219)
@@ -40,6 +40,8 @@
# off of.
#
+#include
+
#
# Memory locations.
#
@@ -62,11 +64,6 @@
.set AOUT_ENTRY,0x14# entry point
.set AOUT_HEADER,MEM_PAGE_SIZE # size of the a.out header
#
-# Flags for kargs->bootflags
-#
- .set KARGS_FLAGS_CD,0x1 # flag to indicate booting from
- # CD loader
-#
# Segment selectors.
#
.set SEL_SDATA,0x8 # Supervisor data
Modified: head/sys/boot/i386/pxeldr/Makefile
==
--- head/sys/boot/i386/pxeldr/Makefile Thu May 10 09:30:37 2012
(r235218)
+++ head/sys/boot/i386/pxeldr/Makefile Thu May 10 09:47:04 2012
(r235219)
@@ -23,6 +23,8 @@ CFLAGS+=-DPROBE_KEYBOARD
CFLAGS+=-DALWAYS_SERIAL
.endif
+CFLAGS+=-I${.CURDIR}/../common
+
LOADERBIN= ${.OBJDIR}/../loader/loader.bin
CLEANFILES+= ${BOOT}.tmp
Modified: head/sys/boot/i386/pxeldr/pxeldr.S
==
--- head/sys/boot/i386/pxeldr/pxeldr.S Thu May 10 09:30:37 2012
(r235218)
+++ head/sys/boot/i386/pxeldr/pxeldr.S Thu May 10 09:47:04 2012
(r235219)
@@ -26,6 +26,7 @@
*/
#include
+#include
/*
* Memory locations.
@@ -50,11 +51,6 @@
.set AOUT_ENTRY,0x14# entry point
.set AOUT_HEADER,MEM_PAGE_SIZE # size of the a.out header
/*
- * Flags for kargs->bootflags
- */
- .set KARGS_FLAGS_PXE,0x2# flag to indicate booting from
- # PXE loader
-/*
* Segment selectors.
*/
.set SEL_SDATA,0x8 # Supervisor data
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235222 - in head: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/contrib/opensolaris/uts/common/f...
Author: mm
Date: Thu May 10 10:39:45 2012
New Revision: 235222
URL: http://svn.freebsd.org/changeset/base/235222
Log:
Import illumos changeset 13686:4bc0783f6064
2703 add mechanism to report ZFS send progress
If the zfs send command is used with the -v flag, the amount of bytes
transmitted is reported in per second updates.
References:
https://www.illumos.org/issues/2703
Obtained from:illumos (issue #2703)
MFC after:2 weeks
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
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/zfs/zfs.8
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu May 10 10:16:21 2012
(r235221)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Thu May 10 10:39:45 2012
(r235222)
@@ -20,6 +20,7 @@
.\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
.\" Copyright (c) 2012 by Delphix. All rights reserved.
.\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved.
+.\" Copyright (c) 2012, Joyent, Inc. All rights reserved.
.\" Copyright (c) 2011, Pawel Jakub Dawidek
.\"
.\" $FreeBSD$
@@ -2280,6 +2281,7 @@ flags to determine what data will be sen
Print machine-parsable verbose information about the stream package generated.
.It Fl v
Print verbose information about the stream package generated.
+This information includes a per-second report of how much data has been sent.
.El
.Pp
The format of the stream is committed. You will be able to receive your streams
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cThu May 10 10:16:21
2012(r235221)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cThu May 10 10:39:45
2012(r235222)
@@ -24,6 +24,7 @@
* Copyright 2012 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
* Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2011-2012 Pawel Jakub Dawidek .
* All rights reserved.
* Copyright (c) 2012 Martin Matuska . All rights reserved.
@@ -3590,6 +3591,7 @@ zfs_do_send(int argc, char **argv)
if (flags.verbose)
extraverbose = B_TRUE;
flags.verbose = B_TRUE;
+ flags.progress = B_TRUE;
break;
case 'D':
flags.dedup = B_TRUE;
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.hThu May 10
10:16:21 2012(r235221)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.hThu May 10
10:39:45 2012(r235222)
@@ -25,7 +25,7 @@
* Copyright (c) 2011 Pawel Jakub Dawidek .
* All rights reserved.
* Copyright (c) 2011 by Delphix. All rights reserved.
- * All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2012 Martin Matuska . All rights reserved.
*/
@@ -573,6 +573,9 @@ typedef struct sendflags {
/* parsable verbose output (ie. -P) */
boolean_t parsable;
+
+ /* show progress (ie. -v) */
+ boolean_t progress;
} sendflags_t;
typedef boolean_t (snapfilter_cb_t)(zfs_handle_t *, void *);
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Thu May
10 10:16:21 2012(r235221)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Thu May
10 10:39:45 2012(r235222)
@@ -22,6 +22,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2012 Pawel Jakub Dawidek .
* All rights reserved.
*/
@@ -40,6 +41,7 @@
#include
#include
#incl
svn commit: r235224 - head
Author: imp
Date: Thu May 10 11:06:19 2012
New Revision: 235224
URL: http://svn.freebsd.org/changeset/base/235224
Log:
Do a bit of house cleaning and remove the old, obsolete upgrade from
6.0 support and bump the minimum version to 8.0. These versions have
not been tested and are believed to be broken.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu May 10 10:56:46 2012(r235223)
+++ head/Makefile.inc1 Thu May 10 11:06:19 2012(r235224)
@@ -223,9 +223,6 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
MACHINE_ARCH=${TARGET_ARCH} \
MACHINE=${TARGET} \
CPUTYPE=${TARGET_CPUTYPE}
-.if ${OSRELDATE} < 700044
-CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib
-.endif
.if ${MK_GROFF} != "no"
CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
@@ -981,8 +978,8 @@ update:
# legacy: Build compatibility shims for the next three targets
#
legacy:
-.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0
- @echo "ERROR: Source upgrades from versions prior to 6.0 not
supported."; \
+.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
+ @echo "ERROR: Source upgrades from versions prior to 8.0 not
supported."; \
false
.endif
.for _tool in tools/build
@@ -1010,14 +1007,6 @@ _gperf= gnu/usr.bin/gperf
_groff=gnu/usr.bin/groff
.endif
-.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
-_ar= usr.bin/ar
-.endif
-
-.if ${BOOTSTRAPPING} < 800013
-_mklocale= usr.bin/mklocale
-.endif
-
.if ${BOOTSTRAPPING} < 92
_sed= usr.bin/sed
.endif
@@ -1031,16 +1020,10 @@ _yacc= usr.bin/yacc
_awk= usr.bin/awk
.endif
-.if ${MK_BSNMP} != "no" && \
-(${BOOTSTRAPPING} < 700018 || !exists(/usr/sbin/gensnmptree))
+.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
-.if ${MK_RESCUE} != "no" && \
-${BOOTSTRAPPING} < 700026
-_crunchgen=usr.sbin/crunch/crunchgen
-.endif
-
.if ${MK_CLANG} != "no"
_clang_tblgen= \
lib/clang/libllvmsupport \
@@ -1051,9 +1034,7 @@ _clang_tblgen= \
# dtrace tools are required for older bootstrap env and cross-build
.if ${MK_CDDL} != "no" && \
-((${BOOTSTRAPPING} < 800038 && \
- !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 79)) \
- || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
+(${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
.endif
@@ -1082,20 +1063,17 @@ bootstrap-tools:
${_strfile} \
${_gperf} \
${_groff} \
-${_ar} \
${_dtc} \
${_awk} \
usr.bin/lorder \
usr.bin/makewhatis \
-${_mklocale} \
usr.bin/rpcgen \
${_sed} \
${_lex} \
${_yacc} \
usr.bin/xinstall \
${_gensnmptree} \
-usr.sbin/config \
-${_crunchgen}
+usr.sbin/config
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -1154,7 +1132,7 @@ build-tools:
#
# cross-tools: Build cross-building tools
#
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld=usr.sbin/btxld
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r235209 - head/games/fortune/datfiles
On 5/9/12 6:13 PM, Eitan Adler wrote:
> Author: eadler
> Date: Wed May 9 22:13:56 2012
> New Revision: 235209
> URL: http://svn.freebsd.org/changeset/base/235209
>
> Log:
> Add a few new tips and update some old ones to more modern commands
>
> MFC after: 1 week
>
> Modified:
> head/games/fortune/datfiles/freebsd-tips
>
> Modified: head/games/fortune/datfiles/freebsd-tips
> ==
> --- head/games/fortune/datfiles/freebsd-tips Wed May 9 21:56:10 2012
> (r235208)
> +++ head/games/fortune/datfiles/freebsd-tips Wed May 9 22:13:56 2012
> (r235209)
> @@ -73,8 +73,7 @@ If you need to ask a question on the Fre
>
> contains lots of useful advice to help you get the best results.
> %
> -If you `set filec' (file completion) in tcsh and write a part of the
> -filename, pressing TAB will show you the available choices when there
> +pressing TAB will show you the available choices when there
> is more than one, or complete the filename if there's only one match.
The new version starts off in the middle of a sentence now. I think you
need to put some of this back ("If you write part of a filename in tcsh,
pressing TAB...").
> @@ -192,13 +188,6 @@ flag is your gateway.
> Nice bash prompt: PS1='(\[$(tput md)\]\t <\w>\[$(tput me)\]) $(echo $?) \$ '
> -- Mathieu
> %
> -Nice tcsh prompts:
> - set prompt = '[%B%m%b] %B%~%b%# '
> - set prompt = '%m %# '
> - set prompt = '%n@%m%# '
> - set prompt = '%n@%m:%/%# '
> - set prompt = '%n@%m:%~%# '
> -%
Not sure why you removed this? Even if we changed tcsh's default prompt
recently this lists multiple possible prompts.
> @@ -322,12 +311,12 @@ been replaced with other messages, look
> Want colour in your directory listings? Use "ls -G". "ls -F" is also
> useful,
> and they can be combined as "ls -FG".
> %
> -Want to find a specific port, just type the following under /usr/ports,
> +Want to find a specific port, just type the following
> or one its subdirectories:
>
> - "make search name="
> + "make -C /usr/ports search name="
> or
> - "make search key="
> + "make -C /usr/ports search key="
> %
Eh, I think you should revert this. The make -C thing is more clunky
for a newbie (if you want to do multiple searches, then doing one cd is
less typing than specifying -C each time). Also, the first sentence
about subdirectories is rather broken in the new version. You would
need to make it clear that you replace the argument to -C with a
subdirectory. I think it's not worth it though to add enough detail to
explain it, and that reverting this is probably simpler for a newbie.
--
John Baldwin
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235226 - in head/sys: amd64/conf i386/conf
Author: mav Date: Thu May 10 12:37:32 2012 New Revision: 235226 URL: http://svn.freebsd.org/changeset/base/235226 Log: Add `options GEOM_RAID` into i386 and amd64 GENERIC kernels. ataraid(4) previously was present there and having GEOM RAID is convinient. Unlike other classes GEOM RAID can be set up from BIOS before install and users are expecting it to be detected automatically. Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Thu May 10 11:08:09 2012(r235225) +++ head/sys/amd64/conf/GENERIC Thu May 10 12:37:32 2012(r235226) @@ -44,6 +44,7 @@ options CD9660 # ISO 9660 Filesystem optionsPROCFS # Process filesystem (requires PSEUDOFS) optionsPSEUDOFS# Pseudo-filesystem framework optionsGEOM_PART_GPT # GUID Partition Tables. +optionsGEOM_RAID # Soft RAID functionality. optionsGEOM_LABEL # Provides labelization optionsCOMPAT_FREEBSD32# Compatible with i386 binaries optionsCOMPAT_FREEBSD4 # Compatible with FreeBSD4 Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Thu May 10 11:08:09 2012(r235225) +++ head/sys/i386/conf/GENERIC Thu May 10 12:37:32 2012(r235226) @@ -46,6 +46,7 @@ options CD9660 # ISO 9660 Filesystem optionsPROCFS # Process filesystem (requires PSEUDOFS) optionsPSEUDOFS# Pseudo-filesystem framework optionsGEOM_PART_GPT # GUID Partition Tables. +optionsGEOM_RAID # Soft RAID functionality. optionsGEOM_LABEL # Provides labelization optionsCOMPAT_FREEBSD4 # Compatible with FreeBSD4 optionsCOMPAT_FREEBSD5 # Compatible with FreeBSD5 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r235209 - head/games/fortune/datfiles
On 10 May 2012 07:12, John Baldwin wrote:
> The new version starts off in the middle of a sentence now. I think you
> need to put some of this back ("If you write part of a filename in tcsh,
> pressing TAB...").
hm, good point.
> Not sure why you removed this? Even if we changed tcsh's default prompt
> recently this lists multiple possible prompts.
I added an examples file with a lot more content.
> Eh, I think you should revert this. The make -C thing is more clunky
> for a newbie (if you want to do multiple searches, then doing one cd is
> less typing than specifying -C each time). Also, the first sentence
> about subdirectories is rather broken in the new version. You would
> need to make it clear that you replace the argument to -C with a
> subdirectory. I think it's not worth it though to add enough detail to
> explain it, and that reverting this is probably simpler for a newbie.
Alright.
--
Eitan Adler
Source & Ports committer
X11, Bugbusting teams
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235227 - head/games/fortune/datfiles
Author: eadler Date: Thu May 10 12:46:12 2012 New Revision: 235227 URL: http://svn.freebsd.org/changeset/base/235227 Log: Partial revert of previous commit as some of the changes were not newbie-friendly. Requested by: jhb, gcooper Approved by: cperciva (implicit) MFC after:3 days X-MFC-With: r235209 Modified: head/games/fortune/datfiles/freebsd-tips Modified: head/games/fortune/datfiles/freebsd-tips == --- head/games/fortune/datfiles/freebsd-tipsThu May 10 12:37:32 2012 (r235226) +++ head/games/fortune/datfiles/freebsd-tipsThu May 10 12:46:12 2012 (r235227) @@ -73,6 +73,7 @@ If you need to ask a question on the Fre contains lots of useful advice to help you get the best results. % +If you write part of a filename in tcsh, pressing TAB will show you the available choices when there is more than one, or complete the filename if there's only one match. % @@ -311,12 +312,12 @@ been replaced with other messages, look Want colour in your directory listings? Use "ls -G". "ls -F" is also useful, and they can be combined as "ls -FG". % -Want to find a specific port, just type the following +Want to find a specific port, just type the following under /usr/ports or one its subdirectories: - "make -C /usr/ports search name=" + "make search name=" or - "make -C /usr/ports search key=" + "make search key=" % Want to know how many words, lines, or bytes are contained in a file? Type "wc filename". @@ -472,5 +473,5 @@ Want to run the same command again? In tcsh you can type "!!" % Want to go the directory you were just in? -In tcsh you can type "cd -" +Type "cd -" % ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235228 - head/usr.sbin/bsdinstall/scripts
Author: roberto Date: Thu May 10 13:30:42 2012 New Revision: 235228 URL: http://svn.freebsd.org/changeset/base/235228 Log: Add the IPv6 tag to ftp4.fr.freebsd.org. Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect == --- head/usr.sbin/bsdinstall/scripts/mirrorselect Thu May 10 12:46:12 2012(r235227) +++ head/usr.sbin/bsdinstall/scripts/mirrorselect Thu May 10 13:30:42 2012(r235228) @@ -87,7 +87,7 @@ MIRROR=`dialog --backtitle "FreeBSD Inst ftp://ftp.fr.freebsd.org"France"\ ftp://ftp2.fr.freebsd.org "IPv6 France #2"\ ftp://ftp3.fr.freebsd.org "France #3"\ - ftp://ftp4.fr.freebsd.org "France #4"\ + ftp://ftp4.fr.freebsd.org "IPv6 France #4"\ ftp://ftp5.fr.freebsd.org "France #5"\ ftp://ftp6.fr.freebsd.org "France #6"\ ftp://ftp8.fr.freebsd.org "IPv6 France #8"\ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235229 - head/sys/dev/hwpmc
Author: fabient
Date: Thu May 10 14:27:49 2012
New Revision: 235229
URL: http://svn.freebsd.org/changeset/base/235229
Log:
Remove out of date KASSERT that fire with soft PMC.
MFC after:1 week
Modified:
head/sys/dev/hwpmc/hwpmc_intel.c
Modified: head/sys/dev/hwpmc/hwpmc_intel.c
==
--- head/sys/dev/hwpmc/hwpmc_intel.cThu May 10 13:30:42 2012
(r235228)
+++ head/sys/dev/hwpmc/hwpmc_intel.cThu May 10 14:27:49 2012
(r235229)
@@ -196,10 +196,6 @@ pmc_intel_initialize(void)
case PMC_CPU_INTEL_PIV:
error = pmc_p4_initialize(pmc_mdep, ncpus);
-
- KASSERT(pmc_mdep->pmd_npmc == TSC_NPMCS + P4_NPMCS,
- ("[intel,%d] incorrect npmc count %d", __LINE__,
- pmc_mdep->pmd_npmc));
break;
#endif
@@ -214,10 +210,6 @@ pmc_intel_initialize(void)
case PMC_CPU_INTEL_PIII:
case PMC_CPU_INTEL_PM:
error = pmc_p6_initialize(pmc_mdep, ncpus);
-
- KASSERT(pmc_mdep->pmd_npmc == TSC_NPMCS + P6_NPMCS,
- ("[intel,%d] incorrect npmc count %d", __LINE__,
- pmc_mdep->pmd_npmc));
break;
/*
@@ -226,10 +218,6 @@ pmc_intel_initialize(void)
case PMC_CPU_INTEL_P5:
error = pmc_p5_initialize(pmc_mdep, ncpus);
-
- KASSERT(pmc_mdep->pmd_npmc == TSC_NPMCS + PENTIUM_NPMCS,
- ("[intel,%d] incorrect npmc count %d", __LINE__,
- pmc_mdep->pmd_npmc));
break;
#endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235230 - head/sys/vm
Author: alc
Date: Thu May 10 15:16:42 2012
New Revision: 235230
URL: http://svn.freebsd.org/changeset/base/235230
Log:
Give vm_fault()'s sequential access optimization a makeover.
There are two aspects to the sequential access optimization: (1) read ahead
of pages that are expected to be accessed in the near future and (2) unmap
and cache behind of pages that are not expected to be accessed again. This
revision changes both aspects.
The read ahead optimization is now more effective. It starts with the same
initial read window as before, but arithmetically grows the window on
sequential page faults. This can yield increased read bandwidth. For
example, on one of my machines, a program using mmap() to read a file that
is several times larger than the machine's physical memory takes about 17%
less time to complete.
The unmap and cache behind optimization is now more selectively applied.
The read ahead window must grow to its maximum size before unmap and cache
behind is performed. This significantly reduces the number of times that
pages are unmapped and cached only to be reactivated a short time later.
The unmap and cache behind optimization now clears each page's referenced
flag. Previously, in the case of dirty pages, if the containing file was
still mapped at the time that the page daemon examined the dirty pages,
they would be reactivated.
From a stylistic standpoint, this revision also cleanly separates the
implementation of the read ahead and unmap/cache behind optimizations.
Glanced at: kib
MFC after:2 weeks
Modified:
head/sys/vm/vm_fault.c
head/sys/vm/vm_map.c
head/sys/vm/vm_map.h
Modified: head/sys/vm/vm_fault.c
==
--- head/sys/vm/vm_fault.c Thu May 10 14:27:49 2012(r235229)
+++ head/sys/vm/vm_fault.c Thu May 10 15:16:42 2012(r235230)
@@ -118,9 +118,11 @@ static int prefault_pageorder[] = {
static int vm_fault_additional_pages(vm_page_t, int, int, vm_page_t *, int *);
static void vm_fault_prefault(pmap_t, vm_offset_t, vm_map_entry_t);
-#define VM_FAULT_READ_AHEAD 8
-#define VM_FAULT_READ_BEHIND 7
-#define VM_FAULT_READ (VM_FAULT_READ_AHEAD+VM_FAULT_READ_BEHIND+1)
+#defineVM_FAULT_READ_BEHIND8
+#defineVM_FAULT_READ_MAX (1 + VM_FAULT_READ_AHEAD_MAX)
+#defineVM_FAULT_NINCR (VM_FAULT_READ_MAX /
VM_FAULT_READ_BEHIND)
+#defineVM_FAULT_SUM(VM_FAULT_NINCR * (VM_FAULT_NINCR + 1)
/ 2)
+#defineVM_FAULT_CACHE_BEHIND (VM_FAULT_READ_BEHIND * VM_FAULT_SUM)
struct faultstate {
vm_page_t m;
@@ -136,6 +138,8 @@ struct faultstate {
int vfslocked;
};
+static void vm_fault_cache_behind(const struct faultstate *fs, int distance);
+
static inline void
release_page(struct faultstate *fs)
{
@@ -236,13 +240,13 @@ vm_fault_hold(vm_map_t map, vm_offset_t
int fault_flags, vm_page_t *m_hold)
{
vm_prot_t prot;
- int is_first_object_locked, result;
- boolean_t growstack, wired;
+ long ahead, behind;
+ int alloc_req, era, faultcount, nera, reqpage, result;
+ boolean_t growstack, is_first_object_locked, wired;
int map_generation;
vm_object_t next_object;
- vm_page_t marray[VM_FAULT_READ], mt, mt_prev;
+ vm_page_t marray[VM_FAULT_READ_MAX];
int hardfault;
- int faultcount, ahead, behind, alloc_req;
struct faultstate fs;
struct vnode *vp;
int locked, error;
@@ -252,7 +256,7 @@ vm_fault_hold(vm_map_t map, vm_offset_t
PCPU_INC(cnt.v_vm_faults);
fs.vp = NULL;
fs.vfslocked = 0;
- faultcount = behind = 0;
+ faultcount = reqpage = 0;
RetryFault:;
@@ -460,75 +464,47 @@ readrest:
*/
if (TRYPAGER) {
int rv;
- int reqpage = 0;
u_char behavior = vm_map_entry_behavior(fs.entry);
if (behavior == MAP_ENTRY_BEHAV_RANDOM ||
P_KILLED(curproc)) {
+ behind = 0;
ahead = 0;
+ } else if (behavior == MAP_ENTRY_BEHAV_SEQUENTIAL) {
behind = 0;
+ ahead = atop(fs.entry->end - vaddr) - 1;
+ if (ahead > VM_FAULT_READ_AHEAD_MAX)
+ ahead = VM_FAULT_READ_AHEAD_MAX;
+ if (fs.pindex == fs.entry->next_read)
+ vm_fault_cache_behind(&fs,
+ VM_FAULT_READ_MAX);
} else {
- behind = (vaddr - fs.entry->start) >>
PAGE_SHIFT;
- if (behind > VM_FAULT_READ_BEHIND)
-
svn commit: r235231 - in head/sys/sparc64: include sparc64
Author: marius
Date: Thu May 10 15:17:21 2012
New Revision: 235231
URL: http://svn.freebsd.org/changeset/base/235231
Log:
Merge r234989 from x86:
Revert part of r234723 by re-enabling the SMP protection for intr_bind().
Modified:
head/sys/sparc64/include/intr_machdep.h
head/sys/sparc64/sparc64/intr_machdep.c
Modified: head/sys/sparc64/include/intr_machdep.h
==
--- head/sys/sparc64/include/intr_machdep.h Thu May 10 15:16:42 2012
(r235230)
+++ head/sys/sparc64/include/intr_machdep.h Thu May 10 15:17:21 2012
(r235231)
@@ -91,8 +91,10 @@ struct intr_vector {
extern ih_func_t *intr_handlers[];
extern struct intr_vector intr_vectors[];
+#ifdef SMP
void intr_add_cpu(u_int cpu);
intintr_bind(int vec, u_char cpu);
+#endif
intintr_describe(int vec, void *ih, const char *descr);
void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf,
void *iva);
Modified: head/sys/sparc64/sparc64/intr_machdep.c
==
--- head/sys/sparc64/sparc64/intr_machdep.c Thu May 10 15:16:42 2012
(r235230)
+++ head/sys/sparc64/sparc64/intr_machdep.c Thu May 10 15:17:21 2012
(r235231)
@@ -555,15 +555,6 @@ intr_shuffle_irqs(void *arg __unused)
SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs,
NULL);
#else /* !SMP */
-
-/* Return EOPNOTSUPP in the UP case. */
-int
-intr_bind(int vec __unused, u_char cpu __unused)
-{
-
- return (EOPNOTSUPP);
-}
-
/* Use an empty stub for compatibility. */
void
intr_add_cpu(u_int cpu __unused)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235232 - head/sys/sparc64/include
Author: marius
Date: Thu May 10 15:23:20 2012
New Revision: 235232
URL: http://svn.freebsd.org/changeset/base/235232
Log:
Fix mismerge in r235231.
Modified:
head/sys/sparc64/include/intr_machdep.h
Modified: head/sys/sparc64/include/intr_machdep.h
==
--- head/sys/sparc64/include/intr_machdep.h Thu May 10 15:17:21 2012
(r235231)
+++ head/sys/sparc64/include/intr_machdep.h Thu May 10 15:23:20 2012
(r235232)
@@ -91,8 +91,8 @@ struct intr_vector {
extern ih_func_t *intr_handlers[];
extern struct intr_vector intr_vectors[];
-#ifdef SMP
void intr_add_cpu(u_int cpu);
+#ifdef SMP
intintr_bind(int vec, u_char cpu);
#endif
intintr_describe(int vec, void *ih, const char *descr);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235233 - in head/sys: conf dev/ral modules/ral
Author: bschmidt
Date: Thu May 10 17:41:16 2012
New Revision: 235233
URL: http://svn.freebsd.org/changeset/base/235233
Log:
Add support for Ralink RT2800/RT3000 chipsets.
Thanks to ray@, Sevan and Sergey Dyatko for feedback and testing!
Obtained from:OpenBSD
MFC after:3 weeks
Added:
head/sys/dev/ral/rt2860.c (contents, props changed)
head/sys/dev/ral/rt2860reg.h (contents, props changed)
head/sys/dev/ral/rt2860var.h (contents, props changed)
Modified:
head/sys/conf/files
head/sys/dev/ral/if_ral_pci.c
head/sys/modules/ral/Makefile
Modified: head/sys/conf/files
==
--- head/sys/conf/files Thu May 10 15:23:20 2012(r235232)
+++ head/sys/conf/files Thu May 10 17:41:16 2012(r235233)
@@ -1759,6 +1759,7 @@ dev/puc/pucdata.c optional puc pci
dev/quicc/quicc_core.c optional quicc
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
+dev/ral/rt2860.c optional ral
dev/ral/if_ral_pci.c optional ral pci
rt2561fw.c optional rt2561fw | ralfw \
compile-with"${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw
-mrt2561 -c${.TARGET}" \
Modified: head/sys/dev/ral/if_ral_pci.c
==
--- head/sys/dev/ral/if_ral_pci.c Thu May 10 15:23:20 2012
(r235232)
+++ head/sys/dev/ral/if_ral_pci.c Thu May 10 17:41:16 2012
(r235233)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
MODULE_DEPEND(ral, pci, 1, 1, 1);
MODULE_DEPEND(ral, firmware, 1, 1, 1);
@@ -70,11 +71,37 @@ struct ral_pci_ident {
};
static const struct ral_pci_ident ral_pci_ids[] = {
+ { 0x1432, 0x7708, "Edimax RT2860" },
+ { 0x1432, 0x7711, "Edimax RT3591" },
+ { 0x1432, 0x7722, "Edimax RT3591" },
+ { 0x1432, 0x7727, "Edimax RT2860" },
+ { 0x1432, 0x7728, "Edimax RT2860" },
+ { 0x1432, 0x7738, "Edimax RT2860" },
+ { 0x1432, 0x7748, "Edimax RT2860" },
+ { 0x1432, 0x7758, "Edimax RT2860" },
+ { 0x1432, 0x7768, "Edimax RT2860" },
+ { 0x1462, 0x891a, "MSI RT3090" },
{ 0x1814, 0x0201, "Ralink Technology RT2560" },
{ 0x1814, 0x0301, "Ralink Technology RT2561S" },
{ 0x1814, 0x0302, "Ralink Technology RT2561" },
{ 0x1814, 0x0401, "Ralink Technology RT2661" },
-
+ { 0x1814, 0x0601, "Ralink Technology RT2860" },
+ { 0x1814, 0x0681, "Ralink Technology RT2890" },
+ { 0x1814, 0x0701, "Ralink Technology RT2760" },
+ { 0x1814, 0x0781, "Ralink Technology RT2790" },
+ { 0x1814, 0x3060, "Ralink Technology RT3060" },
+ { 0x1814, 0x3062, "Ralink Technology RT3062" },
+ { 0x1814, 0x3090, "Ralink Technology RT3090" },
+ { 0x1814, 0x3091, "Ralink Technology RT3091" },
+ { 0x1814, 0x3092, "Ralink Technology RT3092" },
+ { 0x1814, 0x3390, "Ralink Technology RT3390" },
+ { 0x1814, 0x3562, "Ralink Technology RT3562" },
+ { 0x1814, 0x3592, "Ralink Technology RT3592" },
+ { 0x1814, 0x3593, "Ralink Technology RT3593" },
+ { 0x1814, 0x5390, "Ralink Technology RT5390" },
+ { 0x1814, 0x539a, "Ralink Technology RT5390" },
+ { 0x1814, 0x539f, "Ralink Technology RT5390" },
+ { 0x1a3b, 0x1059, "AWT RT2890" },
{ 0, 0, NULL }
};
@@ -101,12 +128,20 @@ static struct ral_opns {
rt2661_suspend,
rt2661_resume,
rt2661_intr
+}, ral_rt2860_opns = {
+ rt2860_attach,
+ rt2860_detach,
+ rt2860_shutdown,
+ rt2860_suspend,
+ rt2860_resume,
+ rt2860_intr
};
struct ral_pci_softc {
union {
struct rt2560_softc sc_rt2560;
struct rt2661_softc sc_rt2661;
+ struct rt2860_softc sc_rt2860;
} u;
struct ral_opns *sc_opns;
@@ -180,8 +215,19 @@ ral_pci_attach(device_t dev)
/* enable bus-mastering */
pci_enable_busmaster(dev);
- psc->sc_opns = (pci_get_device(dev) == 0x0201) ? &ral_rt2560_opns :
- &ral_rt2661_opns;
+ switch (pci_get_device(dev)) {
+ case 0x0201:
+ psc->sc_opns = &ral_rt2560_opns;
+ break;
+ case 0x0301:
+ case 0x0302:
+ case 0x0401:
+ psc->sc_opns = &ral_rt2661_opns;
+ break;
+ default:
+ psc->sc_opns = &ral_rt2860_opns;
+ break;
+ }
psc->mem_rid = RAL_PCI_BAR0;
psc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &psc->mem_rid,
Added: head/sys/dev/ral/rt2860.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/ral/rt2860.c Thu May 10 17:41:16 2012(r235233)
@@ -0,0 +1,4103 @@
+/*-
+ * Copyrig
svn commit: r235234 - in head/sys: arm/conf conf
Author: imp
Date: Thu May 10 18:06:00 2012
New Revision: 235234
URL: http://svn.freebsd.org/changeset/base/235234
Log:
Generate board id's from Linux's mach-types database for all arm
ports. This currently is a nop, but will soon be used to allow
support for multiple boards to be built into one kernel (starting with
AT91RM9200 and expanding out from there).
Added:
head/sys/arm/conf/genboardid.awk (contents, props changed)
head/sys/arm/conf/mach-types (contents, props changed)
Modified:
head/sys/conf/files.arm
Added: head/sys/arm/conf/genboardid.awk
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/conf/genboardid.awkThu May 10 18:06:00 2012
(r235234)
@@ -0,0 +1,55 @@
+#!/bin/awk
+# $FreeBSD$
+
+#-
+# Copyright (c) 2012 M. Warner Losh. 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.
+#
+
+#
+# Generate FreeBSD's board ID's defines from Linux's
+# arm board list.
+#
+# You can grab a new copy any time with:
+# fetch -o sys/arm/conf/mach-types
http://www.arm.linux.org.uk/developer/machines/download.php
+#
+BEGIN { nr = 0; boardid[nr] = "ARM_BOARD_ID_NONE"; num[nr++] = 0; }
+/^#/ { next; }
+/^[ ]*$/ { next; }
+
+NF == 4 {
+boardid[nr] = "ARM_BOARD_ID_"$3;
+num[nr] = $4;
+nr++
+}
+
+END{
+printf("/* Arm board ID file generated automatically from Linux's
mach-types file. */\n\n");
+printf("#ifndef _SYS_ARM_ARM_BOARDID_H\n");
+printf("#define _SYS_ARM_ARM_BOARDID_H\n\n");
+for (i = 0; i < nr; i++) {
+printf("#define %-30s %d\n", boardid[i], num[i]);
+}
+printf("\n#endif /* _SYS_ARM_ARM_BOARDID_H */\n");
+}
+
Added: head/sys/arm/conf/mach-types
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/conf/mach-typesThu May 10 18:06:00 2012
(r235234)
@@ -0,0 +1,4146 @@
+# Database of machine macros and numbers
+#
+# This file is linux/arch/arm/tools/mach-types
+#
+# Up to date versions of this file can be obtained from:
+#
+# http://www.arm.linux.org.uk/developer/machines/download.php
+#
+# Please do not send patches to this file; it is automatically generated!
+# To add an entry into this database, please see Documentation/arm/README,
+# or visit:
+#
+# http://www.arm.linux.org.uk/developer/machines/?action=new
+#
+# Last update: Thu May 10 18:35:23 2012
+#
+# machine_is_xxx CONFIG_ MACH_TYPE_xxx number
+#
+ebsa110ARCH_EBSA110EBSA110 0
+riscpc ARCH_RPCRISCPC 1
+nexuspci ARCH_NEXUSPCI NEXUSPCI3
+ebsa285ARCH_EBSA285EBSA285
4
+netwinder ARCH_NETWINDER NETWINDER 5
+cats ARCH_CATS CATS6
+tbox ARCH_TBOX TBOX7
+co285 ARCH_CO285 CO285 8
+clps7110 ARCH_CLPS7110 CLPS71109
+archimedes ARCH_ARCARCHIMEDES 10
+a5kARCH_A5KA5K 11
+etoile ARCH_ETOILE ETOILE 12
+lacie_nas ARCH_LACIE_NAS LACIE_NAS 13
+clps7500 ARCH_CLPS7500 CLPS750014
+shark ARCH_SHARK SHARK 15
svn commit: r235235 - head/share/man/man4
Author: bschmidt Date: Thu May 10 18:10:20 2012 New Revision: 235235 URL: http://svn.freebsd.org/changeset/base/235235 Log: Update man page due import of RT2800/RT3000 support. Obtained from:OpenBSD MFC after:3 weeks Modified: head/share/man/man4/ral.4 Modified: head/share/man/man4/ral.4 == --- head/share/man/man4/ral.4 Thu May 10 18:06:00 2012(r235234) +++ head/share/man/man4/ral.4 Thu May 10 18:10:20 2012(r235235) @@ -1,5 +1,4 @@ -.\" Copyright (c) 2005, 2006 -.\" Damien Bergamini +.\" Copyright (c) 2005-2010 Damien Bergamini .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -15,12 +14,12 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2009 +.Dd May 10, 2012 .Dt RAL 4 .Os .Sh NAME .Nm ral -.Nd "Ralink Technology IEEE 802.11 wireless network driver" +.Nd "Ralink Technology IEEE 802.11a/g/n wireless network device" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -42,31 +41,43 @@ if_ral_load="YES" .Sh DESCRIPTION The .Nm -driver supports PCI/CardBus wireless adapters based on the Ralink Technology -RT2500, RT2501, and RT2600 chipsets. +driver supports PCI/PCIe/CardBus wireless adapters based on the Ralink RT2500, +RT2501, RT2600, RT2700, RT2800 and RT3090 chipsets. .Pp The RT2500 chipset is the first generation of 802.11b/g adapters from Ralink. -It consists of two integrated chips, a RT2560 MAC/BBP and a RT2525 radio +It consists of two integrated chips, an RT2560 MAC/BBP and an RT2525 radio transceiver. .Pp -The RT2501 chipset is the second generation of 802.11b/g adapters from Ralink. -It consists of two integrated chips, a RT2561 MAC/BBP and a RT2527 radio +The RT2501 chipset is the second generation of 802.11a/b/g adapters from +Ralink. +It consists of two integrated chips, an RT2561 MAC/BBP and an RT2527 radio transceiver. This chipset provides support for the IEEE 802.11e standard with multiple hardware transmission queues and allows scatter/gather for efficient DMA operations. .Pp -The RT2600 chipset consists of two integrated chips, a RT2661 MAC/BBP and a +The RT2600 chipset consists of two integrated chips, an RT2661 MAC/BBP and an RT2529 radio transceiver. This chipset uses the MIMO (multiple-input multiple-output) technology with -multiple antennas to extend the operating range of the adapter and to achieve -higher throughput. -MIMO is the basis of the forthcoming IEEE 802.11n standard. -.Pp -The transmit speed is user-selectable or can be adapted automatically by the -driver depending on the received signal strength and on the number of hardware -transmission retries. +multiple radio transceivers to extend the operating range of the adapter and +to achieve higher throughput. +However, the RT2600 chipset does not support any of the 802.11n features. +.Pp +The RT2700 chipset is a low-cost version of the RT2800 chipset. +It supports a single transmit path and two receiver paths (1T2R). +It consists of two integrated chips, an RT2760 or RT2790 (PCIe) MAC/BBP and +an RT2720 (2.4GHz) or RT2750 (2.4GHz/5GHz) radio transceiver. +.Pp +The RT2800 chipset is the first generation of 802.11n adapters from Ralink. +It consists of two integrated chips, an RT2860 or RT2890 (PCIe) MAC/BBP and +an RT2820 (2.4GHz) or RT2850 (2.4GHz/5GHz) radio transceiver. +The RT2800 chipset supports two transmit paths and up to three receiver +paths (2T2R/2T3R). +It can achieve speeds up to 144Mbps (20MHz bandwidth) and 300Mbps (40MHz +bandwidth.) .Pp +The RT3090 chipset is the first generation of single-chip 802.11n adapters +from Ralink. .Nm supports .Cm station , @@ -92,13 +103,16 @@ Multiple interfaces may be operated together with a .Cm hostap interface to construct a wireless repeater device. +.Pp +The transmit speed is user-selectable or can be adapted automatically by the +driver depending on the number of hardware transmission retries. For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE The .Nm -driver supports PCI/CardBus wireless adapters based on the Ralink Technology -RT2500, RT2501, and RT2600 chipsets, including: +driver supports PCI/PCIe/CardBus wireless adapters based on Ralink Technology +chipsets, including: .Pp .Bl -column -compact ".Li Atlantis Land A02-PCM-W54" "RT2561S" "CardBus" .It Em Card Ta Em MAC/BBP Ta Em Bus @@ -188,9 +202,6 @@ RT2500, RT2501, and RT2600 chipsets, inc .It "Zonet ZEW1500" Ta RT2560 Ta CardBus .It "Zonet ZEW1600" Ta RT2560 Ta PCI .El -.Pp -An up to date list can be found at -.Pa http://damien.bergamini.free.fr/ral/list.html . .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp @@ -239,6 +250,7 @@ This should not happen. .Xr hostapd 8 , .Xr ifconfig 8 , .Xr wpa_supplicant 8 . +.Xr ifconfig 8 .Rs .%T "Ralink Tech
svn commit: r235236 - head/share/man/man4
Author: bschmidt Date: Thu May 10 18:14:25 2012 New Revision: 235236 URL: http://svn.freebsd.org/changeset/base/235236 Log: ifconfig(8) is important, but no need to mention it twice. MFC after:3 weeks Modified: head/share/man/man4/ral.4 Modified: head/share/man/man4/ral.4 == --- head/share/man/man4/ral.4 Thu May 10 18:10:20 2012(r235235) +++ head/share/man/man4/ral.4 Thu May 10 18:14:25 2012(r235236) @@ -250,7 +250,6 @@ This should not happen. .Xr hostapd 8 , .Xr ifconfig 8 , .Xr wpa_supplicant 8 . -.Xr ifconfig 8 .Rs .%T "Ralink Technology" .%U http://www.ralinktech.com/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235237 - head/share/man/man4
Author: bschmidt Date: Thu May 10 18:25:59 2012 New Revision: 235237 URL: http://svn.freebsd.org/changeset/base/235237 Log: remove trailing '.' Poked by: gjb MFC after:3 weeks Modified: head/share/man/man4/ral.4 Modified: head/share/man/man4/ral.4 == --- head/share/man/man4/ral.4 Thu May 10 18:14:25 2012(r235236) +++ head/share/man/man4/ral.4 Thu May 10 18:25:59 2012(r235237) @@ -249,7 +249,7 @@ This should not happen. .Xr wlan_xauth 4 , .Xr hostapd 8 , .Xr ifconfig 8 , -.Xr wpa_supplicant 8 . +.Xr wpa_supplicant 8 .Rs .%T "Ralink Technology" .%U http://www.ralinktech.com/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235238 - in head/contrib/jemalloc: . doc include/jemalloc include/jemalloc/internal src
Author: jasone Date: Thu May 10 18:29:40 2012 New Revision: 235238 URL: http://svn.freebsd.org/changeset/base/235238 Log: Import jemalloc 37b6f95dcd866f51c91488531a2efc3ed4c2b754 (dev branch, prior to 3.0.0 release). This version is likely very close to what will be 3.0.0. Modified: head/contrib/jemalloc/ChangeLog head/contrib/jemalloc/FREEBSD-Xlist head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/VERSION head/contrib/jemalloc/doc/jemalloc.3 head/contrib/jemalloc/include/jemalloc/internal/arena.h head/contrib/jemalloc/include/jemalloc/internal/atomic.h head/contrib/jemalloc/include/jemalloc/internal/ctl.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h head/contrib/jemalloc/include/jemalloc/internal/mutex.h head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h head/contrib/jemalloc/include/jemalloc/internal/prof.h head/contrib/jemalloc/include/jemalloc/internal/tcache.h head/contrib/jemalloc/include/jemalloc/internal/tsd.h head/contrib/jemalloc/include/jemalloc/internal/util.h head/contrib/jemalloc/include/jemalloc/jemalloc.h head/contrib/jemalloc/include/jemalloc/jemalloc_defs.h head/contrib/jemalloc/src/arena.c head/contrib/jemalloc/src/chunk.c head/contrib/jemalloc/src/chunk_mmap.c head/contrib/jemalloc/src/ctl.c head/contrib/jemalloc/src/huge.c head/contrib/jemalloc/src/jemalloc.c head/contrib/jemalloc/src/mutex.c head/contrib/jemalloc/src/prof.c head/contrib/jemalloc/src/quarantine.c head/contrib/jemalloc/src/stats.c head/contrib/jemalloc/src/tcache.c head/contrib/jemalloc/src/tsd.c head/contrib/jemalloc/src/util.c Modified: head/contrib/jemalloc/ChangeLog == --- head/contrib/jemalloc/ChangeLog Thu May 10 18:25:59 2012 (r235237) +++ head/contrib/jemalloc/ChangeLog Thu May 10 18:29:40 2012 (r235238) @@ -19,9 +19,10 @@ found in the git revision history: New features: - Implement Valgrind support, redzones, and quarantine. - - Add support for additional operating systems: + - Add support for additional platforms: + FreeBSD + Mac OS X Lion ++ MinGW - Add support for additional architectures: + MIPS + SH4 @@ -64,18 +65,24 @@ found in the git revision history: - Remove the --enable-sysv configure option. Bug fixes: - - Fix fork-related bugs that could cause deadlock in children between fork -and exec. - Fix a statistics-related bug in the "thread.arena" mallctl that could cause invalid statistics and crashes. - - Work around TLS dallocation via free() on Linux. This bug could cause + - Work around TLS deallocation via free() on Linux. This bug could cause write-after-free memory corruption. + - Fix a potential deadlock that could occur during interval- and +growth-triggered heap profile dumps. - Fix chunk_alloc_dss() to stop claiming memory is zeroed. This bug could cause memory corruption and crashes with --enable-dss specified. + - Fix fork-related bugs that could cause deadlock in children between fork +and exec. - Fix malloc_stats_print() to honor 'b' and 'l' in the opts parameter. - Fix realloc(p, 0) to act like free(p). - Do not enforce minimum alignment in memalign(). - Check for NULL pointer in malloc_usable_size(). + - Fix an off-by-one heap profile statistics bug that could be observed in +interval- and growth-triggered heap profiles. + - Fix the "epoch" mallctl to update cached stats even if the passed in epoch +is 0. - Fix bin->runcur management to fix a layout policy bug. This bug did not affect correctness. - Fix a bug in choose_arena_hard() that potentially caused more arenas to be Modified: head/contrib/jemalloc/FREEBSD-Xlist == --- head/contrib/jemalloc/FREEBSD-Xlist Thu May 10 18:25:59 2012 (r235237) +++ head/contrib/jemalloc/FREEBSD-Xlist Thu May 10 18:29:40 2012 (r235238) @@ -18,6 +18,7 @@ include/jemalloc/internal/jemalloc_inter include/jemalloc/internal/size_classes.sh include/jemalloc/jemalloc.h.in include/jemalloc/jemalloc_defs.h.in +include/msvc_compat/ install-sh src/zone.c test/ Modified: head/contrib/jemalloc/FREEBSD-diffs == --- head/contrib/jemalloc/FREEBSD-diffs Thu May 10 18:25:59 2012 (r235237) +++ head/contrib/jemalloc/FREEBSD-diffs Thu May 10 18:29:40 2012 (r235238) @@ -1,5 +1,5 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index e8a5722..cec85b5 100644 +index 93c16dc..b5c5595 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in @@ -51,12 +51,23 @@ @@ -27,7 +27,7 @@ index e8a5722..cec85b5 100644 Standard API -@@ -2091,4 +2102,16 @@ malloc_conf = "lg_chunk:24";]]> +@@ -2101,4 +2112,16 @@ malloc_conf = "lg_c
svn commit: r235239 - head/lib/libc/locale
Author: dim
Date: Thu May 10 20:03:34 2012
New Revision: 235239
URL: http://svn.freebsd.org/changeset/base/235239
Log:
Fix copy/paste error in lib/libc/locale/toupper.c.
Submitted by: Kohji Okuno
Modified:
head/lib/libc/locale/toupper.c
Modified: head/lib/libc/locale/toupper.c
==
--- head/lib/libc/locale/toupper.c Thu May 10 18:29:40 2012
(r235238)
+++ head/lib/libc/locale/toupper.c Thu May 10 20:03:34 2012
(r235239)
@@ -51,7 +51,7 @@ ___toupper_l(c, l)
{
size_t lim;
FIX_LOCALE(l);
- _RuneRange *rr = &XLOCALE_CTYPE(l)->runes->__maplower_ext;
+ _RuneRange *rr = &XLOCALE_CTYPE(l)->runes->__mapupper_ext;
_RuneEntry *base, *re;
if (c < 0 || c == EOF)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235241 - head/sys/fs/ext2fs
Author: pluknet
Date: Thu May 10 20:28:33 2012
New Revision: 235241
URL: http://svn.freebsd.org/changeset/base/235241
Log:
Fix mount interlock oversights from the previous change in r234386.
Reported by: dougb
Submitted by: Mateusz Guzik
Reviewed by: Kirk McKusick
Tested by:pho
Modified:
head/sys/fs/ext2fs/ext2_vfsops.c
Modified: head/sys/fs/ext2fs/ext2_vfsops.c
==
--- head/sys/fs/ext2fs/ext2_vfsops.cThu May 10 20:13:24 2012
(r235240)
+++ head/sys/fs/ext2fs/ext2_vfsops.cThu May 10 20:28:33 2012
(r235241)
@@ -830,7 +830,6 @@ ext2_sync(struct mount *mp, int waitfor)
/*
* Write back each (modified) inode.
*/
- MNT_ILOCK(mp);
loop:
MNT_VNODE_FOREACH_ALL(vp, mp, mvp) {
if (vp->v_type == VNON) {
@@ -847,7 +846,6 @@ loop:
}
error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, td);
if (error) {
- MNT_ILOCK(mp);
if (error == ENOENT) {
MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp);
goto loop;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235246 - head/sys/nfsclient
Author: mckusick
Date: Thu May 10 21:38:48 2012
New Revision: 235246
URL: http://svn.freebsd.org/changeset/base/235246
Log:
Fix mount mutex handling missed in r234386.
Modified:
head/sys/nfsclient/nfs_subs.c
Modified: head/sys/nfsclient/nfs_subs.c
==
--- head/sys/nfsclient/nfs_subs.c Thu May 10 21:22:59 2012
(r235245)
+++ head/sys/nfsclient/nfs_subs.c Thu May 10 21:38:48 2012
(r235246)
@@ -865,7 +865,6 @@ nfs_clearcommit(struct mount *mp)
struct buf *bp, *nbp;
struct bufobj *bo;
- MNT_ILOCK(mp);
MNT_VNODE_FOREACH_ALL(vp, mp, nvp) {
bo = &vp->v_bufobj;
vholdl(vp);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235251 - head/share/syscons/keymaps
Author: eadler
Date: Thu May 10 23:38:34 2012
New Revision: 235251
URL: http://svn.freebsd.org/changeset/base/235251
Log:
Add Spanish Dvorak keyboard model to syscons.
(not verified to be accurate)
PR: conf/160235
Submitted by: Alvaro
Approved by: cperciva
MFC after:3 weeks
Added:
head/share/syscons/keymaps/spanish.dvorak.kbd (contents, props changed)
Modified:
head/share/syscons/keymaps/Makefile
Modified: head/share/syscons/keymaps/Makefile
==
--- head/share/syscons/keymaps/Makefile Thu May 10 22:38:15 2012
(r235250)
+++ head/share/syscons/keymaps/Makefile Thu May 10 23:38:34 2012
(r235251)
@@ -36,6 +36,7 @@ FILES=INDEX.keymaps \
ru.cp866.kbd ru.iso5.kbd \
si.iso.kbd \
sk.iso2.kbd \
+ spanish.dvorak.kbd \
spanish.iso.kbd spanish.iso.acc.kbd spanish.iso15.acc.kbd \
swedish.iso.kbd swedish.cp850.kbd \
swissfrench.iso.kbd swissfrench.iso.acc.kbd swissfrench.cp850.kbd \
Added: head/share/syscons/keymaps/spanish.dvorak.kbd
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/syscons/keymaps/spanish.dvorak.kbd Thu May 10 23:38:34
2012(r235251)
@@ -0,0 +1,139 @@
+# $FreeBSD$
+# alt
+# scan cntrl altalt cntrl lock
+# code base shift cntrl shift altshift cntrl shift state
+# --
+ 000 nopnopnopnopnopnopnopnop O
+ 001 escescescescescescdebug esc O
+ 002 '1''!'nopnop'|''!'nopnop O
+ 003 '2''"'nopnop'@''"'nopnop O
+ 004 '3'183nopnop'#''#'nopnop O
+ 005 '4''$'nopnop'~''~'nopnop O
+ 006 '5''%'nopnop'5''%'nopnop O
+ 007 '6''&'nopnop172172nopnop O
+ 008 '7''/'nopnop'7''/'nopnop O
+ 009 '8''('nopnop'8''('nopnop O
+ 010 '9'')'nopnop'9'')'nopnop O
+ 011 '0''='nopnop'0''='nopnop O
+ 012 ''''?'nopnop''''?'nopnop O
+ 013 161191nopnop161191nopnop O
+ 014 bs bs deldelbs bs deldel O
+ 015 ht btab nopnopht btab nopnop O
+ 016 '.'':'nopnop'.'':'nopnop O
+ 017 ','';'nopnop','';'nopnop O
+ 018 241209nopnop'~''~'nopnop O
+ 019 'p''P'dledle'p''P'dledle C
+ 020 'y''Y'em em 'y''Y'em em C
+ 021 'f''F'ackack'f''F'ackack C
+ 022 'g''G'belbel'g''G'belbel C
+ 023 'c''C'etxetx'c''C'etxetx C
+ 024 'h''H'bs bs 'h''H'bs bs C
+ 025 'l''L'ff ff 'l''L'ff ff C
+ 026 dgra dcir escesc'[''['escesc O
+ 027 '+''*'gs gs ']'']'gs gs O
+ 028 cr cr nl nl cr cr nl nl O
+ 029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O
+ 030 'a''A'sohsoh'a''A'sohsoh C
+ 031 'o''O'si si 243211si si C
+ 032 'e''E'enqenq164164enqenq C
+ 033 'u''U'naknak250218naknak C
+ 034 'i''I'ht ht 237205ht ht C
+ 035 'd''D'eoteot'd''D'eoteot C
+ 036 'r''R'dc2dc2'r''R'dc2dc2 C
+ 037 't''T'dc4dc4't''T'dc4dc4 C
+ 038 'n''N'so so 'n''N'so so C
+ 039 's''S'dc3dc3's''S'dc3dc3 C
+ 040 dacu duml nopnop'{''{'nopnop O
+ 041 '\''|'fs fs '\''|'fs fs O
+ 042 lshift lshift lshift lshift lshift lshift lshift lshift O
+ 043 231199rs rs '}''}'rs rs O
+ 044 '-''_'us us '-''_'us us O
+ 045 'q''Q'dc1dc1'q''Q'dc1dc1 C
+ 046 'j''J'nl nl 'j''J'nl nl C
+ 047 'k''K'vt vt 'k''K'vt vt C
+ 048 'x''X'cancan'x''X'can
svn commit: r235252 - head/usr.bin/unzip
Author: gjb (doc committer) Date: Fri May 11 00:19:06 2012 New Revision: 235252 URL: http://svn.freebsd.org/changeset/base/235252 Log: Document the unzip(1) '-Z' option implemented in r234206. Submitted by: swills (via hacker lounge) MFC after:3 days Modified: head/usr.bin/unzip/unzip.1 Modified: head/usr.bin/unzip/unzip.1 == --- head/usr.bin/unzip/unzip.1 Thu May 10 23:38:34 2012(r235251) +++ head/usr.bin/unzip/unzip.1 Fri May 11 00:19:06 2012(r235252) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 21, 2010 +.Dd May 10, 2012 .Dt UNZIP 1 .Os .Sh NAME @@ -102,6 +102,16 @@ content of the archive. .It Fl x Ar pattern Exclude files matching the pattern .Ar pattern . +.It Fl Z Ar mode +Emulate +.Xr zipinfo 1L +mode. +Enabling +.Xr zipinfo 1L +mode changes the way in which additional arguments are parsed. +Currently only +.Xr zipinfo 1L +mode 1 is supported, which lists the file names one per line. .El .Pp Note that only one of ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235255 - in head/sys/dev: dc fxp usb/net xl
Author: marius
Date: Fri May 11 02:40:40 2012
New Revision: 235255
URL: http://svn.freebsd.org/changeset/base/235255
Log:
- Change the module order of these MAC drivers to be last so they are
deterministically handled after the corresponding PHY drivers when
loaded as modules. Otherwise, when these MAC/PHY driver pairs are
compiled into a single module probing the PHY driver may fail. This
makes r151438 and r226154 actually work. [1]
Reported and tested by: yongari (fxp(4))
- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers.
Submitted by: jhb [1]
MFC after:3 days
Modified:
head/sys/dev/dc/if_dc.c
head/sys/dev/fxp/if_fxp.c
head/sys/dev/usb/net/if_rue.c
head/sys/dev/xl/if_xl.c
Modified: head/sys/dev/dc/if_dc.c
==
--- head/sys/dev/dc/if_dc.c Fri May 11 01:28:25 2012(r235254)
+++ head/sys/dev/dc/if_dc.c Fri May 11 02:40:40 2012(r235255)
@@ -354,8 +354,9 @@ static driver_t dc_driver = {
static devclass_t dc_devclass;
-DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
-DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE_ORDERED(dc, pci, dc_driver, dc_devclass, NULL, NULL,
+SI_ORDER_ANY);
+DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, NULL, NULL);
#defineDC_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | (x))
Modified: head/sys/dev/fxp/if_fxp.c
==
--- head/sys/dev/fxp/if_fxp.c Fri May 11 01:28:25 2012(r235254)
+++ head/sys/dev/fxp/if_fxp.c Fri May 11 02:40:40 2012(r235255)
@@ -290,7 +290,7 @@ static device_method_t fxp_methods[] = {
DEVMETHOD(miibus_writereg, fxp_miibus_writereg),
DEVMETHOD(miibus_statchg, fxp_miibus_statchg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t fxp_driver = {
@@ -301,8 +301,9 @@ static driver_t fxp_driver = {
static devclass_t fxp_devclass;
-DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
-DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE_ORDERED(fxp, pci, fxp_driver, fxp_devclass, NULL, NULL,
+SI_ORDER_ANY);
+DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, NULL, NULL);
static struct resource_spec fxp_res_spec_mem[] = {
{ SYS_RES_MEMORY, FXP_PCI_MMBA, RF_ACTIVE },
Modified: head/sys/dev/usb/net/if_rue.c
==
--- head/sys/dev/usb/net/if_rue.c Fri May 11 01:28:25 2012
(r235254)
+++ head/sys/dev/usb/net/if_rue.c Fri May 11 02:40:40 2012
(r235255)
@@ -202,8 +202,9 @@ static driver_t rue_driver = {
static devclass_t rue_devclass;
-DRIVER_MODULE(rue, uhub, rue_driver, rue_devclass, NULL, 0);
-DRIVER_MODULE(miibus, rue, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE_ORDERED(rue, uhub, rue_driver, rue_devclass, NULL, NULL,
+SI_ORDER_ANY);
+DRIVER_MODULE(miibus, rue, miibus_driver, miibus_devclass, NULL, NULL);
MODULE_DEPEND(rue, uether, 1, 1, 1);
MODULE_DEPEND(rue, usb, 1, 1, 1);
MODULE_DEPEND(rue, ether, 1, 1, 1);
Modified: head/sys/dev/xl/if_xl.c
==
--- head/sys/dev/xl/if_xl.c Fri May 11 01:28:25 2012(r235254)
+++ head/sys/dev/xl/if_xl.c Fri May 11 02:40:40 2012(r235255)
@@ -327,8 +327,9 @@ static driver_t xl_driver = {
static devclass_t xl_devclass;
-DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
-DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
+DRIVER_MODULE_ORDERED(xl, pci, xl_driver, xl_devclass, NULL, NULL,
+SI_ORDER_ANY);
+DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, NULL, NULL);
static void
xl_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235256 - head/sys/dev/e1000
Author: kevlo Date: Fri May 11 03:15:22 2012 New Revision: 235256 URL: http://svn.freebsd.org/changeset/base/235256 Log: Initialize "error" to zero when it's declared in em_setup_receive_ring() Modified: head/sys/dev/e1000/if_em.c Modified: head/sys/dev/e1000/if_em.c == --- head/sys/dev/e1000/if_em.c Fri May 11 02:40:40 2012(r235255) +++ head/sys/dev/e1000/if_em.c Fri May 11 03:15:22 2012(r235256) @@ -4046,7 +4046,7 @@ em_setup_receive_ring(struct rx_ring *rx struct adapter *adapter = rxr->adapter; struct em_buffer*rxbuf; bus_dma_segment_t seg[1]; - int rsize, nsegs, error; + int rsize, nsegs, error = 0; #ifdef DEV_NETMAP struct netmap_adapter *na = NA(adapter->ifp); struct netmap_slot *slot; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235257 - head/sys/dev/sf
Author: kevlo
Date: Fri May 11 03:17:32 2012
New Revision: 235257
URL: http://svn.freebsd.org/changeset/base/235257
Log:
Remove unused variable mii.
This variable is initialized but not used.
Modified:
head/sys/dev/sf/if_sf.c
Modified: head/sys/dev/sf/if_sf.c
==
--- head/sys/dev/sf/if_sf.c Fri May 11 03:15:22 2012(r235256)
+++ head/sys/dev/sf/if_sf.c Fri May 11 03:17:32 2012(r235257)
@@ -1984,7 +1984,6 @@ static void
sf_init_locked(struct sf_softc *sc)
{
struct ifnet*ifp;
- struct mii_data *mii;
uint8_t eaddr[ETHER_ADDR_LEN];
bus_addr_t addr;
int i;
@@ -1993,7 +1992,6 @@ sf_init_locked(struct sf_softc *sc)
ifp = sc->sf_ifp;
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
return;
- mii = device_get_softc(sc->sf_miibus);
sf_stop(sc);
/* Reset the hardware to a known state. */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r235261 - head/sys/boot/fdt
Author: kientzle Date: Fri May 11 04:18:39 2012 New Revision: 235261 URL: http://svn.freebsd.org/changeset/base/235261 Log: Don't hang if there is no /cpus node in the device tree. Modified: head/sys/boot/fdt/fdt_loader_cmd.c Modified: head/sys/boot/fdt/fdt_loader_cmd.c == --- head/sys/boot/fdt/fdt_loader_cmd.c Fri May 11 04:10:23 2012 (r235260) +++ head/sys/boot/fdt/fdt_loader_cmd.c Fri May 11 04:18:39 2012 (r235261) @@ -317,6 +317,8 @@ fixup_cpubusfreqs(unsigned long cpufreq, /* We want to modify every subnode of /cpus */ o = fdt_path_offset(fdtp, "/cpus"); + if (o < 0) + return; /* maxo should contain offset of node next to /cpus */ depth = 0; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
