svn commit: r225189 - head/etc
Author: nwhitehorn Date: Fri Aug 26 14:05:48 2011 New Revision: 225189 URL: http://svn.freebsd.org/changeset/base/225189 Log: Fix path to the handbook and provide a hint about how to install it if it was not added at installation time. Approved by: re (blackend) Modified: head/etc/motd Modified: head/etc/motd == --- head/etc/motd Fri Aug 26 10:39:33 2011(r225188) +++ head/etc/motd Fri Aug 26 14:05:48 2011(r225189) @@ -10,8 +10,10 @@ o Security advisories and updated errat o The Handbook and FAQ documents are at http://www.FreeBSD.org/ and, along with the mailing lists, can be searched by going to - http://www.FreeBSD.org/search/. If the doc distribution has - been installed, they're also available formatted in /usr/share/doc. + http://www.FreeBSD.org/search/. If the doc package has been installed + (or fetched via pkg_add -r lang-freebsd-doc, where lang is the + 2-letter language code, e.g. en), they are also available formatted + in /usr/local/share/doc/freebsd. If you still have a question or problem, please take the output of `uname -a', along with any relevant error messages, and email it ___ 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: r225190 - head/gnu/usr.bin/gdb/arch/arm
Author: cognet Date: Fri Aug 26 15:24:54 2011 New Revision: 225190 URL: http://svn.freebsd.org/changeset/base/225190 Log: Do not include if we're building a cross-debugger, ptrace isn't used anyway, and it breaks the build, since sys/ptrace.h now includes Approved by: re Modified: head/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c Modified: head/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c == --- head/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c Fri Aug 26 14:05:48 2011 (r225189) +++ head/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c Fri Aug 26 15:24:54 2011 (r225190) @@ -32,8 +32,8 @@ #include "arm-tdep.h" #include -#include #ifndef CROSS_DEBUGGER +#include #include #include #endif ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r225191 - head/sys/kern
Author: jamie
Date: Fri Aug 26 16:03:34 2011
New Revision: 225191
URL: http://svn.freebsd.org/changeset/base/225191
Log:
Delay the recursive decrement of pr_uref when jails are made invisible
but not removed; decrement it instead when the child jail actually
goes away. This avoids letting the counter go below zero in the case
where dying (pr_uref==0) jails are "resurrected", and an associated
KASSERT panic.
Submitted by: Steven Hartland
Approved by: re (bz)
MFC after:1 week
Modified:
head/sys/kern/kern_jail.c
Modified: head/sys/kern/kern_jail.c
==
--- head/sys/kern/kern_jail.c Fri Aug 26 15:24:54 2011(r225190)
+++ head/sys/kern/kern_jail.c Fri Aug 26 16:03:34 2011(r225191)
@@ -2470,32 +2470,11 @@ prison_deref(struct prison *pr, int flag
if (!(flags & PD_LOCKED))
mtx_lock(&pr->pr_mtx);
- /* Decrement the user references in a separate loop. */
- if (flags & PD_DEUREF) {
- for (tpr = pr;; tpr = tpr->pr_parent) {
- if (tpr != pr)
- mtx_lock(&tpr->pr_mtx);
- if (--tpr->pr_uref > 0)
- break;
- KASSERT(tpr != &prison0, ("prison0 pr_uref=0"));
- mtx_unlock(&tpr->pr_mtx);
- }
- /* Done if there were only user references to remove. */
- if (!(flags & PD_DEREF)) {
- mtx_unlock(&tpr->pr_mtx);
- if (flags & PD_LIST_SLOCKED)
- sx_sunlock(&allprison_lock);
- else if (flags & PD_LIST_XLOCKED)
- sx_xunlock(&allprison_lock);
- return;
- }
- if (tpr != pr) {
- mtx_unlock(&tpr->pr_mtx);
- mtx_lock(&pr->pr_mtx);
- }
- }
-
for (;;) {
+ if (flags & PD_DEUREF) {
+ pr->pr_uref--;
+ KASSERT(prison0.pr_uref != 0, ("prison0 pr_uref=0"));
+ }
if (flags & PD_DEREF)
pr->pr_ref--;
/* If the prison still has references, nothing else to do. */
@@ -2551,7 +2530,7 @@ prison_deref(struct prison *pr, int flag
/* Removing a prison frees a reference on its parent. */
pr = ppr;
mtx_lock(&pr->pr_mtx);
- flags = PD_DEREF;
+ flags = PD_DEREF | PD_DEUREF;
}
}
___
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: r225194 - in head/sys: amd64/amd64 amd64/conf conf
Author: jhb
Date: Fri Aug 26 17:08:22 2011
New Revision: 225194
URL: http://svn.freebsd.org/changeset/base/225194
Log:
Make NKPT a kernel option on amd64 so that it can be set to a non-default
value from kernel config files.
Reviewed by: alc
Approved by: re (kib)
MFC after:1 week
Modified:
head/sys/amd64/amd64/minidump_machdep.c
head/sys/amd64/conf/NOTES
head/sys/conf/options.amd64
Modified: head/sys/amd64/amd64/minidump_machdep.c
==
--- head/sys/amd64/amd64/minidump_machdep.c Fri Aug 26 17:02:53 2011
(r225193)
+++ head/sys/amd64/amd64/minidump_machdep.c Fri Aug 26 17:08:22 2011
(r225194)
@@ -27,6 +27,7 @@
#include
__FBSDID("$FreeBSD$");
+#include "opt_pmap.h"
#include "opt_watchdog.h"
#include
Modified: head/sys/amd64/conf/NOTES
==
--- head/sys/amd64/conf/NOTES Fri Aug 26 17:02:53 2011(r225193)
+++ head/sys/amd64/conf/NOTES Fri Aug 26 17:08:22 2011(r225194)
@@ -490,6 +490,14 @@ optionsENABLE_ALART# Control alarm o
#
optionsPMAP_SHPGPERPROC=201
+#
+# Number of initial kernel page table pages used for early bootstrap.
+# This number should include enough pages to map the kernel and any
+# modules or other data loaded with the kernel by the loader. Each
+# page table page maps 2MB.
+#
+optionsNKPT=31
+
#
# ABI Emulation
Modified: head/sys/conf/options.amd64
==
--- head/sys/conf/options.amd64 Fri Aug 26 17:02:53 2011(r225193)
+++ head/sys/conf/options.amd64 Fri Aug 26 17:08:22 2011(r225194)
@@ -10,6 +10,7 @@ PERFMON
PMAP_SHPGPERPROC opt_pmap.h
MPTABLE_FORCE_HTT
MP_WATCHDOG
+NKPT opt_pmap.h
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
___
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: r225196 - head/share/man/man4
Author: brueffer
Date: Fri Aug 26 17:35:22 2011
New Revision: 225196
URL: http://svn.freebsd.org/changeset/base/225196
Log:
Fix the manpage section number, thus unbreaking the hardware notes build. (1)
Also hook up vxge(4) to the build.
Submitted by: simon (1)
Approved by: re (blackend)
Modified:
head/share/man/man4/Makefile
head/share/man/man4/vxge.4
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri Aug 26 17:28:29 2011
(r225195)
+++ head/share/man/man4/MakefileFri Aug 26 17:35:22 2011
(r225196)
@@ -500,6 +500,7 @@ MAN=aac.4 \
vpo.4 \
vr.4 \
vte.4 \
+ ${_vxge.4} \
watchdog.4 \
wb.4 \
wi.4 \
@@ -645,6 +646,7 @@ MLINKS+=vge.4 if_vge.4
MLINKS+=vlan.4 if_vlan.4
MLINKS+=vpo.4 imm.4
MLINKS+=vr.4 if_vr.4
+MLINKS+=${_vxge.4} ${_if_vxge.4}
MLINKS+=watchdog.4 SW_WATCHDOG.4
MLINKS+=wb.4 if_wb.4
MLINKS+=wi.4 if_wi.4
@@ -685,6 +687,7 @@ _if_nfe.4= if_nfe.4
_if_nve.4= if_nve.4
_if_nxge.4=if_nxge.4
_if_urtw.4=if_urtw.4
+_if_vxge.4=if_vxge.4
_if_wpi.4= if_wpi.4
_ipmi.4= ipmi.4
_io.4= io.4
@@ -696,6 +699,7 @@ _nfsmb.4= nfsmb.4
_nve.4=nve.4
_nvram.4= nvram.4
_nxge.4= nxge.4
+_vxge.4= vxge.4
_padlock.4=padlock.4
_rr232x.4= rr232x.4
_speaker.4=speaker.4
Modified: head/share/man/man4/vxge.4
==
--- head/share/man/man4/vxge.4 Fri Aug 26 17:28:29 2011(r225195)
+++ head/share/man/man4/vxge.4 Fri Aug 26 17:35:22 2011(r225196)
@@ -25,7 +25,7 @@
.\" $FreeBSD$
.\"
.Dd March 16, 2011
-.Dt VXGE 1
+.Dt VXGE 4
.Os
.Sh NAME
.Nm vxge
___
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: r225199 - head/sys/kern
Author: delphij
Date: Fri Aug 26 18:00:07 2011
New Revision: 225199
URL: http://svn.freebsd.org/changeset/base/225199
Log:
Fix format strings for KTR_STATE in 4BSD ad ULE schedulers.
Submitted by: Ivan Klymenko
PR: kern/159904, kern/159905
MFC after:2 weeks
Approved by: re (kib)
Modified:
head/sys/kern/sched_4bsd.c
head/sys/kern/sched_ule.c
Modified: head/sys/kern/sched_4bsd.c
==
--- head/sys/kern/sched_4bsd.c Fri Aug 26 17:45:56 2011(r225198)
+++ head/sys/kern/sched_4bsd.c Fri Aug 26 18:00:07 2011(r225199)
@@ -720,7 +720,7 @@ sched_exit(struct proc *p, struct thread
{
KTR_STATE1(KTR_SCHED, "thread", sched_tdname(td), "proc exit",
- "prio:td", td->td_priority);
+ "prio:%d", td->td_priority);
PROC_LOCK_ASSERT(p, MA_OWNED);
sched_exit_thread(FIRST_THREAD_IN_PROC(p), td);
@@ -731,7 +731,7 @@ sched_exit_thread(struct thread *td, str
{
KTR_STATE1(KTR_SCHED, "thread", sched_tdname(child), "exit",
- "prio:td", child->td_priority);
+ "prio:%d", child->td_priority);
thread_lock(td);
td->td_estcpu = ESTCPULIM(td->td_estcpu + child->td_estcpu);
thread_unlock(td);
Modified: head/sys/kern/sched_ule.c
==
--- head/sys/kern/sched_ule.c Fri Aug 26 17:45:56 2011(r225198)
+++ head/sys/kern/sched_ule.c Fri Aug 26 18:00:07 2011(r225199)
@@ -2022,7 +2022,7 @@ sched_exit(struct proc *p, struct thread
struct thread *td;
KTR_STATE1(KTR_SCHED, "thread", sched_tdname(child), "proc exit",
- "prio:td", child->td_priority);
+ "prio:%d", child->td_priority);
PROC_LOCK_ASSERT(p, MA_OWNED);
td = FIRST_THREAD_IN_PROC(p);
sched_exit_thread(td, child);
@@ -2039,7 +2039,7 @@ sched_exit_thread(struct thread *td, str
{
KTR_STATE1(KTR_SCHED, "thread", sched_tdname(child), "thread exit",
- "prio:td", child->td_priority);
+ "prio:%d", child->td_priority);
/*
* Give the child's runtime to the parent without returning the
* sleep time as a penalty to the parent. This causes shells that
___
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: r225200 - head/share/man/man4
Author: jhb Date: Fri Aug 26 19:44:39 2011 New Revision: 225200 URL: http://svn.freebsd.org/changeset/base/225200 Log: - Replace references to sio(4) with uart(4) instead. - We no longer use the same data structure in as NetBSD in pucdata.c. - ppc(4) has had a puc(4) attachment for a while now. Approved by: re (blackend) MFC after:3 days Modified: head/share/man/man4/puc.4 Modified: head/share/man/man4/puc.4 == --- head/share/man/man4/puc.4 Fri Aug 26 18:00:07 2011(r225199) +++ head/share/man/man4/puc.4 Fri Aug 26 19:44:39 2011(r225200) @@ -35,11 +35,11 @@ Communications driver .Sh SYNOPSIS .Cd "device pci" .Cd "device puc" -.Cd "device sio" +.Cd "device uart" .Cd "device ppc" .Sh DESCRIPTION This driver acts as a shim to connect PCI serial and parallel ports to the -.Xr sio 4 +.Xr uart 4 and .Xr ppc 4 driver. @@ -49,14 +49,9 @@ The list of supported devices is in Support for new cards should be added there. .Sh SEE ALSO .Xr ppc 4 , -.Xr sio 4 +.Xr uart 4 .Sh HISTORY This driver took the idea from the .Nx .Xr puc 4 -driver and still uses the same structure to describe cards, to ease exchanging -card info. -.Sh BUGS -Only serial ports are supported through the -.Xr sio 4 -driver at the moment. +driver. ___ 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: r225201 - in head/sys: amd64/conf i386/conf
Author: jhb Date: Fri Aug 26 21:22:34 2011 New Revision: 225201 URL: http://svn.freebsd.org/changeset/base/225201 Log: Enable the puc(4) driver on amd64 and i386 in GENERIC. This allows devices supported by puc(4) to work "out of the box" since puc.ko does not work "out of the box". Reviewed by: marcel Approved by: re (kib) MFC after:1 week Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Fri Aug 26 19:44:39 2011(r225200) +++ head/sys/amd64/conf/GENERIC Fri Aug 26 21:22:34 2011(r225201) @@ -186,10 +186,7 @@ device plip# TCP/IP over parallel device ppi # Parallel port interface device #devicevpo # Requires scbus and da -# If you've got a "dumb" serial or parallel PCI card that is -# supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to sio, uart and/or ppc drivers): -#devicepuc +device puc # Multi I/O cards and multi-channel UARTs # PCI Ethernet NICs. device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Fri Aug 26 19:44:39 2011(r225200) +++ head/sys/i386/conf/GENERIC Fri Aug 26 21:22:34 2011(r225201) @@ -196,10 +196,7 @@ device plip# TCP/IP over parallel device ppi # Parallel port interface device #devicevpo # Requires scbus and da -# If you've got a "dumb" serial or parallel PCI card that is -# supported by the puc(4) glue driver, uncomment the following -# line to enable it (connects to sio, uart and/or ppc drivers): -#devicepuc +device puc # Multi I/O cards and multi-channel UARTs # PCI Ethernet NICs. device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet ___ 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: r225203 - in head/sys: dev/cfe dev/dcons dev/ofw dev/sio dev/syscons dev/uart kern pc98/cbus powerpc/mambo sys
Author: rwatson
Date: Fri Aug 26 21:46:36 2011
New Revision: 225203
URL: http://svn.freebsd.org/changeset/base/225203
Log:
Attempt to make break-to-debugger and alternative break-to-debugger more
accessible:
(1) Always compile in support for breaking into the debugger if options
KDB is present in the kernel.
(2) Disable both by default, but allow them to be enabled via tunables
and sysctls debug.kdb.break_to_debugger and
debug.kdb.alt_break_to_debugger.
(3) options BREAK_TO_DEBUGGER and options ALT_BREAK_TO_DEBUGGER continue
to behave as before -- only now instead of compiling in
break-to-debugger support, they change the default values of the
above sysctls to enable those features by default. Current kernel
configurations should, therefore, continue to behave as expected.
(4) Migrate alternative break-to-debugger state machine logic out of
individual device drivers into centralised KDB code. This has a
number of upsides, but also one downside: it's now tricky to release
sio spin locks when entering the debugger, so we don't. However,
similar logic does not exist in other device drivers, including uart.
(5) dcons requires some special handling; unlike other console types, it
allows overriding KDB's own debugger selection, so we need a new
interface to KDB to allow that to work.
GENERIC kernels in -CURRENT will now support break-to-debugger as long as
appropriate boot/run-time options are set, which should improve the
debuggability of BETA kernels significantly.
MFC after:3 weeks
Reviewed by: kib, nwhitehorn
Approved by: re (bz)
Modified:
head/sys/dev/cfe/cfe_console.c
head/sys/dev/dcons/dcons_os.c
head/sys/dev/ofw/ofw_console.c
head/sys/dev/sio/sio.c
head/sys/dev/syscons/syscons.c
head/sys/dev/uart/uart_core.c
head/sys/kern/subr_kdb.c
head/sys/pc98/cbus/sio.c
head/sys/powerpc/mambo/mambo_console.c
head/sys/sys/kdb.h
Modified: head/sys/dev/cfe/cfe_console.c
==
--- head/sys/dev/cfe/cfe_console.c Fri Aug 26 21:27:21 2011
(r225202)
+++ head/sys/dev/cfe/cfe_console.c Fri Aug 26 21:46:36 2011
(r225203)
@@ -67,7 +67,7 @@ static intpolltime;
static struct callout_handle cfe_timeouthandle
= CALLOUT_HANDLE_INITIALIZER(&cfe_timeouthandle);
-#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
+#if defined(KDB)
static int alt_break_state;
#endif
@@ -191,24 +191,8 @@ cfe_cngetc(struct consdev *cp)
unsigned char ch;
if (cfe_read(conhandle, &ch, 1) == 1) {
-#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
- int kdb_brk;
-
- if ((kdb_brk = kdb_alt_break(ch, &alt_break_state)) != 0) {
- switch (kdb_brk) {
- case KDB_REQ_DEBUGGER:
- kdb_enter(KDB_WHY_BREAK,
- "Break sequence on console");
- break;
- case KDB_REQ_PANIC:
- kdb_panic("Panic sequence on console");
- break;
- case KDB_REQ_REBOOT:
- kdb_reboot();
- break;
-
- }
- }
+#if defined(KDB)
+ kdb_alt_break(ch, &alt_break_state);
#endif
return (ch);
}
Modified: head/sys/dev/dcons/dcons_os.c
==
--- head/sys/dev/dcons/dcons_os.c Fri Aug 26 21:27:21 2011
(r225202)
+++ head/sys/dev/dcons/dcons_os.c Fri Aug 26 21:46:36 2011
(r225203)
@@ -133,38 +133,21 @@ static struct ttydevsw dcons_ttydevsw =
.tsw_outwakeup = dcons_outwakeup,
};
-#if (defined(GDB) || defined(DDB)) && defined(ALT_BREAK_TO_DEBUGGER)
+#if (defined(GDB) || defined(DDB))
static int
dcons_check_break(struct dcons_softc *dc, int c)
{
- int kdb_brk;
if (c < 0)
return (c);
- if ((kdb_brk = kdb_alt_break(c, &dc->brk_state)) != 0) {
- switch (kdb_brk) {
- case KDB_REQ_DEBUGGER:
- if ((dc->flags & DC_GDB) != 0) {
#ifdef GDB
- if (gdb_cur == &dcons_gdb_dbgport) {
- kdb_dbbe_select("gdb");
- kdb_enter(KDB_WHY_BREAK,
- "Break sequence on dcons gdb port");
- }
+ if ((dc->flags & DC_GDB) != 0 && gdb_cur == &dcons_gdb_dbgport)
+ kdb_alt_break_gdb(c, &dc->brk_state);
+ else
#endif
- } else
- kdb_enter(KDB_WHY_BREAK,
-
Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf
Sorry, I am not parsing this. Are you saying that the module is broken? Doug On 08/26/2011 14:22, John Baldwin wrote: > Author: jhb > Date: Fri Aug 26 21:22:34 2011 > New Revision: 225201 > URL: http://svn.freebsd.org/changeset/base/225201 > > Log: > Enable the puc(4) driver on amd64 and i386 in GENERIC. This allows > devices supported by puc(4) to work "out of the box" since puc.ko does > not work "out of the box". > > Reviewed by:marcel > Approved by:re (kib) > MFC after: 1 week > > Modified: > head/sys/amd64/conf/GENERIC > head/sys/i386/conf/GENERIC > > Modified: head/sys/amd64/conf/GENERIC > == > --- head/sys/amd64/conf/GENERIC Fri Aug 26 19:44:39 2011 > (r225200) > +++ head/sys/amd64/conf/GENERIC Fri Aug 26 21:22:34 2011 > (r225201) > @@ -186,10 +186,7 @@ device plip# TCP/IP over parallel > device ppi # Parallel port interface device > #device vpo # Requires scbus and da > > -# If you've got a "dumb" serial or parallel PCI card that is > -# supported by the puc(4) glue driver, uncomment the following > -# line to enable it (connects to sio, uart and/or ppc drivers): > -#device puc > +device puc # Multi I/O cards and multi-channel > UARTs > > # PCI Ethernet NICs. > device bxe # Broadcom BCM57710/BCM57711/BCM57711E > 10Gb Ethernet > > Modified: head/sys/i386/conf/GENERIC > == > --- head/sys/i386/conf/GENERICFri Aug 26 19:44:39 2011 > (r225200) > +++ head/sys/i386/conf/GENERICFri Aug 26 21:22:34 2011 > (r225201) > @@ -196,10 +196,7 @@ device plip# TCP/IP over parallel > device ppi # Parallel port interface device > #device vpo # Requires scbus and da > > -# If you've got a "dumb" serial or parallel PCI card that is > -# supported by the puc(4) glue driver, uncomment the following > -# line to enable it (connects to sio, uart and/or ppc drivers): > -#device puc > +device puc # Multi I/O cards and multi-channel > UARTs > > # PCI Ethernet NICs. > device bxe # Broadcom BCM57710/BCM57711/BCM57711E > 10Gb Ethernet > -- 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-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"
