Re: svn commit: r236338 - head/usr.bin/make
Hi Kevin, On Wed, 30 May 2012 22:45:57 -0400, "Kevin P. Neal" writes: >> Deprecate the FreeBSD make's ":U" (to-upper case) and ":L" (to-lower case) >> modifiers for ":tu" and ":tl" from OSF's ODE, which made its way into >> NetBSD's make, which is the source for the Portable Berkeley Make. > >This is an incorrect history. I'm the source of NetBSD make's ":tu" and ":tl" >modifiers. The closest I've ever come to OSF ODE is reading about it a little >in NetBSD make's man page. Yes, you are right, :t* were not from ODE. I think David was refering to the :L and :U modifiers that (as you noted) I added to NetBSD make along with :D, :P, and :@, that all originated in ODE. This patch adds :tu and :tl as aliases for freebsd's :U and :L, so that makefiles at least can start to converge. --sjg ___ 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: r236255 - head/contrib/groff/tmac
On 05/30/2012 20:07, David O'Brien wrote: > On Wed, May 30, 2012 at 07:34:33AM +0400, Sergey Kandaurov wrote: >> On 29 May 2012 23:49, David E. O'Brien wrote: > ... >>> Modified: head/contrib/groff/tmac/doc-common > ... >>> +.ds doc-operating-system-FreeBSD-8.3 � � 8.3 >>> +.ds doc-operating-system-FreeBSD-9.1 � � 9.1 >>> +.ds doc-operating-system-FreeBSD-10.0 � �10.0 >> This should be imported from savannah.gnu.org repository, >> and not changed directly. > > Unfortunately we cannot do that per r217595: > > This is a direct commit to contrib/ as we will no longer import > any newer groff snapshots, due to licensing issues. > >> For local changes not found in the (latest) contrib doc-common >> you should use gnu/usr.bin/groff/tmac/mdoc.local > > I followed r217595, was that commit the wrong approach? TMK all our local changes have always been made to mdoc.local. The history on both files seems to support this as well. Doug -- This .signature sanitized for your protection ___ 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: r233925 - in head: sys/kern sys/sys sys/vm usr.bin/kdump usr.bin/ktrace
On 2012-Apr-05 17:13:14 +, John Baldwin wrote: >Log: > Add new ktrace records for the start and end of VM faults. This gives > a pair of records similar to syscall entry and return that a user can > use to determine how long page faults take. The new ktrace records are > enabled via the 'p' trace type, and are enabled in the default set of > trace points. I've just found a case where this is very useful but I find that the PFLT/PRET entries are clutter much of the time and would suggest that they be off by default. > MFC after: 2 weeks This expired some time ago, do you intend to MFC these changes in the near future? -- Peter Jeremy pgpOmnDjf6jih.pgp Description: PGP signature
Re: svn commit: r236255 - head/contrib/groff/tmac
On Wed, May 30, 2012 at 07:34:33AM +0400, Sergey Kandaurov wrote: > On 29 May 2012 23:49, David E. O'Brien wrote: ... > > Modified: head/contrib/groff/tmac/doc-common ... > > +.ds doc-operating-system-FreeBSD-8.3 ? ? 8.3 > > +.ds doc-operating-system-FreeBSD-9.1 ? ? 9.1 > > +.ds doc-operating-system-FreeBSD-10.0 ? ?10.0 > This should be imported from savannah.gnu.org repository, > and not changed directly. Unfortunately we cannot do that per r217595: This is a direct commit to contrib/ as we will no longer import any newer groff snapshots, due to licensing issues. > For local changes not found in the (latest) contrib doc-common > you should use gnu/usr.bin/groff/tmac/mdoc.local I followed r217595, was that commit the wrong approach? -- -- David (obr...@freebsd.org) ___ 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: r236348 - head/share/misc
Author: tj (ports committer) Date: Thu May 31 02:36:30 2012 New Revision: 236348 URL: http://svn.freebsd.org/changeset/base/236348 Log: Add my mentor relationships. Approved by: eadler (mentor) Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotThu May 31 01:07:52 2012 (r236347) +++ head/share/misc/committers-ports.dotThu May 31 02:36:30 2012 (r236348) @@ -185,6 +185,7 @@ swills [label="Steve Wills\nswills@FreeB tabthorpe [label="Thomas Abthorpe\ntabtho...@freebsd.org\n2007/08/20"] tdb [label="Tim Bishop\n...@freebsd.org\n2005/11/30"] timur [label="Timur Bakeyev\nti...@freebsd.org\n2007/06/07"] +tj [label="Tom Judge\t...@freebsd.org\n2012/05/28"] tota [label="TAKATSU Tomonari\nt...@freebsd.org\n2009/03/30"] trasz [label="Edward Tomasz Napierala\ntr...@freebsd.org\n2007/04/12"] trhodes [label="Tom Rhodes\ntrho...@freebsd.org\n2004/07/06"] @@ -247,6 +248,8 @@ clsung -> tabthorpe crees -> jgh crees -> madpilot +db -> tj + culot -> jase decke -> sperber @@ -257,6 +260,7 @@ delphij -> rafan demon -> mat eadler -> ak +eadler -> tj edwin -> cperciva edwin -> erwin ___ 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: r236347 - head/tools/regression/usr.bin/make/variables/opt_V
Author: obrien
Date: Thu May 31 01:07:52 2012
New Revision: 236347
URL: http://svn.freebsd.org/changeset/base/236347
Log:
Add regression test for '-V' command line option (requires r236346).
Added:
head/tools/regression/usr.bin/make/variables/opt_V/
head/tools/regression/usr.bin/make/variables/opt_V/Makefile (contents,
props changed)
head/tools/regression/usr.bin/make/variables/opt_V/expected.status.1
(contents, props changed)
head/tools/regression/usr.bin/make/variables/opt_V/expected.status.2
(contents, props changed)
head/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1
(contents, props changed)
head/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2
(contents, props changed)
head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1
(contents, props changed)
head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2
(contents, props changed)
head/tools/regression/usr.bin/make/variables/opt_V/test.t (contents, props
changed)
Added: head/tools/regression/usr.bin/make/variables/opt_V/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/variables/opt_V/Makefile Thu May 31
01:07:52 2012(r236347)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# Test the -V option
+#
+
+FOO= foo
+FOOBAR=${FOO}bar
+
+test1:
+ @echo "-V FOOBAR"
+ @${MAKE} -V FOOBAR
+
+test2:
+ @echo '-V "$${FOOBAR}"'
+ @${MAKE} -V '$${FOOBAR}'
Added: head/tools/regression/usr.bin/make/variables/opt_V/expected.status.1
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/variables/opt_V/expected.status.1
Thu May 31 01:07:52 2012(r236347)
@@ -0,0 +1 @@
+0
Added: head/tools/regression/usr.bin/make/variables/opt_V/expected.status.2
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/variables/opt_V/expected.status.2
Thu May 31 01:07:52 2012(r236347)
@@ -0,0 +1 @@
+0
Added: head/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1
==
Added: head/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2
==
Added: head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1
Thu May 31 01:07:52 2012(r236347)
@@ -0,0 +1,2 @@
+-V FOOBAR
+foobar
Added: head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2
Thu May 31 01:07:52 2012(r236347)
@@ -0,0 +1,2 @@
+-V "${FOOBAR}"
+foobar
Added: head/tools/regression/usr.bin/make/variables/opt_V/test.t
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/variables/opt_V/test.t Thu May 31
01:07:52 2012(r236347)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+cd `dirname $0`
+. ../../common.sh
+
+# Description
+DESC="Variable expansion using command line '-V'"
+
+# Run
+TEST_N=2
+
+eval_cmd $*
___
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: r236346 - head/usr.bin/make
Author: obrien
Date: Thu May 31 00:36:56 2012
New Revision: 236346
URL: http://svn.freebsd.org/changeset/base/236346
Log:
Add "-V '${VAR}'" variable expansion from Portable Berkeley Make.
Submitted by: Simon Gerraty
Modified:
head/usr.bin/make/make.1
head/usr.bin/make/var.c
Modified: head/usr.bin/make/make.1
==
--- head/usr.bin/make/make.1Wed May 30 23:42:48 2012(r236345)
+++ head/usr.bin/make/make.1Thu May 31 00:36:56 2012(r236346)
@@ -320,6 +320,11 @@ Do not build any targets.
Multiple instances of this option may be specified;
the variables will be printed one per line,
with a blank line for each null or undefined variable.
+If
+.Ar variable
+contains a
+.Sq Ic $
+then the value will be expanded before printing.
.It Fl v
Be extra verbose.
Print any extra information.
Modified: head/usr.bin/make/var.c
==
--- head/usr.bin/make/var.c Wed May 30 23:42:48 2012(r236345)
+++ head/usr.bin/make/var.c Thu May 31 00:36:56 2012(r236346)
@@ -2593,7 +2593,7 @@ void
Var_Print(Lst *vlist, Boolean expandVars)
{
LstNode *n;
- const char *name;
+ char*name;
LST_FOREACH(n, vlist) {
name = Lst_Datum(n);
@@ -2601,13 +2601,17 @@ Var_Print(Lst *vlist, Boolean expandVars
char *value;
char *v;
- v = emalloc(strlen(name) + 1 + 3);
- sprintf(v, "${%s}", name);
-
+ if (*name == '$') {
+ v = name;
+ } else {
+ v = emalloc(strlen(name) + 1 + 3);
+ sprintf(v, "${%s}", name);
+ }
value = Buf_Peel(Var_Subst(v, VAR_GLOBAL, FALSE));
printf("%s\n", value);
- free(v);
+ if (v != name)
+ free(v);
free(value);
} else {
const char *value = Var_Value(name, VAR_GLOBAL);
___
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: r236343 - head/share/misc
Author: jase (ports committer) Date: Wed May 30 22:48:01 2012 New Revision: 236343 URL: http://svn.freebsd.org/changeset/base/236343 Log: Add myself and mentors relationship. Approved by: flo (mentor) Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotWed May 30 22:31:45 2012 (r236342) +++ head/share/misc/committers-ports.dotWed May 30 22:48:01 2012 (r236343) @@ -100,6 +100,7 @@ ijliao [label="Ying-Chieh Liao\nijliao@F itetcu [label="Ion-Mihai Tetcu\nite...@freebsd.org\n2006/06/07"] jacula [label="Giuseppe Pilichi\njac...@freebsd.org\n2010/04/05"] jadawin [label="Philippe Audeoud\njada...@freebsd.org\n2008/03/02"] +jase [label="Jase Thew\nj...@freebsd.org\n2012/05/30"] jgh [label="Jason Helfman\n...@freebsd.org\n2011/12/16"] jkim [label="Jung-uk Kim\nj...@freebsd.org\n2007/09/12"] jlaffaye [label="Julien Laffaye\njlaff...@freebsd.org\n2011/06/06"] @@ -246,6 +247,8 @@ clsung -> tabthorpe crees -> jgh crees -> madpilot +culot -> jase + decke -> sperber delphij -> nemoliu @@ -278,6 +281,8 @@ fjoe -> flo fjoe -> krion fjoe -> osa +flo -> jase + flz -> garga flz -> johans flz -> laszlof ___ 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: r236340 - head/tools/build/make_check
Author: obrien
Date: Wed May 30 22:27:34 2012
New Revision: 236340
URL: http://svn.freebsd.org/changeset/base/236340
Log:
make it easier to check newly-built make
Added:
head/tools/build/make_check/check.mk (contents, props changed)
Added: head/tools/build/make_check/check.mk
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/make_check/check.mkWed May 30 22:27:34 2012
(r236340)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+all:
+ ${MK} ${MK_ARG}
+
+.if exists(${.OBJDIR}/../../../usr.bin/make/make)
+MK=${.OBJDIR}/../../../usr.bin/make/make
+new:
+ ${MK} ${MK_ARG} 2>&1 | tee out-new
+ @echo "-=-=-=-=-=-"
+ make ${MK_ARG} 2>&1 | tee out-old
+ @echo "-=-=-=-=-=-"
+ diff -s out-old out-new
+.else
+MK=make
+.endif
+MK_ARG=-C ${.CURDIR}
+
+.include
___
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: r236339 - head/tools/regression/usr.bin/make
Author: obrien
Date: Wed May 30 22:26:16 2012
New Revision: 236339
URL: http://svn.freebsd.org/changeset/base/236339
Log:
make it easier to test newly-built make.
Added:
head/tools/regression/usr.bin/make/test-new.mk (contents, props changed)
Modified:
Directory Properties:
head/tools/regression/usr.bin/make/all.sh (props changed)
Added: head/tools/regression/usr.bin/make/test-new.mk
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/usr.bin/make/test-new.mk Wed May 30 22:26:16
2012(r236339)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+NEW_DIR!= make -C ${.CURDIR}/../../../../usr.bin/make -V .OBJDIR
+
+all:
+ rm -rf /tmp/${USER}.make.test
+ env MAKE_PROG=${NEW_DIR}/make ${.SHELL} ./all.sh
+
+.include
___
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: r236338 - head/usr.bin/make
Author: obrien
Date: Wed May 30 22:23:08 2012
New Revision: 236338
URL: http://svn.freebsd.org/changeset/base/236338
Log:
Deprecate the FreeBSD make's ":U" (to-upper case) and ":L" (to-lower case)
modifiers for ":tu" and ":tl" from OSF's ODE, which made its way into
NetBSD's make, which is the source for the Portable Berkeley Make.
Submitted by: Simon Gerraty
Modified:
head/usr.bin/make/Makefile
head/usr.bin/make/make.1
head/usr.bin/make/var.c
Modified: head/usr.bin/make/Makefile
==
--- head/usr.bin/make/Makefile Wed May 30 22:21:25 2012(r236337)
+++ head/usr.bin/make/Makefile Wed May 30 22:23:08 2012(r236338)
@@ -15,7 +15,7 @@ NO_SHARED?= YES
.endif
# Version has the RMMDDX format, where R is from RELENG_
-CFLAGS+=-DMAKE_VERSION=\"520300\"
+CFLAGS+=-DMAKE_VERSION=\"10201120530\"
# There is no obvious performance improvement currently.
# CFLAGS+=-DUSE_KQUEUE
Modified: head/usr.bin/make/make.1
==
--- head/usr.bin/make/make.1Wed May 30 22:21:25 2012(r236337)
+++ head/usr.bin/make/make.1Wed May 30 22:23:08 2012(r236338)
@@ -902,6 +902,7 @@ Replaces each word in the variable with
Replaces each word in the variable with everything but the last component.
.It Cm :L
Converts variable to lower-case letters.
+(deprecated)
.It Cm :M Ns Ar pattern
Select only those words that match the rest of the modifier.
The standard shell wildcard characters
@@ -993,8 +994,13 @@ to be replaced in
.Ar new_string .
.It Cm :T
Replaces each word in the variable with its last component.
+.It Cm :tl
+Converts variable to lower-case letters.
+.It Cm :tu
+Converts variable to upper-case letters.
.It Cm :U
Converts variable to upper-case letters.
+(deprecated)
.It Cm :u
Remove adjacent duplicate words (like
.Xr uniq 1 ) .
@@ -1742,6 +1748,19 @@ is set to the same value as
.Va .MAKE ;
support for this may be removed in the future.
.Pp
+The use of the
+.Cm :L
+and
+.Cm :U
+modifiers are deprecated
+in
+.Fx 10.0
+and the more portable (among Pmake decedents)
+.Cm :tl
+and
+.Cm :tu
+should be used instead.
+.Pp
Most of the more esoteric features of
.Nm
should probably be avoided for greater compatibility.
Modified: head/usr.bin/make/var.c
==
--- head/usr.bin/make/var.c Wed May 30 22:21:25 2012(r236337)
+++ head/usr.bin/make/var.c Wed May 30 22:23:08 2012(r236338)
@@ -1746,6 +1746,19 @@ ParseModifier(VarParser *vp, char startc
case 'C':
newStr = modifier_C(vp, value, v);
break;
+ case 't':
+ /* :tl :tu for OSF ODE & NetBSD make compatibility */
+ switch (vp->ptr[1]) {
+ case 'l':
+ vp->ptr++;
+ goto mod_lower;
+ break;
+ case 'u':
+ vp->ptr++;
+ goto mod_upper;
+ break;
+ }
+ /* FALLTHROUGH */
default:
if (vp->ptr[1] != endc && vp->ptr[1] != ':') {
#ifdef SUNSHCMD
@@ -1774,6 +1787,7 @@ ParseModifier(VarParser *vp, char startc
switch (vp->ptr[0]) {
case 'L':
+ mod_lower:
{
const char *cp;
Buffer *buf;
@@ -1799,6 +1813,7 @@ ParseModifier(VarParser *vp, char startc
vp->ptr++;
break;
case 'U':
+ mod_upper:
{
const char *cp;
Buffer *buf;
___
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: r236311 - in head/sys/modules: cxgb/cxgb ixgbe
On 30. May 2012, at 13:55 , Ulrich Spoerlein wrote:
> Author: uqs
> Date: Wed May 30 13:55:43 2012
> New Revision: 236311
> URL: http://svn.freebsd.org/changeset/base/236311
>
> Log:
> Unbreak make depend.
thanks
>
> Modified:
> head/sys/modules/cxgb/cxgb/Makefile
> head/sys/modules/ixgbe/Makefile
>
> Modified: head/sys/modules/cxgb/cxgb/Makefile
> ==
> --- head/sys/modules/cxgb/cxgb/Makefile Wed May 30 13:51:00 2012
> (r236310)
> +++ head/sys/modules/cxgb/cxgb/Makefile Wed May 30 13:55:43 2012
> (r236311)
> @@ -1,5 +1,7 @@
> # $FreeBSD$
>
> +.include
> +
> CXGB = ${.CURDIR}/../../../dev/cxgb
> .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
>
>
> Modified: head/sys/modules/ixgbe/Makefile
> ==
> --- head/sys/modules/ixgbe/Makefile Wed May 30 13:51:00 2012
> (r236310)
> +++ head/sys/modules/ixgbe/Makefile Wed May 30 13:55:43 2012
> (r236311)
> @@ -1,5 +1,9 @@
> #$FreeBSD$
> +
> +.include
> +
> .PATH: ${.CURDIR}/../../dev/ixgbe
> +
> KMOD= ixgbe
> SRCS= device_if.h bus_if.h pci_if.h
> SRCS += opt_inet.h opt_inet6.h
--
Bjoern A. Zeeb You have to have visions!
It does not matter how good you are. It matters what good you do!
___
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: r236337 - in head/kerberos5: lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libheimbase lib/libheimipcc lib/libheimipcs lib/libhx509 lib/libkadm5clnt lib/libk...
Author: obrien
Date: Wed May 30 22:21:25 2012
New Revision: 236337
URL: http://svn.freebsd.org/changeset/base/236337
Log:
* Remove headers from SRCS that are not generated
(and are in /usr/src/crypto/heimdal/).
* Avoid race conditions with 'make -j'.
Modified:
head/kerberos5/lib/libgssapi_krb5/Makefile
head/kerberos5/lib/libgssapi_ntlm/Makefile
head/kerberos5/lib/libgssapi_spnego/Makefile
head/kerberos5/lib/libhdb/Makefile
head/kerberos5/lib/libheimbase/Makefile
head/kerberos5/lib/libheimipcc/Makefile
head/kerberos5/lib/libheimipcs/Makefile
head/kerberos5/lib/libhx509/Makefile
head/kerberos5/lib/libkadm5clnt/Makefile
head/kerberos5/lib/libkadm5srv/Makefile
head/kerberos5/lib/libkafs5/Makefile
head/kerberos5/lib/libkdc/Makefile
head/kerberos5/lib/libkrb5/Makefile
head/kerberos5/lib/libvers/Makefile
head/kerberos5/libexec/hprop/Makefile
head/kerberos5/libexec/kadmind/Makefile
head/kerberos5/libexec/kcm/Makefile
head/kerberos5/libexec/kdigest/Makefile
head/kerberos5/libexec/kfd/Makefile
head/kerberos5/tools/asn1_compile/Makefile
head/kerberos5/usr.bin/hxtool/Makefile
head/kerberos5/usr.bin/kadmin/Makefile
head/kerberos5/usr.bin/kcc/Makefile
head/kerberos5/usr.bin/kf/Makefile
head/kerberos5/usr.bin/string2key/Makefile
head/kerberos5/usr.sbin/iprop-log/Makefile
head/kerberos5/usr.sbin/ktutil/Makefile
Modified: head/kerberos5/lib/libgssapi_krb5/Makefile
==
--- head/kerberos5/lib/libgssapi_krb5/Makefile Wed May 30 21:28:37 2012
(r236336)
+++ head/kerberos5/lib/libgssapi_krb5/Makefile Wed May 30 22:21:25 2012
(r236337)
@@ -38,8 +38,6 @@ SRCS= 8003.c \
get_mic.c \
gkrb5_err.c \
gkrb5_err.h \
- gsskrb5-private.h \
- gsskrb5_locl.h \
import_name.c \
import_sec_context.c \
indicate_mechs.c \
Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile
==
--- head/kerberos5/lib/libgssapi_ntlm/Makefile Wed May 30 21:28:37 2012
(r236336)
+++ head/kerberos5/lib/libgssapi_ntlm/Makefile Wed May 30 22:21:25 2012
(r236337)
@@ -21,8 +21,6 @@ SRCS= accept_sec_context.c \
export_name.c \
export_sec_context.c \
external.c \
- ntlm.h \
- ntlm-private.h \
import_name.c \
import_sec_context.c \
indicate_mechs.c \
Modified: head/kerberos5/lib/libgssapi_spnego/Makefile
==
--- head/kerberos5/lib/libgssapi_spnego/MakefileWed May 30 21:28:37
2012(r236336)
+++ head/kerberos5/lib/libgssapi_spnego/MakefileWed May 30 22:21:25
2012(r236337)
@@ -13,9 +13,6 @@ SRCS= accept_sec_context.c \
external.c \
init_sec_context.c \
freebsd_compat.c \
- spnego-private.h \
- spnego_locl.h \
- spnego_asn1.h \
${GEN:S/.x$/.c/:S/.hx$/.h/} \
gss_oid.c
Modified: head/kerberos5/lib/libhdb/Makefile
==
--- head/kerberos5/lib/libhdb/Makefile Wed May 30 21:28:37 2012
(r236336)
+++ head/kerberos5/lib/libhdb/Makefile Wed May 30 22:21:25 2012
(r236337)
@@ -48,8 +48,6 @@ SRCS= common.c \
hdb-sqlite.c \
hdb-keytab.c \
hdb-mitdb.c \
- hdb_locl.h \
- hdb-private.h \
keys.c \
keytab.c \
mkey.c \
Modified: head/kerberos5/lib/libheimbase/Makefile
==
--- head/kerberos5/lib/libheimbase/Makefile Wed May 30 21:28:37 2012
(r236336)
+++ head/kerberos5/lib/libheimbase/Makefile Wed May 30 22:21:25 2012
(r236337)
@@ -9,12 +9,9 @@ INCS= heimbase.h
SRCS= \
array.c \
- baselocl.h \
bool.c \
dict.c \
heimbase.c \
- heimbasepriv.h \
- heimqueue.h \
null.c \
number.c \
string.c
Modified: head/kerberos5/lib/libheimipcc/Makefile
==
--- head/kerberos5/lib/libheimipcc/Makefile Wed May 30 21:28:37 2012
(r236336)
+++ head/kerberos5/lib/libheimipcc/Makefile Wed May 30 22:21:25 2012
(r236337)
@@ -5,8 +5,7 @@ INTERNALLIB=
LDADD= -lheimbase -lroken -lpthread
DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD}
-SRCS= hi_locl.h \
- heim_ipc_types.h \
+SRCS= \
client.c \
common.c
Modified: head/kerberos5/lib/libheimipcs/Makefile
==
--- head/kerberos5/lib/libheimipcs/Makefile Wed May 30 21:28:37 2012
(r236336)
+++ head/kerberos5/lib/libheimipcs/Makefile Wed May 30 22:21:25 2012
(r236337)
@@ -6,8 +6,7 @@ LDADD= -lheimbase -
svn commit: r236336 - head/usr.sbin/pkg_install/lib
Author: jpaetzel Date: Wed May 30 21:28:37 2012 New Revision: 236336 URL: http://svn.freebsd.org/changeset/base/236336 Log: Bump PKG_INSTALL_VERSION which should've been done in r236233 MFC after:3 days Pointed out by: bapt Modified: head/usr.sbin/pkg_install/lib/lib.h Modified: head/usr.sbin/pkg_install/lib/lib.h == --- head/usr.sbin/pkg_install/lib/lib.h Wed May 30 21:04:14 2012 (r236335) +++ head/usr.sbin/pkg_install/lib/lib.h Wed May 30 21:28:37 2012 (r236336) @@ -99,7 +99,7 @@ * Version of the package tools - increase whenever you make a change * in the code that is not cosmetic only. */ -#define PKG_INSTALL_VERSION20100403 +#define PKG_INSTALL_VERSION20120530 #define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf" #define main(argc, argv) real_main(argc, argv) ___ 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: r236333 - in head/usr.sbin/pkg_install: add lib
On Wed, May 30, 2012 at 09:01:06PM +, Josh Paetzel wrote:
> Author: jpaetzel
> Date: Wed May 30 21:01:06 2012
> New Revision: 236333
> URL: http://svn.freebsd.org/changeset/base/236333
>
> Log:
> Let pkg_add use the ENV variable PACKAGESUFFIX. This
> can be used to override the default .tbz package extension to
> .txz .tgz or .tar
>
> Submitted by: kmoore
> Obtained from: PC-BSD
> Sponsored by: iXsystems
> MFC after: 3 days
>
> Modified:
> head/usr.sbin/pkg_install/add/main.c
> head/usr.sbin/pkg_install/add/perform.c
> head/usr.sbin/pkg_install/add/pkg_add.1
> head/usr.sbin/pkg_install/lib/file.c
> head/usr.sbin/pkg_install/lib/url.c
>
> Modified: head/usr.sbin/pkg_install/add/main.c
> ==
> --- head/usr.sbin/pkg_install/add/main.c Wed May 30 20:56:07 2012
> (r236332)
> +++ head/usr.sbin/pkg_install/add/main.c Wed May 30 21:01:06 2012
> (r236333)
> @@ -234,10 +234,17 @@ main(int argc, char **argv)
> remotepkg = temppackageroot;
> if (!((ptr = strrchr(remotepkg, '.')) && ptr[1] == 't' &&
> (ptr[2] == 'b' || ptr[2] == 'g' || ptr[2] == 'x') &&
> - ptr[3] == 'z' && !ptr[4]))
> - if (strlcat(remotepkg, ".tbz",
> - sizeof(temppackageroot)) >= sizeof(temppackageroot))
> - errx(1, "package name too long");
> + ptr[3] == 'z' && !ptr[4])) {
> + if (getenv("PACKAGESUFFIX")) {
> +if (strlcat(remotepkg, getenv("PACKAGESUFFIX"),
> +sizeof(temppackageroot)) >= sizeof(temppackageroot))
> +errx(1, "package name too long");
> + } else {
> +if (strlcat(remotepkg, ".tbz",
> +sizeof(temppackageroot)) >= sizeof(temppackageroot))
> +errx(1, "package name too long");
> + }
> + }
> }
> if (!strcmp(*argv, "-"))/* stdin? */
> pkgs[ch] = (char *)"-";
>
> Modified: head/usr.sbin/pkg_install/add/perform.c
> ==
> --- head/usr.sbin/pkg_install/add/perform.c Wed May 30 20:56:07 2012
> (r236332)
> +++ head/usr.sbin/pkg_install/add/perform.c Wed May 30 21:01:06 2012
> (r236333)
> @@ -307,8 +307,12 @@ pkg_do(char *pkg)
> *sep = '\0';
> strlcat(subpkg, "/All/", sizeof subpkg);
> strlcat(subpkg, p->name, sizeof subpkg);
> - if ((ext = strrchr(pkg, '.')) == NULL)
> - ext = ".tbz";
> + if ((ext = strrchr(pkg, '.')) == NULL) {
> + if (getenv("PACKAGESUFFIX"))
> + ext = getenv("PACKAGESUFFIX");
> + else
> + ext = ".tbz";
> + }
> strlcat(subpkg, ext, sizeof subpkg);
> pkg_do(subpkg);
> }
> @@ -345,8 +349,13 @@ pkg_do(char *pkg)
> const char *ext;
>
> ext = strrchr(pkg_fullname, '.');
> - if (ext == NULL)
> - ext = ".tbz";
> + if (ext == NULL) {
> + if (getenv("PACKAGESUFFIX")) {
> + ext = getenv("PACKAGESUFFIX");
> + } else {
> + ext = ".tbz";
> + }
> + }
> snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"),
> p->name, ext);
> if (fexists(path))
> cp = path;
>
> Modified: head/usr.sbin/pkg_install/add/pkg_add.1
> ==
> --- head/usr.sbin/pkg_install/add/pkg_add.1 Wed May 30 20:56:07 2012
> (r236332)
> +++ head/usr.sbin/pkg_install/add/pkg_add.1 Wed May 30 21:01:06 2012
> (r236333)
> @@ -553,6 +553,11 @@ The environment variable
> specifies an alternative location to save downloaded packages to when
> .Fl K
> option is used.
> +.Pp
> +The environment variable
> +.Ev PACKAGESUFFIX
> +specifies an alternative file extension to use when fetching remote
> +packages. Default is .tbz
> .Sh FILES
> .Bl -tag -width /var/db/pkg -compact
> .It Pa /var/tmp
>
> Modified: head/usr.sbin/pkg_install/lib/file.c
> ==
> --- head/usr.sbin/pkg_install/lib/file.c Wed May 30 20:56:07 2012
> (r236332)
> +++ head/usr.sbin/pkg_install/lib/file.c Wed May 30 21:01:06 2012
> (r236333)
> @@ -140,7 +140,7 @@ fileFindByPath(const char *base, const c
> {
> static char tmp[FILENAME_MAX];
> char *cp;
> -const char *suffixes[] = {".
svn commit: r236334 - head/share/man/man4
Author: jhb Date: Wed May 30 21:02:12 2012 New Revision: 236334 URL: http://svn.freebsd.org/changeset/base/236334 Log: - Witness doesn't verify the old MTX_NOSWITCH flag's correctness (that was obsoleted when critical sections were added). Instead, list a check that witness does perform. - Note that 'show locks' in DDB takes an optional thread argument. - Document 'show all locks'. - Remove the BUGS section, the bug in question was fixed 11 years ago in r76272. Modified: head/share/man/man4/witness.4 Modified: head/share/man/man4/witness.4 == --- head/share/man/man4/witness.4 Wed May 30 21:01:06 2012 (r236333) +++ head/share/man/man4/witness.4 Wed May 30 21:02:12 2012 (r236334) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 18, 2001 +.Dd May 30, 2012 .Dt WITNESS 4 .Os .Sh NAME @@ -52,11 +52,8 @@ violation occurs. The .Nm code also checks various other conditions such as verifying that one -does not recurse on a non-recursive lock. -For sleep locks, -.Nm -verifies that a new process would not be switched to when a lock is released -or a lock is blocked on during an acquire while any spin locks are held. +does not recurse on a non-recursive lock, +or attempt an upgrade on a shared lock held by another thread. If any of these checks fail, then the kernel will panic. .Pp The flag that controls whether or not the kernel debugger is entered when a @@ -97,7 +94,7 @@ specifies the level of witness involveme A value of 1 specifies that witness is enabled. A value of 0 specifies that witness is disabled, but that can be enabled again. This will maintain a small amount of overhead in the system. -A value of -1 specifies that witness is disabled permanently and that +A value of -1 specifies that witness is disabled permanently and cannot be enabled again. The sysctl .Va debug.witness.watch @@ -114,10 +111,22 @@ and .Xr ddb 4 are compiled into the kernel: .Bl -ohang -.It Ic show locks -Outputs the list of locks held by the current thread to the kernel console +.It Ic show locks Op thread +Outputs the list of locks held by a thread to the kernel console along with the filename and line number at which each lock was last acquired -by this thread. +by the thread. +The optional +.Ar thread +argument may be either a TID, +PID, +or pointer to a thread structure. +If +.Ar thread +is not specified, +then the locks held by the current thread are displayed. +.It Ic show all locks +Outputs the list of locks held by all threads in the system to the +kernel console. .It Ic show witness Dump the current order list to the kernel console. The code first displays the lock order tree for all of the sleep locks. @@ -136,9 +145,3 @@ code first appeared in .Bsx 5.0 and was imported from there into .Fx 5.0 . -.Sh BUGS -The -.Nm -code currently does not handle recursion of shared -.Xr sx 9 -locks properly. ___ 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: r236333 - in head/usr.sbin/pkg_install: add lib
Author: jpaetzel
Date: Wed May 30 21:01:06 2012
New Revision: 236333
URL: http://svn.freebsd.org/changeset/base/236333
Log:
Let pkg_add use the ENV variable PACKAGESUFFIX. This
can be used to override the default .tbz package extension to
.txz .tgz or .tar
Submitted by: kmoore
Obtained from:PC-BSD
Sponsored by: iXsystems
MFC after:3 days
Modified:
head/usr.sbin/pkg_install/add/main.c
head/usr.sbin/pkg_install/add/perform.c
head/usr.sbin/pkg_install/add/pkg_add.1
head/usr.sbin/pkg_install/lib/file.c
head/usr.sbin/pkg_install/lib/url.c
Modified: head/usr.sbin/pkg_install/add/main.c
==
--- head/usr.sbin/pkg_install/add/main.cWed May 30 20:56:07 2012
(r236332)
+++ head/usr.sbin/pkg_install/add/main.cWed May 30 21:01:06 2012
(r236333)
@@ -234,10 +234,17 @@ main(int argc, char **argv)
remotepkg = temppackageroot;
if (!((ptr = strrchr(remotepkg, '.')) && ptr[1] == 't' &&
(ptr[2] == 'b' || ptr[2] == 'g' || ptr[2] == 'x') &&
- ptr[3] == 'z' && !ptr[4]))
- if (strlcat(remotepkg, ".tbz",
- sizeof(temppackageroot)) >= sizeof(temppackageroot))
- errx(1, "package name too long");
+ ptr[3] == 'z' && !ptr[4])) {
+ if (getenv("PACKAGESUFFIX")) {
+ if (strlcat(remotepkg, getenv("PACKAGESUFFIX"),
+ sizeof(temppackageroot)) >= sizeof(temppackageroot))
+ errx(1, "package name too long");
+ } else {
+ if (strlcat(remotepkg, ".tbz",
+ sizeof(temppackageroot)) >= sizeof(temppackageroot))
+ errx(1, "package name too long");
+ }
+ }
}
if (!strcmp(*argv, "-"))/* stdin? */
pkgs[ch] = (char *)"-";
Modified: head/usr.sbin/pkg_install/add/perform.c
==
--- head/usr.sbin/pkg_install/add/perform.c Wed May 30 20:56:07 2012
(r236332)
+++ head/usr.sbin/pkg_install/add/perform.c Wed May 30 21:01:06 2012
(r236333)
@@ -307,8 +307,12 @@ pkg_do(char *pkg)
*sep = '\0';
strlcat(subpkg, "/All/", sizeof subpkg);
strlcat(subpkg, p->name, sizeof subpkg);
- if ((ext = strrchr(pkg, '.')) == NULL)
- ext = ".tbz";
+ if ((ext = strrchr(pkg, '.')) == NULL) {
+ if (getenv("PACKAGESUFFIX"))
+ ext = getenv("PACKAGESUFFIX");
+ else
+ ext = ".tbz";
+ }
strlcat(subpkg, ext, sizeof subpkg);
pkg_do(subpkg);
}
@@ -345,8 +349,13 @@ pkg_do(char *pkg)
const char *ext;
ext = strrchr(pkg_fullname, '.');
- if (ext == NULL)
- ext = ".tbz";
+ if (ext == NULL) {
+ if (getenv("PACKAGESUFFIX")) {
+ ext = getenv("PACKAGESUFFIX");
+ } else {
+ ext = ".tbz";
+ }
+ }
snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"),
p->name, ext);
if (fexists(path))
cp = path;
Modified: head/usr.sbin/pkg_install/add/pkg_add.1
==
--- head/usr.sbin/pkg_install/add/pkg_add.1 Wed May 30 20:56:07 2012
(r236332)
+++ head/usr.sbin/pkg_install/add/pkg_add.1 Wed May 30 21:01:06 2012
(r236333)
@@ -553,6 +553,11 @@ The environment variable
specifies an alternative location to save downloaded packages to when
.Fl K
option is used.
+.Pp
+The environment variable
+.Ev PACKAGESUFFIX
+specifies an alternative file extension to use when fetching remote
+packages. Default is .tbz
.Sh FILES
.Bl -tag -width /var/db/pkg -compact
.It Pa /var/tmp
Modified: head/usr.sbin/pkg_install/lib/file.c
==
--- head/usr.sbin/pkg_install/lib/file.cWed May 30 20:56:07 2012
(r236332)
+++ head/usr.sbin/pkg_install/lib/file.cWed May 30 21:01:06 2012
(r236333)
@@ -140,7 +140,7 @@ fileFindByPath(const char *base, const c
{
static char tmp[FILENAME_MAX];
char *cp;
-const char *suffixes[] = {".tbz", ".tgz", ".tar", NULL};
+const char *suffixes[] = {".tbz", ".tgz", ".tar", ".txz", NULL};
int i;
if (fexists(fname) && isfile(fname)) {
Modified: head/usr.sbin/pkg_install/li
svn commit: r236332 - in head/sys: net netinet netinet6 sys
Author: tuexen
Date: Wed May 30 20:56:07 2012
New Revision: 236332
URL: http://svn.freebsd.org/changeset/base/236332
Log:
Seperate SCTP checksum offloading for IPv4 and IPv6.
While there: remove some trainling whitespaces.
MFC after: 3 days
X-MFC with: 236170
Modified:
head/sys/net/if_loop.c
head/sys/netinet/sctp_output.c
head/sys/netinet6/ip6_forward.c
head/sys/netinet6/ip6_output.c
head/sys/sys/mbuf.h
Modified: head/sys/net/if_loop.c
==
--- head/sys/net/if_loop.c Wed May 30 20:49:28 2012(r236331)
+++ head/sys/net/if_loop.c Wed May 30 20:56:07 2012(r236332)
@@ -92,7 +92,7 @@
#endif
#defineLO_CSUM_FEATURES(CSUM_IP | CSUM_TCP | CSUM_UDP |
CSUM_SCTP)
-#defineLO_CSUM_FEATURES6 (CSUM_TCP_IPV6 | CSUM_UDP_IPV6 |
CSUM_SCTP)
+#defineLO_CSUM_FEATURES6 (CSUM_TCP_IPV6 | CSUM_UDP_IPV6 |
CSUM_SCTP_IPV6)
#defineLO_CSUM_SET (CSUM_DATA_VALID | CSUM_DATA_VALID_IPV6
| \
CSUM_PSEUDO_HDR | \
CSUM_IP_CHECKED | CSUM_IP_VALID | \
Modified: head/sys/netinet/sctp_output.c
==
--- head/sys/netinet/sctp_output.c Wed May 30 20:49:28 2012
(r236331)
+++ head/sys/netinet/sctp_output.c Wed May 30 20:56:07 2012
(r236332)
@@ -4478,7 +4478,7 @@ sctp_lowlevel_chunk_output(struct sctp_i
#if defined(SCTP_WITH_NO_CSUM)
SCTP_STAT_INCR(sctps_sendnocrc);
#else
- m->m_pkthdr.csum_flags = CSUM_SCTP;
+ m->m_pkthdr.csum_flags = CSUM_SCTP_IPV6;
m->m_pkthdr.csum_data = 0;
SCTP_STAT_INCR(sctps_sendhwcrc);
#endif
@@ -11072,7 +11072,7 @@ sctp_send_shutdown_complete2(struct mbuf
#if defined(SCTP_WITH_NO_CSUM)
SCTP_STAT_INCR(sctps_sendnocrc);
#else
- mout->m_pkthdr.csum_flags = CSUM_SCTP;
+ mout->m_pkthdr.csum_flags = CSUM_SCTP_IPV6;
mout->m_pkthdr.csum_data = 0;
SCTP_STAT_INCR(sctps_sendhwcrc);
#endif
@@ -12179,7 +12179,7 @@ sctp_send_abort(struct mbuf *m, int iphl
#if defined(SCTP_WITH_NO_CSUM)
SCTP_STAT_INCR(sctps_sendnocrc);
#else
- mout->m_pkthdr.csum_flags = CSUM_SCTP;
+ mout->m_pkthdr.csum_flags = CSUM_SCTP_IPV6;
mout->m_pkthdr.csum_data = 0;
SCTP_STAT_INCR(sctps_sendhwcrc);
#endif
@@ -12443,7 +12443,7 @@ sctp_send_operr_to(struct mbuf *m, int i
#if defined(SCTP_WITH_NO_CSUM)
SCTP_STAT_INCR(sctps_sendnocrc);
#else
- mout->m_pkthdr.csum_flags = CSUM_SCTP;
+ mout->m_pkthdr.csum_flags = CSUM_SCTP_IPV6;
mout->m_pkthdr.csum_data = 0;
SCTP_STAT_INCR(sctps_sendhwcrc);
#endif
Modified: head/sys/netinet6/ip6_forward.c
==
--- head/sys/netinet6/ip6_forward.c Wed May 30 20:49:28 2012
(r236331)
+++ head/sys/netinet6/ip6_forward.c Wed May 30 20:56:07 2012
(r236332)
@@ -587,7 +587,7 @@ skip_routing:
m->m_pkthdr.csum_data = 0x;
}
#ifdef SCTP
- if (m->m_pkthdr.csum_flags & CSUM_SCTP)
+ if (m->m_pkthdr.csum_flags & CSUM_SCTP_IPV6)
m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID;
#endif
error = netisr_queue(NETISR_IPV6, m);
@@ -607,9 +607,9 @@ skip_routing:
m->m_pkthdr.csum_data = 0x;
}
#ifdef SCTP
- if (m->m_pkthdr.csum_flags & CSUM_SCTP)
- m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID;
-#endif
+ if (m->m_pkthdr.csum_flags & CSUM_SCTP_IPV6)
+ m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID;
+#endif
error = netisr_queue(NETISR_IPV6, m);
goto out;
}
Modified: head/sys/netinet6/ip6_output.c
==
--- head/sys/netinet6/ip6_output.c Wed May 30 20:49:28 2012
(r236331)
+++ head/sys/netinet6/ip6_output.c Wed May 30 20:56:07 2012
(r236332)
@@ -508,7 +508,7 @@ skip_ipsec2:;
#ifdef FLOWTABLE
if (ro == &ip6route) {
struct flentry *fle;
-
+
/*
* The flow table returns route entries valid for up to 30
* seconds; we rely on the remainder of ip_output() taking no
@@ -521,7 +521,7 @@ skip_ipsec2:;
flevali
svn commit: r236331 - head/usr.sbin/pc-sysinstall/backend
Author: jpaetzel
Date: Wed May 30 20:49:28 2012
New Revision: 236331
URL: http://svn.freebsd.org/changeset/base/236331
Log:
Fix detecting available zpool names.
Submitted by: kmoore
Obtained from:PC-BSD
MFC after:3 days
Sponsored by: iXsystems
Modified:
head/usr.sbin/pc-sysinstall/backend/functions.sh
Modified: head/usr.sbin/pc-sysinstall/backend/functions.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions.shWed May 30 20:44:04
2012(r236330)
+++ head/usr.sbin/pc-sysinstall/backend/functions.shWed May 30 20:49:28
2012(r236331)
@@ -277,7 +277,7 @@ get_zpool_name()
while :
do
NEWNAME="${BASENAME}${NUM}"
- zpool import | grep -qw "${NEWNAME}" && break
+ zpool import | grep -qw "${NEWNAME}" || break
NUM=$((NUM+1))
done
___
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: r236330 - head/usr.sbin/pc-sysinstall/backend
Author: jpaetzel
Date: Wed May 30 20:44:04 2012
New Revision: 236330
URL: http://svn.freebsd.org/changeset/base/236330
Log:
Fix French Canadian console keyboard layout
Submitted by: kmoore
Obtained from:PC-BSD
MFC after:3 days
Sponsored by: iXsystems
Modified:
head/usr.sbin/pc-sysinstall/backend/functions-localize.sh
Modified: head/usr.sbin/pc-sysinstall/backend/functions-localize.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-localize.sh Wed May 30
20:13:49 2012(r236329)
+++ head/usr.sbin/pc-sysinstall/backend/functions-localize.sh Wed May 30
20:44:04 2012(r236330)
@@ -168,6 +168,7 @@ localize_key_layout()
# Set the keylayout in rc.conf
case ${KEYLAYOUT} in
am) KEYLAYOUT_CONSOLE="hy.armscii-8" ;;
+ca) KEYLAYOUT_CONSOLE="fr_CA.acc.iso" ;;
ch) KEYLAYOUT_CONSOLE="swissgerman.iso" ;;
cz) KEYLAYOUT_CONSOLE="cz.iso2" ;;
de) KEYLAYOUT_CONSOLE="german.iso" ;;
___
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: r236329 - head/contrib/gcc/config/sparc
Author: marius
Date: Wed May 30 20:13:49 2012
New Revision: 236329
URL: http://svn.freebsd.org/changeset/base/236329
Log:
Merge r236137 from x86:
Enable GNU hash generation for dynamic ELF binaries.
While at it, sync the order of options with x86 and pass along the verbose
flag.
Modified:
head/contrib/gcc/config/sparc/freebsd.h
Modified: head/contrib/gcc/config/sparc/freebsd.h
==
--- head/contrib/gcc/config/sparc/freebsd.h Wed May 30 20:04:07 2012
(r236328)
+++ head/contrib/gcc/config/sparc/freebsd.h Wed May 30 20:13:49 2012
(r236329)
@@ -45,14 +45,16 @@ Boston, MA 02110-1301, USA. */
#define LINK_SPEC "%(link_arch)
\
%{!mno-relax:%{!r:-relax}} \
%{p:%nconsider using `-pg' instead of `-p' with gprof(1)}\
+ %{v:-V} \
%{assert*} %{R*} %{rpath*} %{defsym*}
\
%{shared:-Bshareable %{h*} %{soname*}} \
- %{symbolic:-Bsymbolic} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \
-%{static:-Bstatic}}"
+%{static:-Bstatic}}
\
+ %{!static:--hash-style=both} \
+ %{symbolic:-Bsymbolic}"
/[ Target stuff ]***/
___
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: r236328 - head/sys/dev/bge
Author: marius Date: Wed May 30 20:04:07 2012 New Revision: 236328 URL: http://svn.freebsd.org/changeset/base/236328 Log: Try to finally get the point in time at which bge_add_sysctls() is called right; it needs to be called before bge_can_use_msi() but in turn requires bge_flags to be properly set. Submitted by: yongari MFC after:3 days Modified: head/sys/dev/bge/if_bge.c Modified: head/sys/dev/bge/if_bge.c == --- head/sys/dev/bge/if_bge.c Wed May 30 20:02:39 2012(r236327) +++ head/sys/dev/bge/if_bge.c Wed May 30 20:04:07 2012(r236328) @@ -2368,7 +2368,6 @@ bge_dma_free(struct bge_softc *sc) if (sc->bge_cdata.bge_tx_mtag) bus_dma_tag_destroy(sc->bge_cdata.bge_tx_mtag); - /* Destroy standard RX ring. */ if (sc->bge_cdata.bge_rx_std_ring_map) bus_dmamap_unload(sc->bge_cdata.bge_rx_std_ring_tag, @@ -2869,8 +2868,6 @@ bge_attach(device_t dev) sc = device_get_softc(dev); sc->bge_dev = dev; - bge_add_sysctls(sc); - TASK_INIT(&sc->bge_intr_task, 0, bge_intr_task, sc); /* @@ -3016,6 +3013,9 @@ bge_attach(device_t dev) break; } + /* Add SYSCTLs, requires the chipset family to be set. */ + bge_add_sysctls(sc); + /* Set various PHY bug flags. */ if (sc->bge_chipid == BGE_CHIPID_BCM5701_A0 || sc->bge_chipid == BGE_CHIPID_BCM5701_B0) ___ 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: r236327 - head/sys/netinet6
Author: emax
Date: Wed May 30 20:02:39 2012
New Revision: 236327
URL: http://svn.freebsd.org/changeset/base/236327
Log:
When we return deprecated addresses, we need to reference them.
Reviewed by: bz, scottl
MFC after:3 days
Modified:
head/sys/netinet6/in6.c
Modified: head/sys/netinet6/in6.c
==
--- head/sys/netinet6/in6.c Wed May 30 19:21:54 2012(r236326)
+++ head/sys/netinet6/in6.c Wed May 30 20:02:39 2012(r236327)
@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct
IF_ADDR_RUNLOCK(ifp);
return (struct in6_ifaddr *)ifa;
}
- IF_ADDR_RUNLOCK(ifp);
/* use the last-resort values, that are, deprecated addresses */
- if (dep[0])
+ if (dep[0]) {
+ ifa_ref((struct ifaddr *)dep[0]);
+ IF_ADDR_RUNLOCK(ifp);
return dep[0];
- if (dep[1])
+ }
+ if (dep[1]) {
+ ifa_ref((struct ifaddr *)dep[1]);
+ IF_ADDR_RUNLOCK(ifp);
return dep[1];
+ }
+ IF_ADDR_RUNLOCK(ifp);
return NULL;
}
___
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: r236325 - head/sys/powerpc/booke
Author: raj
Date: Wed May 30 18:05:48 2012
New Revision: 236325
URL: http://svn.freebsd.org/changeset/base/236325
Log:
Panic openly if we cannot retrieve memory information from the device tree.
This is a critical condition and can lead to all sorts of misterious hangs if
not handled.
Obtained from:Semihalf
Also reported by: thompsa
Modified:
head/sys/powerpc/booke/platform_bare.c
Modified: head/sys/powerpc/booke/platform_bare.c
==
--- head/sys/powerpc/booke/platform_bare.c Wed May 30 17:34:40 2012
(r236324)
+++ head/sys/powerpc/booke/platform_bare.c Wed May 30 18:05:48 2012
(r236325)
@@ -76,7 +76,7 @@ static int bare_smp_start_cpu(platform_t
static void booke_reset(platform_t);
static platform_method_t bare_methods[] = {
- PLATFORMMETHOD(platform_probe, bare_probe),
+ PLATFORMMETHOD(platform_probe, bare_probe),
PLATFORMMETHOD(platform_mem_regions,bare_mem_regions),
PLATFORMMETHOD(platform_timebase_freq, bare_timebase_freq),
@@ -143,9 +143,9 @@ bare_mem_regions(platform_t plat, struct
int i, rv;
rv = fdt_get_mem_regions(avail_regions, availsz, &memsize);
-
if (rv != 0)
- return;
+ panic("%s: could not retrieve mem regions from the 'memory' "
+ "node, error: %d", __func__, rv);
for (i = 0; i < *availsz; i++) {
if (avail_regions[i].mr_start < 1048576) {
___
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: r236324 - in head/sys: conf powerpc/booke powerpc/include
Author: raj
Date: Wed May 30 17:34:40 2012
New Revision: 236324
URL: http://svn.freebsd.org/changeset/base/236324
Log:
Extract vendor specific Book-E pieces into separate files and have a common
skeleton (maybe we should kobj-tize this one day).
Note the PPC4xx bit is not connected to the build yet.
Obtained from:AppliedMicro, Semihalf.
Added:
head/sys/powerpc/booke/machdep_e500.c (contents, props changed)
head/sys/powerpc/booke/machdep_ppc4xx.c (contents, props changed)
head/sys/powerpc/include/machdep.h (contents, props changed)
Modified:
head/sys/conf/files.powerpc
head/sys/powerpc/booke/machdep.c
Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Wed May 30 17:07:50 2012(r236323)
+++ head/sys/conf/files.powerpc Wed May 30 17:34:40 2012(r236324)
@@ -102,6 +102,7 @@ powerpc/booke/copyinout.c optionalbooke
powerpc/booke/interrupt.c optionalbooke
powerpc/booke/locore.S optionalbooke no-obj
powerpc/booke/machdep.coptionalbooke
+powerpc/booke/machdep_e500.c optionalbooke_e500
powerpc/booke/mp_cpudep.c optionalbooke smp
powerpc/booke/platform_bare.c optionalmpc85xx
powerpc/booke/pmap.c optionalbooke
Modified: head/sys/powerpc/booke/machdep.c
==
--- head/sys/powerpc/booke/machdep.cWed May 30 17:07:50 2012
(r236323)
+++ head/sys/powerpc/booke/machdep.cWed May 30 17:34:40 2012
(r236324)
@@ -1,5 +1,5 @@
/*-
- * Copyright (C) 2006 Semihalf, Marian Balakowicz
+ * Copyright (C) 2006-2012 Semihalf
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -129,6 +129,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -138,8 +139,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
-
#ifdef DDB
extern vm_offset_t ksym_start, ksym_end;
#endif
@@ -158,11 +157,6 @@ extern unsigned char __sbss_start[];
extern unsigned char __sbss_end[];
extern unsigned char _end[];
-extern void dcache_enable(void);
-extern void dcache_inval(void);
-extern void icache_enable(void);
-extern void icache_inval(void);
-
/*
* Bootinfo is passed to us by legacy loaders. Save the address of the
* structure to handle backward compatibility.
@@ -286,7 +280,6 @@ booke_init(uint32_t arg1, uint32_t arg2)
struct pcpu *pc;
void *kmdp, *mdp;
vm_offset_t dtbp, end;
- uint32_t csr;
kmdp = NULL;
@@ -359,9 +352,9 @@ booke_init(uint32_t arg1, uint32_t arg2)
while (1);
OF_interpret("perform-fixup", 0);
-
- /* Initialize TLB1 handling */
- tlb1_init(fdt_immr_pa);
+
+ /* Set up TLB initially */
+ booke_init_tlb(fdt_immr_pa);
/* Reset Time Base */
mttb(0);
@@ -396,10 +389,6 @@ booke_init(uint32_t arg1, uint32_t arg2)
debugf(" HID0 = 0x%08x\n", mfspr(SPR_HID0));
debugf(" HID1 = 0x%08x\n", mfspr(SPR_HID1));
debugf(" BUCSR = 0x%08x\n", mfspr(SPR_BUCSR));
-
- __asm __volatile("msync; isync");
- csr = ccsr_read4(OCP85XX_L2CTL);
- debugf(" L2CTL = 0x%08x\n", csr);
#endif
debugf(" dtbp = 0x%08x\n", (uint32_t)dtbp);
@@ -447,29 +436,8 @@ booke_init(uint32_t arg1, uint32_t arg2)
mtmsr(mfmsr() | PSL_ME);
isync();
- /* Enable D-cache if applicable */
- csr = mfspr(SPR_L1CSR0);
- if ((csr & L1CSR0_DCE) == 0) {
- dcache_inval();
- dcache_enable();
- }
-
- csr = mfspr(SPR_L1CSR0);
- if ((boothowto & RB_VERBOSE) != 0 || (csr & L1CSR0_DCE) == 0)
- printf("L1 D-cache %sabled\n",
- (csr & L1CSR0_DCE) ? "en" : "dis");
-
- /* Enable L1 I-cache if applicable. */
- csr = mfspr(SPR_L1CSR1);
- if ((csr & L1CSR1_ICE) == 0) {
- icache_inval();
- icache_enable();
- }
-
- csr = mfspr(SPR_L1CSR1);
- if ((boothowto & RB_VERBOSE) != 0 || (csr & L1CSR1_ICE) == 0)
- printf("L1 I-cache %sabled\n",
- (csr & L1CSR1_ICE) ? "en" : "dis");
+ /* Enable L1 caches */
+ booke_enable_l1_cache();
debugf("%s: SP = 0x%08x\n", __func__,
((uintptr_t)thread0.td_pcb - 16) & ~15);
Added: head/sys/powerpc/booke/machdep_e500.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/powerpc/booke/machdep_e500.c Wed May 30 17:34:40 2012
(r236324)
@@ -0,0 +1,158 @@
+/*-
+ * Copyright (c) 2011-2012 Semihalf.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modif
svn commit: r236323 - head/sys/dev/mfi
Author: sbruno
Date: Wed May 30 17:07:50 2012
New Revision: 236323
URL: http://svn.freebsd.org/changeset/base/236323
Log:
Cosmetic nit. If a configured volume has no label, don't emit an empty
string for the name during probe. Simply indicate that it has no label.
Submitted by: bhaga@
MFC after:3 days
Modified:
head/sys/dev/mfi/mfi_disk.c
Modified: head/sys/dev/mfi/mfi_disk.c
==
--- head/sys/dev/mfi/mfi_disk.c Wed May 30 16:45:41 2012(r236322)
+++ head/sys/dev/mfi/mfi_disk.c Wed May 30 17:07:50 2012(r236323)
@@ -130,10 +130,17 @@ mfi_disk_attach(device_t dev)
state = "unknown";
break;
}
- device_printf(dev, "%juMB (%ju sectors) RAID volume '%s' is %s\n",
- sectors / (1024 * 1024 / secsize), sectors,
- ld_info->ld_config.properties.name,
- state);
+
+if ( strlen(ld_info->ld_config.properties.name) == 0 ) {
+device_printf(dev,
+ "%juMB (%ju sectors) RAID volume (no label) is %s\n",
+ sectors / (1024 * 1024 / secsize), sectors, state);
+} else {
+device_printf(dev,
+ "%juMB (%ju sectors) RAID volume '%s' is %s\n",
+ sectors / (1024 * 1024 / secsize), sectors,
+ ld_info->ld_config.properties.name, state);
+}
sc->ld_disk = disk_alloc();
sc->ld_disk->d_drv1 = sc;
___
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: r236322 - head/sys/ufs/ffs
Author: kib Date: Wed May 30 16:45:41 2012 New Revision: 236322 URL: http://svn.freebsd.org/changeset/base/236322 Log: Enable vn_io_fault() lock avoidance for UFS. Tested by:pho MFC after:2 months Modified: head/sys/ufs/ffs/ffs_vfsops.c head/sys/ufs/ffs/ffs_vnops.c Modified: head/sys/ufs/ffs/ffs_vfsops.c == --- head/sys/ufs/ffs/ffs_vfsops.c Wed May 30 16:42:08 2012 (r236321) +++ head/sys/ufs/ffs/ffs_vfsops.c Wed May 30 16:45:41 2012 (r236322) @@ -1064,7 +1064,7 @@ ffs_mountfs(devvp, mp, td) */ MNT_ILOCK(mp); mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED | - MNTK_EXTENDED_SHARED; + MNTK_EXTENDED_SHARED | MNTK_NO_IOPF; MNT_IUNLOCK(mp); #ifdef UFS_EXTATTR #ifdef UFS_EXTATTR_AUTOSTART Modified: head/sys/ufs/ffs/ffs_vnops.c == --- head/sys/ufs/ffs/ffs_vnops.cWed May 30 16:42:08 2012 (r236321) +++ head/sys/ufs/ffs/ffs_vnops.cWed May 30 16:45:41 2012 (r236322) @@ -567,7 +567,7 @@ ffs_read(ap) xfersize = size; } - error = uiomove((char *)bp->b_data + blkoffset, + error = vn_io_fault_uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio); if (error) break; @@ -738,8 +738,8 @@ ffs_write(ap) if (size < xfersize) xfersize = size; - error = - uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio); + error = vn_io_fault_uiomove((char *)bp->b_data + blkoffset, + (int)xfersize, uio); /* * If the buffer is not already filled and we encounter an * error while trying to fill it, we have to clear out any ___ 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: r236321 - in head/sys: kern sys
Author: kib
Date: Wed May 30 16:42:08 2012
New Revision: 236321
URL: http://svn.freebsd.org/changeset/base/236321
Log:
vn_io_fault() is a facility to prevent page faults while filesystems
perform copyin/copyout of the file data into the usermode
buffer. Typical filesystem hold vnode lock and some buffer locks over
the VOP_READ() and VOP_WRITE() operations, and since page fault
handler may need to recurse into VFS to get the page content, a
deadlock is possible.
The facility works by disabling page faults handling for the current
thread and attempting to execute i/o while allowing uiomove() to
access the usermode mapping of the i/o buffer. If all buffer pages are
resident, uiomove() is successfull and request is finished. If EFAULT
is returned from uiomove(), the pages backing i/o buffer are faulted
in and held, and the copyin/out is performed using uiomove_fromphys()
over the held pages for the second attempt of VOP call.
Since pages are hold in chunks to prevent large i/o requests from
starving free pages pool, and since vnode lock is only taken for
i/o over the current chunk, the vnode lock no longer protect atomicity
of the whole i/o request. Use newly added rangelocks to provide the
required atomicity of i/o regardind other i/o and truncations.
Filesystems need to explicitely opt-in into the scheme, by setting the
MNTK_NO_IOPF struct mount flag, and optionally by using
vn_io_fault_uiomove(9) helper which takes care of calling uiomove() or
converting uio into request for uiomove_fromphys().
Reviewed by: bf (comments), mdf, pjd (previous version)
Tested by:pho
Tested by:flo, Gustau P?rez (previous version)
MFC after:2 months
Modified:
head/sys/kern/vfs_vnops.c
head/sys/sys/mount.h
head/sys/sys/proc.h
head/sys/sys/vnode.h
Modified: head/sys/kern/vfs_vnops.c
==
--- head/sys/kern/vfs_vnops.c Wed May 30 16:30:51 2012(r236320)
+++ head/sys/kern/vfs_vnops.c Wed May 30 16:42:08 2012(r236321)
@@ -65,10 +65,15 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
+#include
+#include
#include
+#include
static fo_rdwr_t vn_read;
static fo_rdwr_t vn_write;
+static fo_rdwr_t vn_io_fault;
static fo_truncate_t vn_truncate;
static fo_ioctl_t vn_ioctl;
static fo_poll_t vn_poll;
@@ -77,8 +82,8 @@ static fo_stat_t vn_statfile;
static fo_close_t vn_closefile;
struct fileops vnops = {
- .fo_read = vn_read,
- .fo_write = vn_write,
+ .fo_read = vn_io_fault,
+ .fo_write = vn_io_fault,
.fo_truncate = vn_truncate,
.fo_ioctl = vn_ioctl,
.fo_poll = vn_poll,
@@ -367,57 +372,56 @@ sequential_heuristic(struct uio *uio, st
* Package up an I/O request on a vnode into a uio and do it.
*/
int
-vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, active_cred, file_cred,
-aresid, td)
- enum uio_rw rw;
- struct vnode *vp;
- void *base;
- int len;
- off_t offset;
- enum uio_seg segflg;
- int ioflg;
- struct ucred *active_cred;
- struct ucred *file_cred;
- ssize_t *aresid;
- struct thread *td;
+vn_rdwr(enum uio_rw rw, struct vnode *vp, void *base, int len, off_t offset,
+enum uio_seg segflg, int ioflg, struct ucred *active_cred,
+struct ucred *file_cred, ssize_t *aresid, struct thread *td)
{
struct uio auio;
struct iovec aiov;
struct mount *mp;
struct ucred *cred;
+ void *rl_cookie;
int error, lock_flags;
VFS_ASSERT_GIANT(vp->v_mount);
+ auio.uio_iov = &aiov;
+ auio.uio_iovcnt = 1;
+ aiov.iov_base = base;
+ aiov.iov_len = len;
+ auio.uio_resid = len;
+ auio.uio_offset = offset;
+ auio.uio_segflg = segflg;
+ auio.uio_rw = rw;
+ auio.uio_td = td;
+ error = 0;
+
if ((ioflg & IO_NODELOCKED) == 0) {
+ if (rw == UIO_READ) {
+ rl_cookie = vn_rangelock_rlock(vp, offset,
+ offset + len);
+ } else {
+ rl_cookie = vn_rangelock_wlock(vp, offset,
+ offset + len);
+ }
mp = NULL;
if (rw == UIO_WRITE) {
if (vp->v_type != VCHR &&
(error = vn_start_write(vp, &mp, V_WAIT | PCATCH))
!= 0)
- return (error);
+ goto out;
if (MNT_SHARED_WRITES(mp) ||
- ((mp == NULL) && MNT_SHARED_WRITES(vp->v_mount))) {
+ ((mp == NULL) && MNT_SHARED_WRITES(vp->v_mount)))
lock_flags = LK_SHARED;
- } else {
+ else
Re: svn commit: r236317 - in head/sys: conf kern sys
On Wed, May 30, 2012 at 04:06:38PM +, Konstantin Belousov wrote: > Author: kib > Date: Wed May 30 16:06:38 2012 > New Revision: 236317 > URL: http://svn.freebsd.org/changeset/base/236317 > > Log: > Add a rangelock implementation, intended to be used to range-locking > the i/o regions of the vnode data space. The implementation is quite > simple-minded, it uses the list of the lock requests, ordered by > arrival time. Each request may be for read or for write. The > implementation is fair FIFO. > > MFC after: 2 month Reviewed by:attilio, bf (comments), mdf, pjd Tested by: pho, flo, Gustau P?rez I am sorry. pgph8P8UT7W3T.pgp Description: PGP signature
svn commit: r236317 - in head/sys: conf kern sys
Author: kib
Date: Wed May 30 16:06:38 2012
New Revision: 236317
URL: http://svn.freebsd.org/changeset/base/236317
Log:
Add a rangelock implementation, intended to be used to range-locking
the i/o regions of the vnode data space. The implementation is quite
simple-minded, it uses the list of the lock requests, ordered by
arrival time. Each request may be for read or for write. The
implementation is fair FIFO.
MFC after: 2 month
Added:
head/sys/kern/kern_rangelock.c (contents, props changed)
head/sys/sys/rangelock.h (contents, props changed)
Modified:
head/sys/conf/files
head/sys/kern/kern_thread.c
head/sys/kern/vfs_subr.c
head/sys/sys/proc.h
head/sys/sys/vnode.h
Modified: head/sys/conf/files
==
--- head/sys/conf/files Wed May 30 16:04:10 2012(r236316)
+++ head/sys/conf/files Wed May 30 16:06:38 2012(r236317)
@@ -2562,6 +2562,7 @@ kern/kern_priv.c standard
kern/kern_proc.c standard
kern/kern_prot.c standard
kern/kern_racct.c standard
+kern/kern_rangelock.c standard
kern/kern_rctl.c standard
kern/kern_resource.c standard
kern/kern_rmlock.c standard
Added: head/sys/kern/kern_rangelock.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/kern/kern_rangelock.c Wed May 30 16:06:38 2012
(r236317)
@@ -0,0 +1,246 @@
+/*-
+ * Copyright (c) 2009 Konstantin Belousov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice unmodified, this list of conditions, and the following
+ *disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+struct rl_q_entry {
+ TAILQ_ENTRY(rl_q_entry) rl_q_link;
+ off_t rl_q_start, rl_q_end;
+ int rl_q_flags;
+};
+
+static uma_zone_t rl_entry_zone;
+
+static void
+rangelock_sys_init(void)
+{
+
+ rl_entry_zone = uma_zcreate("rl_entry", sizeof(struct rl_q_entry),
+ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
+}
+SYSINIT(vfs, SI_SUB_LOCK, SI_ORDER_ANY, rangelock_sys_init, NULL);
+
+static struct rl_q_entry *
+rlqentry_alloc(void)
+{
+
+ return (uma_zalloc(rl_entry_zone, M_WAITOK));
+}
+
+void
+rlqentry_free(struct rl_q_entry *rleq)
+{
+
+ uma_zfree(rl_entry_zone, rleq);
+}
+
+void
+rangelock_init(struct rangelock *lock)
+{
+
+ TAILQ_INIT(&lock->rl_waiters);
+ lock->rl_currdep = NULL;
+}
+
+void
+rangelock_destroy(struct rangelock *lock)
+{
+
+ KASSERT(TAILQ_EMPTY(&lock->rl_waiters), ("Dangling waiters"));
+}
+
+/*
+ * Verifies the supplied rl_q_entries for compatibility. Returns true
+ * if the rangelock queue entries are not compatible, false if they are.
+ *
+ * Two entries are compatible if their ranges do not overlap, or both
+ * entries are for read.
+ */
+static int
+rangelock_incompatible(const struct rl_q_entry *e1,
+const struct rl_q_entry *e2)
+{
+
+ if ((e1->rl_q_flags & RL_LOCK_TYPE_MASK) == RL_LOCK_READ &&
+ (e2->rl_q_flags & RL_LOCK_TYPE_MASK) == RL_LOCK_READ)
+ return (0);
+ if (e1->rl_q_start < e2->rl_q_end && e1->rl_q_end > e2->rl_q_start)
+ return (1);
+ return (0);
+}
+
+/*
+ * Recalculate the lock->rl_currdep after an unlock.
+ */
+static void
+rangelock_calc_block(struct rangelock *lock)
+{
+ struct rl_q_entry *entry, *entry1, *whead;
+
+ if (lock->rl_currdep == TAILQ_FIRST(&lock->rl_waiters) &&
+ lock->rl_currdep != NULL)
+ lock->rl_currdep = TAILQ_NEXT(lock->rl_currdep, rl_q_link);
+
svn commit: r236313 - head/sys/fs/nfsclient
Author: kib Date: Wed May 30 14:00:23 2012 New Revision: 236313 URL: http://svn.freebsd.org/changeset/base/236313 Log: Capitalize start of sentence. MFC after:3 days Modified: head/sys/fs/nfsclient/nfs_clbio.c Modified: head/sys/fs/nfsclient/nfs_clbio.c == --- head/sys/fs/nfsclient/nfs_clbio.c Wed May 30 13:58:01 2012 (r236312) +++ head/sys/fs/nfsclient/nfs_clbio.c Wed May 30 14:00:23 2012 (r236313) @@ -1178,7 +1178,7 @@ again: * significant cache coherency problems with multiple clients, * especially if locking is implemented later on. * -* as an optimization we could theoretically maintain +* As an optimization we could theoretically maintain * a linked list of discontinuous areas, but we would still * have to commit them separately so there isn't much * advantage to it except perhaps a bit of asynchronization. ___ 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: r236312 - head/sys/sys
Author: kib
Date: Wed May 30 13:58:01 2012
New Revision: 236312
URL: http://svn.freebsd.org/changeset/base/236312
Log:
Clarify that the v_lockf is advisory lock list.
MFC after:3 days
Modified:
head/sys/sys/vnode.h
Modified: head/sys/sys/vnode.h
==
--- head/sys/sys/vnode.hWed May 30 13:55:43 2012(r236311)
+++ head/sys/sys/vnode.hWed May 30 13:58:01 2012(r236312)
@@ -164,7 +164,7 @@ struct vnode {
*/
struct vpollinfo *v_pollinfo; /* i Poll events, p for *v_pi */
struct label *v_label; /* MAC label for vnode */
- struct lockf *v_lockf; /* Byte-level lock list */
+ struct lockf *v_lockf; /* Byte-level advisory lock list */
};
#endif /* defined(_KERNEL) || defined(_KVM_VNODE) */
___
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: r236311 - in head/sys/modules: cxgb/cxgb ixgbe
Author: uqs
Date: Wed May 30 13:55:43 2012
New Revision: 236311
URL: http://svn.freebsd.org/changeset/base/236311
Log:
Unbreak make depend.
Modified:
head/sys/modules/cxgb/cxgb/Makefile
head/sys/modules/ixgbe/Makefile
Modified: head/sys/modules/cxgb/cxgb/Makefile
==
--- head/sys/modules/cxgb/cxgb/Makefile Wed May 30 13:51:00 2012
(r236310)
+++ head/sys/modules/cxgb/cxgb/Makefile Wed May 30 13:55:43 2012
(r236311)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include
+
CXGB = ${.CURDIR}/../../../dev/cxgb
.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
Modified: head/sys/modules/ixgbe/Makefile
==
--- head/sys/modules/ixgbe/Makefile Wed May 30 13:51:00 2012
(r236310)
+++ head/sys/modules/ixgbe/Makefile Wed May 30 13:55:43 2012
(r236311)
@@ -1,5 +1,9 @@
#$FreeBSD$
+
+.include
+
.PATH: ${.CURDIR}/../../dev/ixgbe
+
KMOD= ixgbe
SRCS= device_if.h bus_if.h pci_if.h
SRCS += opt_inet.h opt_inet6.h
___
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: r236310 - head/sys/netinet
Author: glebius
Date: Wed May 30 13:51:00 2012
New Revision: 236310
URL: http://svn.freebsd.org/changeset/base/236310
Log:
Improve style(9) of bcopy() to and from mbuf tag.
Submitted by: bde
Modified:
head/sys/netinet/ip_carp.c
Modified: head/sys/netinet/ip_carp.c
==
--- head/sys/netinet/ip_carp.c Wed May 30 13:44:42 2012(r236309)
+++ head/sys/netinet/ip_carp.c Wed May 30 13:51:00 2012(r236310)
@@ -696,7 +696,7 @@ carp_prepare_ad(struct mbuf *m, struct c
CARPSTATS_INC(carps_onomem);
return (ENOMEM);
}
- bcopy(&sc, (caddr_t)(mtag + 1), sizeof(struct carp_softc *));
+ bcopy(&sc, mtag + 1, sizeof(sc));
m_tag_prepend(m, mtag);
return (0);
@@ -1066,8 +1066,7 @@ carp_macmatch6(struct ifnet *ifp, struct
/* Better a bit than nothing. */
return (LLADDR(&sc->sc_addr));
- bcopy(&sc, (caddr_t)(mtag + 1),
- sizeof(struct carp_softc *));
+ bcopy(&sc, mtag + 1, sizeof(sc));
m_tag_prepend(m, mtag);
return (LLADDR(&sc->sc_addr));
@@ -1391,7 +1390,7 @@ carp_output(struct ifnet *ifp, struct mb
if (mtag == NULL)
return (0);
- bcopy(mtag + 1, &sc, sizeof(struct carp_softc *));
+ bcopy(mtag + 1, &sc, sizeof(sc));
/* Set the source MAC address to the Virtual Router MAC Address. */
switch (ifp->if_type) {
___
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: r236309 - head/sys/kern
Author: kib
Date: Wed May 30 13:44:42 2012
New Revision: 236309
URL: http://svn.freebsd.org/changeset/base/236309
Log:
Assert that TDP_NOFAULTING and TDP_NOSPEEPING thread flags do not leak
when thread returns from a syscall to usermode.
Tested by:pho
MFC after:1 week
Modified:
head/sys/kern/subr_syscall.c
Modified: head/sys/kern/subr_syscall.c
==
--- head/sys/kern/subr_syscall.cWed May 30 13:33:27 2012
(r236308)
+++ head/sys/kern/subr_syscall.cWed May 30 13:44:42 2012
(r236309)
@@ -182,6 +182,12 @@ syscallret(struct thread *td, int error,
KASSERT(td->td_locks == 0,
("System call %s returning with %d locks held",
syscallname(p, sa->code), td->td_locks));
+ KASSERT((td->td_pflags & TDP_NOFAULTING) == 0,
+ ("System call %s returning with pagefaults disabled",
+syscallname(p, sa->code)));
+ KASSERT((td->td_pflags & TDP_NOSLEEPING) == 0,
+ ("System call %s returning with sleep disabled",
+syscallname(p, sa->code)));
/*
* Handle reschedule and other end-of-syscall issues
___
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: r236308 - head/sys/arm/arm
Author: gber
Date: Wed May 30 13:33:27 2012
New Revision: 236308
URL: http://svn.freebsd.org/changeset/base/236308
Log:
Print userspace backtrace for current thread.
Reviewed by: imp
Obtained from:Semihalf
Modified:
head/sys/arm/arm/db_trace.c
Modified: head/sys/arm/arm/db_trace.c
==
--- head/sys/arm/arm/db_trace.c Wed May 30 13:31:08 2012(r236307)
+++ head/sys/arm/arm/db_trace.c Wed May 30 13:33:27 2012(r236308)
@@ -79,14 +79,13 @@ __FBSDID("$FreeBSD$");
*/
static void
-db_stack_trace_cmd(db_expr_t addr, db_expr_t count)
+db_stack_trace_cmd(db_expr_t addr, db_expr_t count, boolean_t kernel_only)
{
u_int32_t *frame, *lastframe;
c_db_sym_t sym;
const char *name;
db_expr_t value;
db_expr_t offset;
- boolean_t kernel_only = TRUE;
int scp_offset;
frame = (u_int32_t *)addr;
@@ -196,8 +195,11 @@ db_trace_thread(struct thread *thr, int
{
struct pcb *ctx;
- ctx = kdb_thr_ctx(thr);
- db_stack_trace_cmd(ctx->un_32.pcb32_r11, -1);
+ if (thr != curthread) {
+ ctx = kdb_thr_ctx(thr);
+ db_stack_trace_cmd(ctx->un_32.pcb32_r11, -1, TRUE);
+ } else
+ db_trace_self();
return (0);
}
@@ -207,5 +209,5 @@ db_trace_self(void)
db_addr_t addr;
addr = (db_addr_t)__builtin_frame_address(0);
- db_stack_trace_cmd(addr, -1);
+ db_stack_trace_cmd(addr, -1, FALSE);
}
___
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: r236307 - head/sys/arm/include
Author: gber
Date: Wed May 30 13:31:08 2012
New Revision: 236307
URL: http://svn.freebsd.org/changeset/base/236307
Log:
Flush D and I caches after setting a breakpoint.
Reviewed by: imp
Obtained from: Semihalf
Modified:
head/sys/arm/include/kdb.h
Modified: head/sys/arm/include/kdb.h
==
--- head/sys/arm/include/kdb.h Wed May 30 13:00:43 2012(r236306)
+++ head/sys/arm/include/kdb.h Wed May 30 13:31:08 2012(r236307)
@@ -46,11 +46,14 @@ kdb_cpu_set_singlestep(void)
static __inline void
kdb_cpu_sync_icache(unsigned char *addr, size_t size)
{
+
+ cpu_icache_sync_all();
}
static __inline void
kdb_cpu_trap(int type, int code)
{
+
cpu_idcache_wbinv_all();
}
___
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: r236137 - head/contrib/gcc/config/i386
On Wed, May 30, 2012 at 10:00:02AM +0100, David Chisnall wrote: > On 30 May 2012, at 09:01, Marius Strobl wrote: > > > Ehm, yes, but given that this wouldn't be the first such flag we have > > is avoiding it really worth the link time and run time overheads in > > the long term? > > Given the small overhead of the extra hashes, yes. At some point in > the future, we can turn off the older ones and get a tiny reduction > in overhead, but doing it now would cause much more pain for users in > not being able to copy binaries from slightly newer to slightly older > machines than we'd save from a tiny increase in binary size. > > This is the archetypal change for incremental deployment, let's not > make our users' lives difficult just because we can. > > David Who doesn't want to be woken up by mobs of users with flaming > torches and pitchforks. I agree, the overhead of additional symbol hash is relatively low, and only impact developers. I do not think that it is reasonable to even start thinking about turning off SysV hash before at least one release passes. Besides this, another consideration to keep SysV hash around is to keep other tools, besides rtld, working. I am not sure whether e.g. libelf or DTrace use hash. But if using hash, I am quite sure that they use SysV one. pgp3uBOAtYu1g.pgp Description: PGP signature
svn commit: r236304 - head/crypto/openssl/crypto/buffer head/crypto/openssl/ssl head/secure/lib/libcrypt releng/7.4 releng/7.4/crypto/openssl/crypto/buffer releng/7.4/crypto/openssl/ssl releng/7.4/...
Author: bz
Date: Wed May 30 12:01:28 2012
New Revision: 236304
URL: http://svn.freebsd.org/changeset/base/236304
Log:
Update the previous openssl fix. [12:01]
Fix a bug in crypt(3) ignoring characters of a passphrase. [12:02]
Security: FreeBSD-SA-12:01.openssl (revised)
Security: FreeBSD-SA-12:02.crypt
Approved by: so (bz, simon)
Modified:
head/crypto/openssl/crypto/buffer/buffer.c
head/crypto/openssl/ssl/s3_srvr.c
head/secure/lib/libcrypt/crypt-des.c
Changes in other areas also in this revision:
Modified:
releng/7.4/UPDATING
releng/7.4/crypto/openssl/crypto/buffer/buffer.c
releng/7.4/crypto/openssl/ssl/s3_srvr.c
releng/7.4/secure/lib/libcrypt/crypt-des.c
releng/7.4/sys/conf/newvers.sh
releng/8.1/UPDATING
releng/8.1/crypto/openssl/crypto/buffer/buffer.c
releng/8.1/crypto/openssl/ssl/s3_srvr.c
releng/8.1/secure/lib/libcrypt/crypt-des.c
releng/8.1/sys/conf/newvers.sh
releng/8.2/UPDATING
releng/8.2/crypto/openssl/crypto/buffer/buffer.c
releng/8.2/crypto/openssl/ssl/s3_srvr.c
releng/8.2/secure/lib/libcrypt/crypt-des.c
releng/8.2/sys/conf/newvers.sh
releng/8.3/UPDATING
releng/8.3/crypto/openssl/crypto/buffer/buffer.c
releng/8.3/crypto/openssl/ssl/s3_srvr.c
releng/8.3/secure/lib/libcrypt/crypt-des.c
releng/8.3/sys/conf/newvers.sh
releng/9.0/UPDATING
releng/9.0/crypto/openssl/crypto/buffer/buffer.c
releng/9.0/crypto/openssl/ssl/s3_srvr.c
releng/9.0/secure/lib/libcrypt/crypt-des.c
releng/9.0/sys/conf/newvers.sh
stable/7/crypto/openssl/crypto/buffer/buffer.c
stable/7/crypto/openssl/ssl/s3_srvr.c
stable/7/secure/lib/libcrypt/crypt-des.c
stable/8/crypto/openssl/crypto/buffer/buffer.c
stable/8/crypto/openssl/ssl/s3_srvr.c
stable/8/secure/lib/libcrypt/crypt-des.c
stable/9/crypto/openssl/crypto/buffer/buffer.c
stable/9/crypto/openssl/ssl/s3_srvr.c
stable/9/secure/lib/libcrypt/crypt-des.c
Modified: head/crypto/openssl/crypto/buffer/buffer.c
==
--- head/crypto/openssl/crypto/buffer/buffer.c Wed May 30 11:48:57 2012
(r236303)
+++ head/crypto/openssl/crypto/buffer/buffer.c Wed May 30 12:01:28 2012
(r236304)
@@ -166,7 +166,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, int
/* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
if (len > LIMIT_BEFORE_EXPANSION)
{
- BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+ BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
return 0;
}
n=(len+3)/3*4;
Modified: head/crypto/openssl/ssl/s3_srvr.c
==
--- head/crypto/openssl/ssl/s3_srvr.c Wed May 30 11:48:57 2012
(r236303)
+++ head/crypto/openssl/ssl/s3_srvr.c Wed May 30 12:01:28 2012
(r236304)
@@ -698,14 +698,6 @@ int ssl3_check_client_hello(SSL *s)
int ok;
long n;
- /* We only allow the client to restart the handshake once per
-* negotiation. */
- if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE)
- {
- SSLerr(SSL_F_SSL3_CHECK_CLIENT_HELLO,
SSL_R_MULTIPLE_SGC_RESTARTS);
- return -1;
- }
-
/* this function is called when we really expect a Certificate message,
* so permit appropriate message length */
n=s->method->ssl_get_message(s,
@@ -718,6 +710,13 @@ int ssl3_check_client_hello(SSL *s)
s->s3->tmp.reuse_message = 1;
if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
{
+ /* We only allow the client to restart the handshake once per
+* negotiation. */
+ if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE)
+ {
+ SSLerr(SSL_F_SSL3_CHECK_CLIENT_HELLO,
SSL_R_MULTIPLE_SGC_RESTARTS);
+ return -1;
+ }
/* Throw away what we have done so far in the current handshake,
* which will now be aborted. (A full SSL_clear would be too
much.) */
#ifndef OPENSSL_NO_DH
Modified: head/secure/lib/libcrypt/crypt-des.c
==
--- head/secure/lib/libcrypt/crypt-des.cWed May 30 11:48:57 2012
(r236303)
+++ head/secure/lib/libcrypt/crypt-des.cWed May 30 12:01:28 2012
(r236304)
@@ -606,7 +606,7 @@ crypt_des(const char *key, const char *s
q = (u_char *)keybuf;
while (q - (u_char *)keybuf - 8) {
*q++ = *key << 1;
- if (*(q - 1))
+ if (*key != '\0')
key++;
}
if (des_setkey((char *)keybuf))
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-h
Re: svn commit: r236137 - head/contrib/gcc/config/i386
On 30 May 2012, at 09:01, Marius Strobl wrote: > Ehm, yes, but given that this wouldn't be the first such flag we have > is avoiding it really worth the link time and run time overheads in > the long term? Given the small overhead of the extra hashes, yes. At some point in the future, we can turn off the older ones and get a tiny reduction in overhead, but doing it now would cause much more pain for users in not being able to copy binaries from slightly newer to slightly older machines than we'd save from a tiny increase in binary size. This is the archetypal change for incremental deployment, let's not make our users' lives difficult just because we can. David Who doesn't want to be woken up by mobs of users with flaming torches and pitchforks.___ 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: r236137 - head/contrib/gcc/config/i386
On Wed, May 30, 2012 at 06:47:47AM +0300, Konstantin Belousov wrote: > On Wed, May 30, 2012 at 12:48:33AM +0200, Marius Strobl wrote: > > On Mon, May 28, 2012 at 11:47:28PM +0300, Konstantin Belousov wrote: > > > On Mon, May 28, 2012 at 09:03:55PM +0200, Marius Strobl wrote: > > > > On Sun, May 27, 2012 at 05:27:48AM +, Konstantin Belousov wrote: > > > > > Author: kib > > > > > Date: Sun May 27 05:27:47 2012 > > > > > New Revision: 236137 > > > > > URL: http://svn.freebsd.org/changeset/base/236137 > > > > > > > > > > Log: > > > > > Enable gnu hash generation for dynamic ELF binaries on x86. > > > > > > > > > > > > > As far as I remember from your commit adding GNU hash support to > > > > rtld(1), there's nothing left to be done for the other architectures > > > > apart from testing, correct? > > > > > > Yes, you are correct. I am not aware of any non-implemented MD parts, > > > but I was unable to test on !x86, and got no feedback from arch > > > maintainers. > > > > Sorry, must have missed that mail. > > What's the point of letting the linker create both the ELF and the > > GNU hash tables and not just going with the latter one? > > It prevents the flag day. If your binary is built on slightly newer system, > using both hashes allows it to be used on the system with slightly older > rtld, which was built before gnu hash support was added. Ehm, yes, but given that this wouldn't be the first such flag we have is avoiding it really worth the link time and run time overheads in the long term? Do you plan to change it to GNU hash only in HEAD at some point after MFC'ing? Marius ___ 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: r236297 - head/sys/netinet
Author: glebius Date: Wed May 30 07:11:27 2012 New Revision: 236297 URL: http://svn.freebsd.org/changeset/base/236297 Log: After r228571 carp_output() expects carp_softc * pointer in the mtag. Noticed by: thompsa Modified: head/sys/netinet/ip_carp.c Modified: head/sys/netinet/ip_carp.c == --- head/sys/netinet/ip_carp.c Wed May 30 06:53:09 2012(r236296) +++ head/sys/netinet/ip_carp.c Wed May 30 07:11:27 2012(r236297) @@ -1061,13 +1061,13 @@ carp_macmatch6(struct ifnet *ifp, struct IF_ADDR_RUNLOCK(ifp); mtag = m_tag_get(PACKET_TAG_CARP, - sizeof(struct ifnet *), M_NOWAIT); + sizeof(struct carp_softc *), M_NOWAIT); if (mtag == NULL) /* Better a bit than nothing. */ return (LLADDR(&sc->sc_addr)); - bcopy(&ifp, (caddr_t)(mtag + 1), - sizeof(struct ifnet *)); + bcopy(&sc, (caddr_t)(mtag + 1), + sizeof(struct carp_softc *)); m_tag_prepend(m, mtag); return (LLADDR(&sc->sc_addr)); ___ 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"
