svn commit: r216733 - head/sys/kern
Author: kib Date: Mon Dec 27 12:06:38 2010 New Revision: 216733 URL: http://svn.freebsd.org/changeset/base/216733 Log: Teach ddb show mount about MNTK_SUJ flag. Modified: head/sys/kern/vfs_subr.c Modified: head/sys/kern/vfs_subr.c == --- head/sys/kern/vfs_subr.cMon Dec 27 07:38:33 2010(r216732) +++ head/sys/kern/vfs_subr.cMon Dec 27 12:06:38 2010(r216733) @@ -2877,6 +2877,7 @@ DB_SHOW_COMMAND(mount, db_show_mount) MNT_KERN_FLAG(MNTK_REFEXPIRE); MNT_KERN_FLAG(MNTK_EXTENDED_SHARED); MNT_KERN_FLAG(MNTK_SHARED_WRITES); + MNT_KERN_FLAG(MNTK_SUJ); MNT_KERN_FLAG(MNTK_UNMOUNT); MNT_KERN_FLAG(MNTK_MWAIT); MNT_KERN_FLAG(MNTK_SUSPEND); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216734 - in stable/8: contrib/binutils/bfd contrib/binutils/binutils contrib/binutils/include/elf contrib/file contrib/gdb/gdb gnu/usr.bin/gdb/libgdb sys/compat/freebsd32 sys/kern sys/...
Author: attilio
Date: Mon Dec 27 12:39:24 2010
New Revision: 216734
URL: http://svn.freebsd.org/changeset/base/216734
Log:
MFC r215679:
Add the ability for GDB to printout the thread name along with other thread
specific informations.
In order to achieve that, for both on-line debugging and core analysis,
a new member to PT_LWPINFO ptrace(2) interface is added and a new
ELF note (NT_THRMISC) as well.
Sponsored by: Sandvine Incorporated
Modified:
stable/8/contrib/binutils/bfd/elf-bfd.h
stable/8/contrib/binutils/bfd/elf.c
stable/8/contrib/binutils/binutils/readelf.c
stable/8/contrib/binutils/include/elf/common.h
stable/8/contrib/file/readelf.h
stable/8/contrib/gdb/gdb/fbsd-proc.c
stable/8/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
stable/8/sys/compat/freebsd32/freebsd32.h
stable/8/sys/kern/imgact_elf.c
stable/8/sys/kern/sys_process.c
stable/8/sys/sys/elf_common.h
stable/8/sys/sys/procfs.h
stable/8/sys/sys/ptrace.h
stable/8/usr.bin/gcore/elfcore.c
Directory Properties:
stable/8/contrib/binutils/ (props changed)
stable/8/contrib/file/ (props changed)
stable/8/contrib/gdb/ (props changed)
stable/8/gnu/usr.bin/gdb/ (props changed)
stable/8/gnu/usr.bin/gdb/kgdb/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/usr.bin/gcore/ (props changed)
Modified: stable/8/contrib/binutils/bfd/elf-bfd.h
==
--- stable/8/contrib/binutils/bfd/elf-bfd.h Mon Dec 27 12:06:38 2010
(r216733)
+++ stable/8/contrib/binutils/bfd/elf-bfd.h Mon Dec 27 12:39:24 2010
(r216734)
@@ -1673,6 +1673,8 @@ extern char * elfcore_write_pstatus
(bfd *, char *, int *, long, int, const void *);
extern char *elfcore_write_prfpreg
(bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_thrmisc
+ (bfd *, char *, int *, const char *, int);
extern char *elfcore_write_prxfpreg
(bfd *, char *, int *, const void *, int);
extern char *elfcore_write_lwpstatus
Modified: stable/8/contrib/binutils/bfd/elf.c
==
--- stable/8/contrib/binutils/bfd/elf.c Mon Dec 27 12:06:38 2010
(r216733)
+++ stable/8/contrib/binutils/bfd/elf.c Mon Dec 27 12:39:24 2010
(r216734)
@@ -6316,6 +6316,12 @@ _bfd_elf_rel_vtable_reloc_fn
#ifdef HAVE_SYS_PROCFS_H
# include sys/procfs.h
+
+/* Define HAVE_THRMISC_T for consistency with other similar GNU-type stubs. */
+#undef HAVE_THRMISC_T
+#if defined (THRMISC_VERSION)
+#defineHAVE_THRMISC_T 1
+#endif
#endif
/* FIXME: this is kinda wrong, but it's what gdb wants. */
@@ -6497,6 +6503,16 @@ elfcore_grok_prxfpreg (bfd *abfd, Elf_In
return elfcore_make_note_pseudosection (abfd, .reg-xfp, note);
}
+#if defined (HAVE_THRMISC_T)
+
+static bfd_boolean
+elfcore_grok_thrmisc (bfd *abfd, Elf_Internal_Note *note)
+{
+ return elfcore_make_note_pseudosection (abfd, .tname, note);
+}
+
+#endif /* defined (HAVE_THRMISC_T) */
+
#if defined (HAVE_PRPSINFO_T)
typedef prpsinfo_t elfcore_psinfo_t;
#if defined (HAVE_PRPSINFO32_T)/* Sparc64 cross Sparc32 */
@@ -6863,6 +6879,12 @@ elfcore_grok_note (bfd *abfd, Elf_Intern
return TRUE;
}
+
+#if defined (HAVE_THRMISC_T)
+case NT_THRMISC:
+ return elfcore_grok_thrmisc (abfd, note);
+#endif
+
}
}
@@ -7245,6 +7267,22 @@ elfcore_write_prfpreg (bfd *abfd,
}
char *
+elfcore_write_thrmisc (bfd *abfd,
+ char *buf,
+ int *bufsiz,
+ const char *tname,
+ int size)
+{
+#if defined (HAVE_THRMISC_T)
+ char *note_name = CORE;
+ return elfcore_write_note (abfd, buf, bufsiz,
+note_name, NT_THRMISC, tname, size);
+#else
+ return buf;
+#endif
+}
+
+char *
elfcore_write_prxfpreg (bfd *abfd,
char *buf,
int *bufsiz,
Modified: stable/8/contrib/binutils/binutils/readelf.c
==
--- stable/8/contrib/binutils/binutils/readelf.cMon Dec 27 12:06:38
2010(r216733)
+++ stable/8/contrib/binutils/binutils/readelf.cMon Dec 27 12:39:24
2010(r216734)
@@ -9908,6 +9908,7 @@ get_note_type (unsigned e_type)
case NT_PSTATUS: return _(NT_PSTATUS (pstatus structure));
case NT_FPREGS:return _(NT_FPREGS (floating point registers));
case NT_PSINFO:return _(NT_PSINFO (psinfo structure));
+case NT_THRMISC: return _(NT_THRMISC (thrmisc structure));
case NT_LWPSTATUS: return _(NT_LWPSTATUS (lwpstatus_t structure));
case NT_LWPSINFO: return _(NT_LWPSINFO (lwpsinfo_t structure));
svn commit: r216735 - stable/8/sys/dev/ichwd
Author: attilio
Date: Mon Dec 27 12:52:35 2010
New Revision: 216735
URL: http://svn.freebsd.org/changeset/base/216735
Log:
MFC r215868, 215918, 216266, 216298:
- Advertise when the reboot came from a watchdog-induced reset
- Fix a bug where TCO_BOOT_STS was supposed to be cleared after
TCO_SECOND_TO_STS
- Use macros for max and min value capping when re-arming the
watchdog timeout
Sponsored by: Sandvine Incorporated
Modified:
stable/8/sys/dev/ichwd/ichwd.c
stable/8/sys/dev/ichwd/ichwd.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/ichwd/ichwd.c
==
--- stable/8/sys/dev/ichwd/ichwd.c Mon Dec 27 12:39:24 2010
(r216734)
+++ stable/8/sys/dev/ichwd/ichwd.c Mon Dec 27 12:52:35 2010
(r216735)
@@ -179,12 +179,12 @@ ichwd_sts_reset(struct ichwd_softc *sc)
* by writing a 1, not a 0.
*/
ichwd_write_tco_2(sc, TCO1_STS, TCO_TIMEOUT);
- /*
-* XXX The datasheet says that TCO_SECOND_TO_STS must be cleared
-* before TCO_BOOT_STS, not the other way around.
+ /*
+* According to Intel's docs, clearing SECOND_TO_STS and BOOT_STS must
+* be done in two separate operations.
*/
- ichwd_write_tco_2(sc, TCO2_STS, TCO_BOOT_STS);
ichwd_write_tco_2(sc, TCO2_STS, TCO_SECOND_TO_STS);
+ ichwd_write_tco_2(sc, TCO2_STS, TCO_BOOT_STS);
}
/*
@@ -242,30 +242,23 @@ static __inline void
ichwd_tmr_set(struct ichwd_softc *sc, unsigned int timeout)
{
- /*
-* If the datasheets are to be believed, the minimum value
-* actually varies from chipset to chipset - 4 for ICH5 and 2 for
-* all other chipsets. I suspect this is a bug in the ICH5
-* datasheet and that the minimum is uniformly 2, but I'd rather
-* err on the side of caution.
-*/
- if (timeout 4)
- timeout = 4;
+ if (timeout TCO_RLD_TMR_MIN)
+ timeout = TCO_RLD_TMR_MIN;
if (sc-ich_version = 5) {
uint8_t tmr_val8 = ichwd_read_tco_1(sc, TCO_TMR1);
- tmr_val8 = 0xc0;
- if (timeout 0x3f)
- timeout = 0x3f;
+ tmr_val8 = (~TCO_RLD1_TMR_MAX 0xff);
+ if (timeout TCO_RLD1_TMR_MAX)
+ timeout = TCO_RLD1_TMR_MAX;
tmr_val8 |= timeout;
ichwd_write_tco_1(sc, TCO_TMR1, tmr_val8);
} else {
uint16_t tmr_val16 = ichwd_read_tco_2(sc, TCO_TMR2);
- tmr_val16 = 0xfc00;
- if (timeout 0x03ff)
- timeout = 0x03ff;
+ tmr_val16 = (~TCO_RLD2_TMR_MAX 0x);
+ if (timeout TCO_RLD2_TMR_MAX)
+ timeout = TCO_RLD2_TMR_MAX;
tmr_val16 |= timeout;
ichwd_write_tco_2(sc, TCO_TMR2, tmr_val16);
}
@@ -474,11 +467,13 @@ ichwd_attach(device_t dev)
device_get_desc(dev), sc-ich_version);
/*
-* XXX we should check the status registers (specifically, the
-* TCO_SECOND_TO_STS bit in the TCO2_STS register) to see if we
-* just came back from a watchdog-induced reset, and let the user
-* know.
+* Determine if we are coming up after a watchdog-induced reset. Some
+* BIOSes may clear this bit at bootup, preventing us from reporting
+* this case on such systems. We clear this bit in ichwd_sts_reset().
*/
+ if ((ichwd_read_tco_2(sc, TCO2_STS) TCO_SECOND_TO_STS) != 0)
+ device_printf(dev,
+ resuming after hardware watchdog timeout\n);
/* reset the watchdog status registers */
ichwd_sts_reset(sc);
Modified: stable/8/sys/dev/ichwd/ichwd.h
==
--- stable/8/sys/dev/ichwd/ichwd.h Mon Dec 27 12:39:24 2010
(r216734)
+++ stable/8/sys/dev/ichwd/ichwd.h Mon Dec 27 12:52:35 2010
(r216735)
@@ -153,6 +153,17 @@ struct ichwd_softc {
#define TCO_TMR_HALT 0x0800 /* clear to enable WDT */
#define TCO_CNT_PRESERVE 0x0200 /* preserve these bits */
+/*
+ * Masks for the TCO timer value field in TCO_RLD.
+ * If the datasheets are to be believed, the minimum value actually varies
+ * from chipset to chipset - 4 for ICH5 and 2 for all other chipsets.
+ * I suspect this is a bug in the ICH5 datasheet and that the minimum is
+ * uniformly 2, but I'd rather err on the side of caution.
+ */
+#define TCO_RLD_TMR_MIN0x0004
+#define TCO_RLD1_TMR_MAX 0x003f
+#define TCO_RLD2_TMR_MAX 0x03ff
+
svn commit: r216736 - stable/8/sys/dev/puc
Author: attilio
Date: Mon Dec 27 12:57:38 2010
New Revision: 216736
URL: http://svn.freebsd.org/changeset/base/216736
Log:
MFC r216513:
Add Exar octal PCI UART.
Sponsored by: Sandvine Incorporated
Modified:
stable/8/sys/dev/puc/pucdata.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/puc/pucdata.c
==
--- stable/8/sys/dev/puc/pucdata.c Mon Dec 27 12:52:35 2010
(r216735)
+++ stable/8/sys/dev/puc/pucdata.c Mon Dec 27 12:57:38 2010
(r216736)
@@ -554,6 +554,12 @@ const struct puc_cfg puc_pci_devices[] =
.config_function = puc_config_cronyx
},
+ { 0x13a8, 0x0258, 0x, 0,
+ Exar XR17V258IV,
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, 0x10, 0, -1,
+ },
+
{ 0x1407, 0x0100, 0x, 0,
Lava Computers Dual Serial,
DEFAULT_RCLK,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216737 - head/usr.bin/lock
Author: ed Date: Mon Dec 27 15:05:15 2010 New Revision: 216737 URL: http://svn.freebsd.org/changeset/base/216737 Log: Fix style bug introduced in r216696. Additional indentation caused the line to become longer than 80 columns. Modified: head/usr.bin/lock/lock.c Modified: head/usr.bin/lock/lock.c == --- head/usr.bin/lock/lock.cMon Dec 27 12:57:38 2010(r216736) +++ head/usr.bin/lock/lock.cMon Dec 27 15:05:15 2010(r216737) @@ -198,7 +198,8 @@ main(int argc, char **argv) /* header info */ if (pw != NULL) - (void)printf(lock: %s using %s on %s., pw-pw_name, ttynam, hostname); + (void)printf(lock: %s using %s on %s., pw-pw_name, + ttynam, hostname); else (void)printf(lock: %s on %s., ttynam, hostname); if (no_timeout) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216738 - head/tools/regression/bin/sh/expansion
Author: emaste
Date: Mon Dec 27 15:57:41 2010
New Revision: 216738
URL: http://svn.freebsd.org/changeset/base/216738
Log:
Restore two commented-out tests from plus-minus1.0 to a new file.
These two cases pass on -CURRENT but fail on stable/8.
Reviewed by: jilles
Added:
head/tools/regression/bin/sh/expansion/plus-minus7.0 (contents, props
changed)
Modified:
head/tools/regression/bin/sh/expansion/plus-minus1.0
Modified: head/tools/regression/bin/sh/expansion/plus-minus1.0
==
--- head/tools/regression/bin/sh/expansion/plus-minus1.0Mon Dec 27
15:05:15 2010(r216737)
+++ head/tools/regression/bin/sh/expansion/plus-minus1.0Mon Dec 27
15:57:41 2010(r216738)
@@ -43,9 +43,6 @@ testcase 'set -- ${e:+$w$e}''0|'
testcase 'set -- ${w:+$w}' '1|a b c'
testcase 'set -- ${w:+$w$w}' '3|a|b|ca b c'
-# These two are known broken in FreeBSD /bin/sh
-#testcase 'set -- ${s+a b}''2|a|b'
-#testcase 'set -- ${e:-a b}' '2|a|b'
testcase 'set -- ${s+a b}' '1|a b'
testcase 'set -- ${e:-a b}' '1|a b'
testcase 'set -- ${e:-\}}' '1|}'
Added: head/tools/regression/bin/sh/expansion/plus-minus7.0
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/bin/sh/expansion/plus-minus7.0Mon Dec 27
15:57:41 2010(r216738)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+e= s='foo'
+failures=''
+ok=''
+
+testcase() {
+ code=$1
+ expected=$2
+ oIFS=$IFS
+ eval $code
+ IFS='|'
+ result=$#|$*
+ IFS=$oIFS
+ if [ x$result = x$expected ]; then
+ ok=x$ok
+ else
+ failures=x$failures
+ echo For $code, expected $expected actual $result
+ fi
+}
+
+testcase 'set -- ${s+a b}' '2|a|b'
+testcase 'set -- ${e:-a b}''2|a|b'
+
+test x$failures = x
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216739 - in stable/8: etc sbin/route
Author: hrs
Date: Mon Dec 27 16:01:39 2010
New Revision: 216739
URL: http://svn.freebsd.org/changeset/base/216739
Log:
- route(8) manual page update: no longer supports RTF_CLONING and
RTF_LLINFO (MFC from r196833)
- Remove -cloning flag from network.subr[*]
PR: conf/144842 [*]
Approved by: re (bz)
Modified:
stable/8/etc/network.subr
stable/8/sbin/route/route.8
Directory Properties:
stable/8/sbin/route/ (props changed)
Modified: stable/8/etc/network.subr
==
--- stable/8/etc/network.subr Mon Dec 27 15:57:41 2010(r216738)
+++ stable/8/etc/network.subr Mon Dec 27 16:01:39 2010(r216739)
@@ -1134,8 +1134,7 @@ network6_default_interface_setup()
;;
*)
laddr=`network6_getladdr ${ipv6_default_interface}`
- route add -inet6 ff02:: ${laddr} -prefixlen 16 -interface \
- -cloning
+ route add -inet6 ff02:: ${laddr} -prefixlen 16 -interface
# Disable installing the default interface with the
# case net.inet6.ip6.forwarding=0 and
Modified: stable/8/sbin/route/route.8
==
--- stable/8/sbin/route/route.8 Mon Dec 27 15:57:41 2010(r216738)
+++ stable/8/sbin/route/route.8 Mon Dec 27 16:01:39 2010(r216739)
@@ -28,7 +28,7 @@
.\ @(#)route.88.3 (Berkeley) 3/19/94
.\ $FreeBSD$
.\
-.Dd October 2, 2005
+.Dd December 17, 2010
.Dt ROUTE 8
.Os
.Sh NAME
@@ -279,7 +279,6 @@ when sending to destinations matched by
These flags may be set (or sometimes cleared)
by indicating the following corresponding modifiers:
.Bd -literal
--cloning RTF_CLONING- generates a new route on use
-xresolve RTF_XRESOLVE - emit mesg on use (for external lookup)
-iface~RTF_GATEWAY- destination is directly reachable
-staticRTF_STATIC - manually added route
@@ -288,7 +287,6 @@ by indicating the following correspondin
-blackhole RTF_BLACKHOLE - silently discard pkts (during updates)
-proto1RTF_PROTO1 - set protocol specific routing flag #1
-proto2RTF_PROTO2 - set protocol specific routing flag #2
--llinfoRTF_LLINFO - validly translates proto addr to link addr
.Ed
.Pp
The optional modifiers
@@ -326,25 +324,6 @@ or
.Fl ifa
modifiers may be used to determine the interface or interface address.
.Pp
-The optional
-.Fl proxy
-modifier specifies that the
-.Dv RTF_LLINFO
-routing table entry is the
-.Dq published (proxy-only)
-.Tn ARP
-entry, as reported by
-.Xr arp 8 .
-.Pp
-The optional
-.Fl genmask
-modifier specifies that a cloning mask is present.
-This specifies the mask applied when determining if a child route
-should be created.
-It is only applicable to network routes with the
-.Dv RTF_CLONING
-flag set.
-.Pp
All symbolic names specified for a
.Ar destination
or
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216740 - in releng/8.2: etc sbin/route
Author: hrs
Date: Mon Dec 27 16:02:14 2010
New Revision: 216740
URL: http://svn.freebsd.org/changeset/base/216740
Log:
- route(8) manual page update: no longer supports RTF_CLONING and
RTF_LLINFO (MFC from r196833)
- Remove -cloning flag from network.subr[*]
PR: conf/144842 [*]
Approved by: re (bz)
Modified:
releng/8.2/etc/network.subr
releng/8.2/sbin/route/route.8
Directory Properties:
releng/8.2/sbin/route/ (props changed)
Modified: releng/8.2/etc/network.subr
==
--- releng/8.2/etc/network.subr Mon Dec 27 16:01:39 2010(r216739)
+++ releng/8.2/etc/network.subr Mon Dec 27 16:02:14 2010(r216740)
@@ -1134,8 +1134,7 @@ network6_default_interface_setup()
;;
*)
laddr=`network6_getladdr ${ipv6_default_interface}`
- route add -inet6 ff02:: ${laddr} -prefixlen 16 -interface \
- -cloning
+ route add -inet6 ff02:: ${laddr} -prefixlen 16 -interface
# Disable installing the default interface with the
# case net.inet6.ip6.forwarding=0 and
Modified: releng/8.2/sbin/route/route.8
==
--- releng/8.2/sbin/route/route.8 Mon Dec 27 16:01:39 2010
(r216739)
+++ releng/8.2/sbin/route/route.8 Mon Dec 27 16:02:14 2010
(r216740)
@@ -279,7 +279,6 @@ when sending to destinations matched by
These flags may be set (or sometimes cleared)
by indicating the following corresponding modifiers:
.Bd -literal
--cloning RTF_CLONING- generates a new route on use
-xresolve RTF_XRESOLVE - emit mesg on use (for external lookup)
-iface~RTF_GATEWAY- destination is directly reachable
-staticRTF_STATIC - manually added route
@@ -288,7 +287,6 @@ by indicating the following correspondin
-blackhole RTF_BLACKHOLE - silently discard pkts (during updates)
-proto1RTF_PROTO1 - set protocol specific routing flag #1
-proto2RTF_PROTO2 - set protocol specific routing flag #2
--llinfoRTF_LLINFO - validly translates proto addr to link addr
.Ed
.Pp
The optional modifiers
@@ -326,25 +324,6 @@ or
.Fl ifa
modifiers may be used to determine the interface or interface address.
.Pp
-The optional
-.Fl proxy
-modifier specifies that the
-.Dv RTF_LLINFO
-routing table entry is the
-.Dq published (proxy-only)
-.Tn ARP
-entry, as reported by
-.Xr arp 8 .
-.Pp
-The optional
-.Fl genmask
-modifier specifies that a cloning mask is present.
-This specifies the mask applied when determining if a child route
-should be created.
-It is only applicable to network routes with the
-.Dv RTF_CLONING
-flag set.
-.Pp
All symbolic names specified for a
.Ar destination
or
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216741 - releng/8.2/sys/net
Author: oleg
Date: Mon Dec 27 18:55:16 2010
New Revision: 216741
URL: http://svn.freebsd.org/changeset/base/216741
Log:
MFC r203548:
Propagate the vlan events to the underlying interfaces/members so they
can do initialization of hw related features.
PR: kern/141646
Approved by: re (bz)
Modified:
releng/8.2/sys/net/if_lagg.c
releng/8.2/sys/net/if_lagg.h
Directory Properties:
releng/8.2/sys/ (props changed)
releng/8.2/sys/amd64/include/xen/ (props changed)
releng/8.2/sys/cddl/contrib/opensolaris/ (props changed)
releng/8.2/sys/contrib/dev/acpica/ (props changed)
releng/8.2/sys/contrib/pf/ (props changed)
Modified: releng/8.2/sys/net/if_lagg.c
==
--- releng/8.2/sys/net/if_lagg.cMon Dec 27 16:02:14 2010
(r216740)
+++ releng/8.2/sys/net/if_lagg.cMon Dec 27 18:55:16 2010
(r216741)
@@ -39,6 +39,7 @@ __FBSDID($FreeBSD$);
#include sys/lock.h
#include sys/rwlock.h
#include sys/taskqueue.h
+#include sys/eventhandler.h
#include net/ethernet.h
#include net/if.h
@@ -204,6 +205,50 @@ static moduledata_t lagg_mod = {
DECLARE_MODULE(if_lagg, lagg_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
+#if __FreeBSD_version = 80
+/*
+ * This routine is run via an vlan
+ * config EVENT
+ */
+static void
+lagg_register_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag)
+{
+struct lagg_softc *sc = ifp-if_softc;
+struct lagg_port*lp;
+
+if (ifp-if_softc != arg) /* Not our event */
+return;
+
+LAGG_RLOCK(sc);
+if (!SLIST_EMPTY(sc-sc_ports)) {
+SLIST_FOREACH(lp, sc-sc_ports, lp_entries)
+EVENTHANDLER_INVOKE(vlan_config, lp-lp_ifp, vtag);
+}
+LAGG_RUNLOCK(sc);
+}
+
+/*
+ * This routine is run via an vlan
+ * unconfig EVENT
+ */
+static void
+lagg_unregister_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag)
+{
+struct lagg_softc *sc = ifp-if_softc;
+struct lagg_port*lp;
+
+if (ifp-if_softc != arg) /* Not our event */
+return;
+
+LAGG_RLOCK(sc);
+if (!SLIST_EMPTY(sc-sc_ports)) {
+SLIST_FOREACH(lp, sc-sc_ports, lp_entries)
+EVENTHANDLER_INVOKE(vlan_unconfig, lp-lp_ifp, vtag);
+}
+LAGG_RUNLOCK(sc);
+}
+#endif
+
static int
lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params)
{
@@ -259,6 +304,13 @@ lagg_clone_create(struct if_clone *ifc,
*/
ether_ifattach(ifp, eaddr);
+#if __FreeBSD_version = 80
+ sc-vlan_attach = EVENTHANDLER_REGISTER(vlan_config,
+ lagg_register_vlan, sc, EVENTHANDLER_PRI_FIRST);
+ sc-vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig,
+ lagg_unregister_vlan, sc, EVENTHANDLER_PRI_FIRST);
+#endif
+
/* Insert into the global list of laggs */
mtx_lock(lagg_list_mtx);
SLIST_INSERT_HEAD(lagg_list, sc, sc_entries);
@@ -278,6 +330,11 @@ lagg_clone_destroy(struct ifnet *ifp)
lagg_stop(sc);
ifp-if_flags = ~IFF_UP;
+#if __FreeBSD_version = 80
+ EVENTHANDLER_DEREGISTER(vlan_config, sc-vlan_attach);
+ EVENTHANDLER_DEREGISTER(vlan_unconfig, sc-vlan_detach);
+#endif
+
/* Shutdown and remove lagg ports */
while ((lp = SLIST_FIRST(sc-sc_ports)) != NULL)
lagg_port_destroy(lp, 1);
Modified: releng/8.2/sys/net/if_lagg.h
==
--- releng/8.2/sys/net/if_lagg.hMon Dec 27 16:02:14 2010
(r216740)
+++ releng/8.2/sys/net/if_lagg.hMon Dec 27 18:55:16 2010
(r216741)
@@ -198,6 +198,10 @@ struct lagg_softc {
void(*sc_lladdr)(struct lagg_softc *);
void(*sc_req)(struct lagg_softc *, caddr_t);
void(*sc_portreq)(struct lagg_port *, caddr_t);
+#if __FreeBSD_version = 80
+ eventhandler_tag vlan_attach;
+ eventhandler_tag vlan_detach;
+#endif
};
struct lagg_port {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216742 - head/sys/netinet
Author: rwatson Date: Mon Dec 27 19:38:25 2010 New Revision: 216742 URL: http://svn.freebsd.org/changeset/base/216742 Log: Remove comment bemoaning the lack of an INP_INHASHLIST above in_pcbdrop(); I fixed this in r189657 in early 2009, so the comment is OBE. Reviewed by: bz MFC after:3 days Modified: head/sys/netinet/in_pcb.c Modified: head/sys/netinet/in_pcb.c == --- head/sys/netinet/in_pcb.c Mon Dec 27 18:55:16 2010(r216741) +++ head/sys/netinet/in_pcb.c Mon Dec 27 19:38:25 2010(r216742) @@ -1077,12 +1077,6 @@ in_pcbfree(struct inpcb *inp) * maintaining the invariant that so_pcb always points to a valid inpcb until * in_pcbdetach(). * - * XXXRW: An inp_lport of 0 is used to indicate that the inpcb is not on hash - * lists, but can lead to confusing netstat output, as open sockets with - * closed TCP connections will no longer appear to have their bound port - * number. An explicit flag would be better, as it would allow us to leave - * the port number intact after the connection is dropped. - * * XXXRW: Possibly in_pcbdrop() should also prevent future notifications by * in_pcbnotifyall() and in_pcbpurgeif0()? */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216743 - head/bin/sh
Author: jilles
Date: Mon Dec 27 22:18:27 2010
New Revision: 216743
URL: http://svn.freebsd.org/changeset/base/216743
Log:
sh: Simplify stack string code slightly.
Maintain a pointer to the end of the stack string area instead of how much
space is left. This simplifies the macros in memalloc.h. The places where
the new variable must be updated are only where the memory area is created,
destroyed or resized.
Modified:
head/bin/sh/memalloc.c
head/bin/sh/memalloc.h
Modified: head/bin/sh/memalloc.c
==
--- head/bin/sh/memalloc.c Mon Dec 27 19:38:25 2010(r216742)
+++ head/bin/sh/memalloc.c Mon Dec 27 22:18:27 2010(r216743)
@@ -127,7 +127,7 @@ static struct stack_block *stackp;
static struct stackmark *markp;
char *stacknxt;
int stacknleft;
-int sstrnleft;
+char *sstrend;
static void
@@ -146,6 +146,7 @@ stnewblock(int nbytes)
sp-prev = stackp;
stacknxt = SPACE(sp);
stacknleft = allocsize - (stacknxt - (char*)sp);
+ sstrend = stacknxt + stacknleft;
stackp = sp;
INTON;
}
@@ -204,6 +205,7 @@ popstackmark(struct stackmark *mark)
}
stacknxt = mark-stacknxt;
stacknleft = mark-stacknleft;
+ sstrend = stacknxt + stacknleft;
INTON;
}
@@ -250,6 +252,7 @@ growstackblock(int min)
stackp = sp;
stacknxt = SPACE(sp);
stacknleft = newlen - (stacknxt - (char*)sp);
+ sstrend = stacknxt + stacknleft;
/*
* Stack marks pointing to the start of the old block
@@ -306,7 +309,6 @@ static char *
growstrstackblock(int n, int min)
{
growstackblock(min);
- sstrnleft = stackblocksize() - n;
return stackblock() + n;
}
@@ -325,31 +327,20 @@ growstackstr(void)
*/
char *
-makestrspace(int min)
+makestrspace(int min, char *p)
{
int len;
- len = stackblocksize() - sstrnleft;
+ len = p - stackblock();
return (growstrstackblock(len, min));
}
-
-void
-ungrabstackstr(char *s, char *p)
-{
- stacknleft += stacknxt - s;
- stacknxt = s;
- sstrnleft = stacknleft - (p - s);
-}
-
-
char *
stputbin(const char *data, int len, char *p)
{
CHECKSTRSPACE(len, p);
memcpy(p, data, len);
- sstrnleft -= len;
return (p + len);
}
Modified: head/bin/sh/memalloc.h
==
--- head/bin/sh/memalloc.h Mon Dec 27 19:38:25 2010(r216742)
+++ head/bin/sh/memalloc.h Mon Dec 27 22:18:27 2010(r216743)
@@ -45,7 +45,7 @@ struct stackmark {
extern char *stacknxt;
extern int stacknleft;
-extern int sstrnleft;
+extern char *sstrend;
pointer ckmalloc(size_t);
pointer ckrealloc(pointer, int);
@@ -57,8 +57,7 @@ void setstackmark(struct stackmark *);
void popstackmark(struct stackmark *);
void grabstackblock(int);
char *growstackstr(void);
-char *makestrspace(int);
-void ungrabstackstr(char *, char *);
+char *makestrspace(int, char *);
char *stputbin(const char *data, int len, char *p);
char *stputs(const char *data, char *p);
@@ -66,10 +65,10 @@ char *stputs(const char *data, char *p);
#define stackblock() stacknxt
#define stackblocksize() stacknleft
-#define STARTSTACKSTR(p) p = stackblock(), sstrnleft = stackblocksize()
-#define STPUTC(c, p) (--sstrnleft = 0? (*p++ = (c)) : (p = growstackstr(),
--sstrnleft, *p++ = (c)))
-#define CHECKSTRSPACE(n, p){ if (sstrnleft n) p = makestrspace(n); }
-#define USTPUTC(c, p) (--sstrnleft, *p++ = (c))
+#define STARTSTACKSTR(p) p = stackblock()
+#define STPUTC(c, p) do { if (p == sstrend) p = growstackstr(); *p++ = (c);
} while(0)
+#define CHECKSTRSPACE(n, p){ if (sstrend - p n) p = makestrspace(n, p); }
+#define USTPUTC(c, p) (*p++ = (c))
/*
* STACKSTRNUL's use is where we want to be able to turn a stack
* (non-sentinel, character counting string) into a C string,
@@ -77,10 +76,11 @@ char *stputs(const char *data, char *p);
* Note: Because of STACKSTRNUL's semantics, STACKSTRNUL cannot be used
* on a stack that will grabstackstr()ed.
*/
-#define STACKSTRNUL(p) (sstrnleft == 0? (p = growstackstr(), *p = '\0') : (*p
= '\0'))
-#define STUNPUTC(p)(++sstrnleft, --p)
+#define STACKSTRNUL(p) (p == sstrend ? (p = growstackstr(), *p = '\0') : (*p =
'\0'))
+#define STUNPUTC(p)(--p)
#define STTOPC(p) p[-1]
-#define STADJUST(amount, p)(p += (amount), sstrnleft -= (amount))
-#define grabstackstr(p)stalloc(stackblocksize() - sstrnleft)
+#define STADJUST(amount, p)(p += (amount))
+#define grabstackstr(p)stalloc((char *)p - stackblock())
+#define ungrabstackstr(s, p) stunalloc((s))
#define STPUTBIN(s, len, p)p = stputbin((s), (len), p)
#define STPUTS(s, p) p = stputs((s), p)
___
svn commit: r216744 - head/etc/rc.d
Author: dougb
Date: Mon Dec 27 22:52:47 2010
New Revision: 216744
URL: http://svn.freebsd.org/changeset/base/216744
Log:
Add pidfile [1]
While I'm here, don't run the sysctl frob unconditionally, and
s/sysctl/$SYSCTL/
PR: conf/153460 [1]
Submitted by: Grigory Rechistov ggg_m...@inbox.ru
Modified:
head/etc/rc.d/devd
Modified: head/etc/rc.d/devd
==
--- head/etc/rc.d/devd Mon Dec 27 22:18:27 2010(r216743)
+++ head/etc/rc.d/devd Mon Dec 27 22:52:47 2010(r216744)
@@ -13,11 +13,17 @@
name=devd
rcvar=`set_rcvar`
command=/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+start_precmd=${name}_prestart
+
+devd_prestart ()
+{
+ # If devd is disabled, turn it off in the kernel to avoid memory leaks.
+ if ! checkyesno ${rcvar}; then
+ $SYSCTL hw.bus.devctl_disable=1
+ fi
+}
load_rc_config $name
run_rc_command $1
-
-# If devd is disabled, turn it off in the kernel to avoid memory leaks.
-if ! checkyesno ${rcvar}; then
-sysctl hw.bus.devctl_disable=1
-fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216745 - stable/8/usr.bin/locate/locate
Author: wollman
Date: Mon Dec 27 23:46:47 2010
New Revision: 216745
URL: http://svn.freebsd.org/changeset/base/216745
Log:
Merge three revisions from head:
r214583 | wollman | 2010-10-30 22:36:05 -0400 (Sat, 30 Oct 2010) | 6 lines
Changed paths:
M /head/usr.bin/locate/locate/locate.rc
M /head/usr.bin/locate/locate/updatedb.sh
Make it possible to exclude directories by name no matter where they
are in the filesystem from the locate database. By default, exclude
.zfs directories, as users who who have set snapdir=visible and are
taking frequent snapshots most likely do not want the snapshots
included in the locate database.
r214613 | wollman | 2010-10-31 21:51:47 -0400 (Sun, 31 Oct 2010) | 7 lines
Changed paths:
M /head/usr.bin/locate/locate/updatedb.sh
jilles@ pointed out that using ${PRUNEDIRS:=.zfs} in updatedb.sh
made it impossible to override PRUNEDIRS to make it empty. Use the
non-colon form to only set PRUNEDIRS if it is completely unset. (For
parallelism, the other configuration defaults here could be done the
same way, but that could be more obviously accomplished by disabling
updatedb in periodic.conf, so leave them alone for now.)
r214615 | wollman | 2010-10-31 22:20:18 -0400 (Sun, 31 Oct 2010) | 6 lines
Changed paths:
M /head/usr.bin/locate/locate/updatedb.sh
Style cleanup: make this look more like a 21st-century shell script
and not something out of the early 1980s. Make sure all error
messages go to stderr, not stdout. Since there's error-handling code
to handle empty SEARCHPATHS and FILESYSTEMS, use the initialization
form that allows this error to be diagnosed. (hat tip: jilles@)
Modified:
stable/8/usr.bin/locate/locate/locate.rc
stable/8/usr.bin/locate/locate/updatedb.sh
Directory Properties:
stable/8/usr.bin/locate/ (props changed)
Modified: stable/8/usr.bin/locate/locate/locate.rc
==
--- stable/8/usr.bin/locate/locate/locate.rcMon Dec 27 22:52:47 2010
(r216744)
+++ stable/8/usr.bin/locate/locate/locate.rcMon Dec 27 23:46:47 2010
(r216745)
@@ -15,9 +15,12 @@
# directories to be put in the database
#SEARCHPATHS=/
-# directories unwanted in output
+# paths unwanted in output
#PRUNEPATHS=/tmp /usr/tmp /var/tmp /var/db/portsnap
+# directories unwanted in output
+#PRUNEDIRS=.zfs
+
# filesystems allowed. Beware: a non-listed filesystem will be pruned
# and if the SEARCHPATHS starts in such a filesystem locate will build
# an empty database.
Modified: stable/8/usr.bin/locate/locate/updatedb.sh
==
--- stable/8/usr.bin/locate/locate/updatedb.sh Mon Dec 27 22:52:47 2010
(r216744)
+++ stable/8/usr.bin/locate/locate/updatedb.sh Mon Dec 27 23:46:47 2010
(r216745)
@@ -50,17 +50,20 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; ex
: ${mklocatedb:=locate.mklocatedb} # make locate database program
: ${FCODES:=/var/db/locate.database}# the database
-: ${SEARCHPATHS:=/} # directories to be put in the database
-: ${PRUNEPATHS:=/tmp /usr/tmp /var/tmp /var/db/portsnap} # unwanted
directories
-: ${FILESYSTEMS:=$(lsvfs | tail -n +3 | \
+: ${SEARCHPATHS=/} # directories to be put in the database
+: ${PRUNEPATHS=/tmp /usr/tmp /var/tmp /var/db/portsnap} # unwanted
directories
+: ${PRUNEDIRS=.zfs} # unwanted directories, in any parent
+: ${FILESYSTEMS=$(lsvfs | tail -n +3 | \
egrep -vw loopback|network|synthetic|read-only|0 | \
cut -d -f1)} # allowed filesystems
: ${find:=find}
-case X$SEARCHPATHS in
- X) echo $0: empty variable SEARCHPATHS; exit 1;; esac
-case X$FILESYSTEMS in
- X) echo $0: empty variable FILESYSTEMS; exit 1;; esac
+if [ -z $SEARCHPATHS ]; then
+ echo $0: empty variable SEARCHPATHS 2; exit 1
+fi
+if [ -z $FILESYSTEMS ]; then
+ echo $0: empty variable FILESYSTEMS 2; exit 1
+fi
# Make a list a paths to exclude in the locate run
excludes=! ( or=
@@ -71,25 +74,29 @@ do
done
excludes=$excludes ) -prune
-case X$PRUNEPATHS in
- X) ;;
- *) for path in $PRUNEPATHS
- do
+if [ -n $PRUNEPATHS ]; then
+ for path in $PRUNEPATHS; do
excludes=$excludes -or -path $path -prune
- done;;
-esac
+ done
+fi
+
+if [ -n $PRUNEDIRS ]; then
+ for dir in $PRUNEDIRS; do
+ excludes=$excludes -or -name $dir -type d -prune
+ done
+fi
tmp=$TMPDIR/_updatedb$$
trap 'rm -f $tmp; rmdir $TMPDIR' 0 1 2 3 5 10 15
# search locally
-# echo $find $SEARCHPATHS $excludes -or -print exit
if $find -s $SEARCHPATHS $excludes -or -print
svn commit: r216746 - head/sys/conf
Author: cperciva
Date: Mon Dec 27 23:52:40 2010
New Revision: 216746
URL: http://svn.freebsd.org/changeset/base/216746
Log:
Make it possible to specify WITHOUT_MODULES in a kernel config file.
MFC after:1 week
Modified:
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Mon Dec 27 23:46:47 2010(r216745)
+++ head/sys/conf/kern.pre.mk Mon Dec 27 23:52:40 2010(r216746)
@@ -170,6 +170,9 @@ MKMODULESENV+= ALL_MODULES=LINT
.if defined(MODULES_OVERRIDE)
MKMODULESENV+= MODULES_OVERRIDE=${MODULES_OVERRIDE}
.endif
+.if defined(WITHOUT_MODULES)
+MKMODULESENV+= WITHOUT_MODULES=${WITHOUT_MODULES}
+.endif
.if defined(DEBUG)
MKMODULESENV+= DEBUG_FLAGS=${DEBUG}
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216748 - head/sys/i386/conf
Author: cperciva Date: Mon Dec 27 23:59:27 2010 New Revision: 216748 URL: http://svn.freebsd.org/changeset/base/216748 Log: Build the modules which can be built. The excluded modules fall into two categories: Those which can't build with PAE because they attempt to cast a pointer to a bus_addr_t (mostly scsi drivers); and those which can't be built with XEN because they conflict with something in xen-os.h (e.g., in cxgb there is a conflicting definition of test_and_clear_bit). MFC after:1 week Modified: head/sys/i386/conf/XEN Modified: head/sys/i386/conf/XEN == --- head/sys/i386/conf/XEN Mon Dec 27 23:56:03 2010(r216747) +++ head/sys/i386/conf/XEN Mon Dec 27 23:59:27 2010(r216748) @@ -7,7 +7,7 @@ cpu I686_CPU ident XEN makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols -makeoptionsMODULES_OVERRIDE= +makeoptionsWITHOUT_MODULES=aha ahb amd cxgb dpt drm hptmv ida malo mps mwl nve sound sym trm xfs optionsSCHED_ULE # ULE scheduler optionsPREEMPTION # Enable kernel thread preemption ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216746 - head/sys/conf
nice!
On 12/27/2010 6:52 PM, Colin Percival wrote:
Author: cperciva
Date: Mon Dec 27 23:52:40 2010
New Revision: 216746
URL: http://svn.freebsd.org/changeset/base/216746
Log:
Make it possible to specify WITHOUT_MODULES in a kernel config file.
MFC after: 1 week
Modified:
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Mon Dec 27 23:46:47 2010(r216745)
+++ head/sys/conf/kern.pre.mk Mon Dec 27 23:52:40 2010(r216746)
@@ -170,6 +170,9 @@ MKMODULESENV+=ALL_MODULES=LINT
.if defined(MODULES_OVERRIDE)
MKMODULESENV+= MODULES_OVERRIDE=${MODULES_OVERRIDE}
.endif
+.if defined(WITHOUT_MODULES)
+MKMODULESENV+= WITHOUT_MODULES=${WITHOUT_MODULES}
+.endif
.if defined(DEBUG)
MKMODULESENV+= DEBUG_FLAGS=${DEBUG}
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
--
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollu...@p6m7g8.com) c: 703.336.9354
VP Apache Infrastructure; Member, Apache Software Foundation
Committer,FreeBSD Foundation
Consultant, P6M7G8 Inc.
Sr. System Admin, Ridecharge Inc.
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216749 - head/sys/netinet
Author: lstewart
Date: Tue Dec 28 01:38:52 2010
New Revision: 216749
URL: http://svn.freebsd.org/changeset/base/216749
Log:
Fix a whitespace nit introduced in r215166.
Sponsored by: FreeBSD Foundation
Spotted by: bz
MFC after:5 weeks
X-MFC with: r215166
Modified:
head/sys/netinet/tcp_subr.c
Modified: head/sys/netinet/tcp_subr.c
==
--- head/sys/netinet/tcp_subr.c Mon Dec 27 23:59:27 2010(r216748)
+++ head/sys/netinet/tcp_subr.c Tue Dec 28 01:38:52 2010(r216749)
@@ -238,7 +238,7 @@ static char * tcp_log_addr(struct in_con
struct tcpcb_mem {
struct tcpcb tcb;
struct tcp_timer tt;
- struct cc_var ccv;
+ struct cc_var ccv;
};
static VNET_DEFINE(uma_zone_t, tcpcb_zone);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216746 - head/sys/conf
On Mon, Dec 27, 2010 at 11:52:40PM +, Colin Percival wrote: Author: cperciva Date: Mon Dec 27 23:52:40 2010 New Revision: 216746 URL: http://svn.freebsd.org/changeset/base/216746 Log: Make it possible to specify WITHOUT_MODULES in a kernel config file. MFC after: 1 week Can you explain how this differs from makeoptions NO_MODULES which has been able to do for years? -- steve ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216746 - head/sys/conf
On 12/27/10 17:59, Steve Kargl wrote: On Mon, Dec 27, 2010 at 11:52:40PM +, Colin Percival wrote: Make it possible to specify WITHOUT_MODULES in a kernel config file. Can you explain how this differs from makeoptions NO_MODULES which has been able to do for years? NO_MODULES means what it says: No modules. WITHOUT_MODULES=foo bar baz means go ahead and build modules except for foo, bar, and baz. -- Colin Percival Security Officer, FreeBSD | freebsd.org | The power to serve Founder / author, Tarsnap | tarsnap.com | Online backups for the truly paranoid ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216746 - head/sys/conf
On 12/27/2010 18:02, Colin Percival wrote: On 12/27/10 17:59, Steve Kargl wrote: On Mon, Dec 27, 2010 at 11:52:40PM +, Colin Percival wrote: Make it possible to specify WITHOUT_MODULES in a kernel config file. Can you explain how this differs from makeoptions NO_MODULES which has been able to do for years? NO_MODULES means what it says: No modules. WITHOUT_MODULES=foo bar baz means go ahead and build modules except for foo, bar, and baz. so kind of the inverse of MODULES_OVERRIDE ? Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216746 - head/sys/conf
On Mon, Dec 27, 2010 at 06:02:57PM -0800, Colin Percival wrote: On 12/27/10 17:59, Steve Kargl wrote: On Mon, Dec 27, 2010 at 11:52:40PM +, Colin Percival wrote: Make it possible to specify WITHOUT_MODULES in a kernel config file. Can you explain how this differs from makeoptions NO_MODULES which has been able to do for years? NO_MODULES means what it says: No modules. WITHOUT_MODULES=foo bar baz means go ahead and build modules except for foo, bar, and baz. Thanks. The distincion wasn't clear from the commit log. I read it as Build a kernel WITHOUT building MODULES, which is what NO_MODULES does. -- Steve ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216750 - stable/8/usr.bin/find
Author: kevlo Date: Tue Dec 28 02:25:32 2010 New Revision: 216750 URL: http://svn.freebsd.org/changeset/base/216750 Log: MFC r216106: Don't error out while searching for empty directories. Submitted by: Bakul Shah bakul at bitblocks dot com Modified: stable/8/usr.bin/find/function.c Modified: stable/8/usr.bin/find/function.c == --- stable/8/usr.bin/find/function.cTue Dec 28 01:38:52 2010 (r216749) +++ stable/8/usr.bin/find/function.cTue Dec 28 02:25:32 2010 (r216750) @@ -560,7 +560,7 @@ f_empty(PLAN *plan __unused, FTSENT *ent empty = 1; dir = opendir(entry-fts_accpath); if (dir == NULL) - err(1, %s, entry-fts_accpath); + return 0; for (dp = readdir(dir); dp; dp = readdir(dir)) if (dp-d_name[0] != '.' || (dp-d_name[1] != '\0' ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216751 - stable/8/lib/libusb
Author: kevlo
Date: Tue Dec 28 02:43:28 2010
New Revision: 216751
URL: http://svn.freebsd.org/changeset/base/216751
Log:
MFC r216431:
Check return value of malloc().
Reviewed by: hselasky
Modified:
stable/8/lib/libusb/libusb20_compat01.c
Modified: stable/8/lib/libusb/libusb20_compat01.c
==
--- stable/8/lib/libusb/libusb20_compat01.c Tue Dec 28 02:25:32 2010
(r216750)
+++ stable/8/lib/libusb/libusb20_compat01.c Tue Dec 28 02:43:28 2010
(r216751)
@@ -457,6 +457,11 @@ usb_parse_configuration(struct usb_confi
/* allocate memory for our configuration */
ptr = malloc(a + b + c + d);
+ if (ptr == NULL) {
+ /* free config structure */
+ free(ps.a.currcfg);
+ return (-1);
+ }
/* currifcw must be first, hence this pointer is freed */
ps.b.currifcw = (void *)(ptr);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216752 - stable/8/lib/libproc
Author: kevlo Date: Tue Dec 28 02:45:24 2010 New Revision: 216752 URL: http://svn.freebsd.org/changeset/base/216752 Log: MFC r216432: Fix a memory leak on the error condition Reviewed by: rpaulo Modified: stable/8/lib/libproc/proc_create.c Modified: stable/8/lib/libproc/proc_create.c == --- stable/8/lib/libproc/proc_create.c Tue Dec 28 02:43:28 2010 (r216751) +++ stable/8/lib/libproc/proc_create.c Tue Dec 28 02:45:24 2010 (r216752) @@ -84,7 +84,7 @@ proc_attach(pid_t pid, int flags, struct else *pphdl = phdl; out: - + proc_free(phdl); return (error); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216753 - head/sys/netinet
Author: lstewart
Date: Tue Dec 28 03:27:20 2010
New Revision: 216753
URL: http://svn.freebsd.org/changeset/base/216753
Log:
Add a new sack hint to track the most recent and highest sacked sequence
number.
This will be used by the incoming Enhanced RTT Khelp module.
Sponsored by: FreeBSD Foundation
Submitted by: David Hayes dahayes at swin edu au
Reviewed by: bz and others (as part of a larger patch)
MFC after:3 months
Modified:
head/sys/netinet/tcp_sack.c
head/sys/netinet/tcp_var.h
Modified: head/sys/netinet/tcp_sack.c
==
--- head/sys/netinet/tcp_sack.c Tue Dec 28 02:45:24 2010(r216752)
+++ head/sys/netinet/tcp_sack.c Tue Dec 28 03:27:20 2010(r216753)
@@ -425,6 +425,7 @@ tcp_sack_doack(struct tcpcb *tp, struct
* are received.
*/
sblkp = sack_blocks[num_sack_blks - 1];/* Last SACK block */
+ tp-sackhint.last_sack_ack = sblkp-end;
if (SEQ_LT(tp-snd_fack, sblkp-start)) {
/*
* The highest SACK block is beyond fack. Append new SACK
Modified: head/sys/netinet/tcp_var.h
==
--- head/sys/netinet/tcp_var.h Tue Dec 28 02:45:24 2010(r216752)
+++ head/sys/netinet/tcp_var.h Tue Dec 28 03:27:20 2010(r216753)
@@ -70,6 +70,7 @@ struct sackhole {
struct sackhint {
struct sackhole *nexthole;
int sack_bytes_rexmit;
+ tcp_seq last_sack_ack; /* Most recent/largest sacked ack */
int ispare; /* explicit pad for 64bit alignment */
uint64_t_pad[2];/* 1 sacked_bytes, 1 TBD */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
