PERFORCE change 121767 for review
Ulf Lilleengen
lulf at FreeBSD.org
Sat Jun 16 09:49:04 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=121767
Change 121767 by lulf at lulf_carrot on 2007/06/16 09:48:17
- Integrate.
Affected files ...
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#7 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#9 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#6 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part_mbr.c#1 branch
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_ktrace.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_malloc.c#6 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_trap.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_turnstile.c#4 integrate
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageout.c#5 integrate
Differences ...
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1430 2007/06/11 03:36:48 sam Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1432 2007/06/13 14:01:42 rwatson Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -151,6 +151,7 @@
options GEOM_NOP # Test class.
options GEOM_PART_APM # Apple partitioning
options GEOM_PART_GPT # GPT partitioning
+options GEOM_PART_MBR # MBR partitioning
options GEOM_PC98 # NEC PC9800 partitioning
options GEOM_RAID3 # RAID3 functionality.
options GEOM_SHSEC # Shared secret.
@@ -515,7 +516,6 @@
#options FAST_IPSEC #new IPsec (cannot define w/ IPSEC)
options IPX #IPX/SPX communications protocols
-options IPXIP #IPX in IP encapsulation (not available)
options NCP #NetWare Core protocol
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1217 2007/06/12 16:24:54 bms Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1220 2007/06/13 14:01:42 rwatson Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -519,6 +519,7 @@
dev/cxgb/cxgb_lro.c optional cxgb pci
dev/cxgb/cxgb_sge.c optional cxgb pci
dev/cxgb/common/cxgb_mc5.c optional cxgb pci
+dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci
dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci
dev/cxgb/common/cxgb_ael1002.c optional cxgb pci
dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci
@@ -1260,6 +1261,7 @@
geom/part/g_part_if.m standard
geom/part/g_part_apm.c optional geom_part_apm
geom/part/g_part_gpt.c optional geom_part_gpt
+geom/part/g_part_mbr.c optional geom_part_mbr
geom/raid3/g_raid3.c optional geom_raid3
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
@@ -1906,7 +1908,6 @@
netipx/ipx.c optional ipx
netipx/ipx_cksum.c optional ipx
netipx/ipx_input.c optional ipx
-netipx/ipx_ip.c optional ipx ipxip
netipx/ipx_outputfl.c optional ipx
netipx/ipx_pcb.c optional ipx
netipx/ipx_proto.c optional ipx
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.591 2007/06/08 21:36:52 attilio Exp $
+# $FreeBSD: src/sys/conf/options,v 1.593 2007/06/13 14:01:42 rwatson Exp $
#
# On the handling of kernel options
#
@@ -89,6 +89,7 @@
GEOM_NOP opt_geom.h
GEOM_PART_APM opt_geom.h
GEOM_PART_GPT opt_geom.h
+GEOM_PART_MBR opt_geom.h
GEOM_PC98 opt_geom.h
GEOM_RAID3 opt_geom.h
GEOM_SHSEC opt_geom.h
@@ -375,7 +376,6 @@
IPFIREWALL_NAT opt_ipfw.h
IPSTEALTH
IPX
-IPXIP opt_ipx.h
LIBMBPOOL
LIBMCHAIN
LIBALIAS
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/GENERIC#5 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.471 2007/06/12 02:24:30 yongari Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.472 2007/06/14 17:14:26 delphij Exp $
cpu I486_CPU
cpu I586_CPU
@@ -32,6 +32,7 @@
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
+options SCTP # Stream Transmission Control Protocol
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/trap.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.305 2007/06/10 21:59:13 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.306 2007/06/13 22:37:48 jhb Exp $");
/*
* 386 Trap and System call handling
@@ -785,9 +785,6 @@
return (-1);
}
- /* kludge to pass faulting virtual address to sendsig */
- frame->tf_err = eva;
-
return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV);
}
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exec.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.305 2007/06/12 00:11:59 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.306 2007/06/13 19:41:47 jhb Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_ktrace.h"
@@ -736,8 +736,13 @@
if (ndp->ni_vp && error != 0)
vrele(ndp->ni_vp);
#ifdef KTRACE
- if (tracevp != NULL)
+ if (tracevp != NULL) {
+ int tvfslocked;
+
+ tvfslocked = VFS_LOCK_GIANT(tracevp->v_mount);
vrele(tracevp);
+ VFS_UNLOCK_GIANT(tvfslocked);
+ }
if (tracecred != NULL)
crfree(tracecred);
#endif
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exit.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.303 2007/06/09 21:48:44 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.304 2007/06/13 20:01:42 jhb Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -356,26 +356,32 @@
mtx_unlock(&Giant);
#ifdef KTRACE
/*
- * Drain any pending records on the thread and release the trace
- * file. It might be better if drain-and-clear were atomic.
+ * Disable tracing, then drain any pending records and release
+ * the trace file.
*/
- ktrprocexit(td);
- PROC_LOCK(p);
- mtx_lock(&ktrace_mtx);
- p->p_traceflag = 0; /* don't trace the vrele() */
- tracevp = p->p_tracevp;
- p->p_tracevp = NULL;
- tracecred = p->p_tracecred;
- p->p_tracecred = NULL;
- mtx_unlock(&ktrace_mtx);
- PROC_UNLOCK(p);
- if (tracevp != NULL) {
- locked = VFS_LOCK_GIANT(tracevp->v_mount);
- vrele(tracevp);
- VFS_UNLOCK_GIANT(locked);
+ if (p->p_traceflag != 0) {
+ PROC_LOCK(p);
+ mtx_lock(&ktrace_mtx);
+ p->p_traceflag = 0;
+ mtx_unlock(&ktrace_mtx);
+ PROC_UNLOCK(p);
+ ktrprocexit(td);
+ PROC_LOCK(p);
+ mtx_lock(&ktrace_mtx);
+ tracevp = p->p_tracevp;
+ p->p_tracevp = NULL;
+ tracecred = p->p_tracecred;
+ p->p_tracecred = NULL;
+ mtx_unlock(&ktrace_mtx);
+ PROC_UNLOCK(p);
+ if (tracevp != NULL) {
+ locked = VFS_LOCK_GIANT(tracevp->v_mount);
+ vrele(tracevp);
+ VFS_UNLOCK_GIANT(locked);
+ }
+ if (tracecred != NULL)
+ crfree(tracecred);
}
- if (tracecred != NULL)
- crfree(tracecred);
#endif
/*
* Release reference to text vnode
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_ktrace.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.119 2007/06/12 00:11:59 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.120 2007/06/13 20:01:42 jhb Exp $");
#include "opt_ktrace.h"
#include "opt_mac.h"
@@ -444,6 +444,8 @@
ktruserret(struct thread *td)
{
+ if (STAILQ_EMPTY(&td->td_proc->p_ktr))
+ return;
ktrace_enter(td);
sx_xlock(&ktrace_sx);
ktr_drain(td);
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_malloc.c#6 (text+ko) ====
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.160 2007/05/31 22:52:12 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.161 2007/06/14 03:02:33 rwatson Exp $");
#include "opt_ddb.h"
#include "opt_vm.h"
@@ -267,7 +267,7 @@
}
/*
- * A free operation has occurred -- update malloc type statistis for the
+ * A free operation has occurred -- update malloc type statistics for the
* amount of the bucket size. Occurs within a critical section so that the
* thread isn't preempted and doesn't migrate while updating per-CPU
* statistics.
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_sleepqueue.c#4 (text+ko) ====
@@ -60,10 +60,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.37 2007/06/04 23:50:56 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.38 2007/06/12 23:27:31 jeff Exp $");
#include "opt_sleepqueue_profiling.h"
#include "opt_ddb.h"
+#include "opt_sched.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_trap.c#4 (text+ko) ====
@@ -38,13 +38,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.297 2007/06/05 00:00:54 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.298 2007/06/12 23:27:31 jeff Exp $");
#include "opt_ktrace.h"
#include "opt_mac.h"
#ifdef __i386__
#include "opt_npx.h"
#endif
+#include "opt_sched.h"
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_turnstile.c#4 (text+ko) ====
@@ -57,10 +57,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.168 2007/06/04 23:51:43 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.169 2007/06/12 23:27:31 jeff Exp $");
#include "opt_ddb.h"
#include "opt_turnstile_profiling.h"
+#include "opt_sched.h"
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageout.c#5 (text+ko) ====
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.284 2007/06/10 21:59:14 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.285 2007/06/13 06:10:10 alc Exp $");
#include "opt_vm.h"
#include <sys/param.h>
@@ -440,9 +440,7 @@
vm_page_unlock_queues();
vm_object_pip_add(object, count);
- vm_pager_put_pages(object, mc, count,
- (flags | ((object == kernel_object) ? VM_PAGER_PUT_SYNC : 0)),
- pageout_status);
+ vm_pager_put_pages(object, mc, count, flags, pageout_status);
vm_page_lock_queues();
for (i = 0; i < count; i++) {
More information about the p4-projects
mailing list