PERFORCE change 56998 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Jul 10 14:57:25 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=56998
Change 56998 by marcel at marcel_nfs on 2004/07/10 21:56:41
IFC @56997 (assorted KDB updates -- non-platform files)
Affected files ...
.. //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#8 integrate
.. //depot/projects/gdb/sys/cam/scsi/scsi_low.h#3 integrate
.. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#14 integrate
.. //depot/projects/gdb/sys/conf/files#38 integrate
.. //depot/projects/gdb/sys/dev/acpica/Osd/OsdDebug.c#4 integrate
.. //depot/projects/gdb/sys/dev/ct/ct.c#5 integrate
.. //depot/projects/gdb/sys/dev/dcons/dcons.c#11 integrate
.. //depot/projects/gdb/sys/dev/en/midway.c#4 integrate
.. //depot/projects/gdb/sys/dev/ncv/ncr53c500.c#4 integrate
.. //depot/projects/gdb/sys/dev/nsp/nsp.c#4 integrate
.. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#9 integrate
.. //depot/projects/gdb/sys/dev/sab/sab.c#12 integrate
.. //depot/projects/gdb/sys/dev/sound/isa/mss.c#5 integrate
.. //depot/projects/gdb/sys/dev/sound/pcm/sound.h#7 integrate
.. //depot/projects/gdb/sys/dev/stg/tmc18c30.c#4 integrate
.. //depot/projects/gdb/sys/dev/uart/uart_core.c#5 integrate
.. //depot/projects/gdb/sys/dev/vinum/vinumhdr.h#3 integrate
.. //depot/projects/gdb/sys/dev/vinum/vinuminterrupt.c#3 integrate
.. //depot/projects/gdb/sys/dev/vinum/vinumioctl.c#4 integrate
.. //depot/projects/gdb/sys/dev/vinum/vinummemory.c#3 integrate
.. //depot/projects/gdb/sys/dev/zs/zs.c#10 integrate
.. //depot/projects/gdb/sys/fs/nullfs/null_subr.c#4 integrate
.. //depot/projects/gdb/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/gdb/sys/fs/smbfs/smbfs_node.c#4 integrate
.. //depot/projects/gdb/sys/gnu/ext2fs/ext2_subr.c#4 integrate
.. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_hdr.h#7 integrate
.. //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_kbd.c#5 integrate
.. //depot/projects/gdb/sys/kern/kern_clock.c#11 integrate
.. //depot/projects/gdb/sys/kern/kern_malloc.c#6 integrate
.. //depot/projects/gdb/sys/kern/kern_mutex.c#6 integrate
.. //depot/projects/gdb/sys/kern/kern_shutdown.c#11 integrate
.. //depot/projects/gdb/sys/kern/kern_switch.c#6 integrate
.. //depot/projects/gdb/sys/kern/kern_synch.c#14 integrate
.. //depot/projects/gdb/sys/kern/link_elf.c#5 integrate
.. //depot/projects/gdb/sys/kern/sched_ule.c#18 integrate
.. //depot/projects/gdb/sys/kern/subr_prf.c#7 integrate
.. //depot/projects/gdb/sys/kern/subr_witness.c#12 integrate
.. //depot/projects/gdb/sys/kern/tty_cons.c#8 integrate
.. //depot/projects/gdb/sys/kern/uipc_socket.c#20 integrate
.. //depot/projects/gdb/sys/kern/vfs_subr.c#16 integrate
.. //depot/projects/gdb/sys/kern/vfs_vnops.c#8 integrate
.. //depot/projects/gdb/sys/netgraph/ng_base.c#8 integrate
.. //depot/projects/gdb/sys/netgraph/ng_socket.c#5 integrate
.. //depot/projects/gdb/sys/pci/ncr.c#5 integrate
.. //depot/projects/gdb/sys/security/mac_test/mac_test.c#8 integrate
.. //depot/projects/gdb/sys/sys/systm.h#9 integrate
.. //depot/projects/gdb/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/gdb/sys/ufs/ffs/ffs_subr.c#4 integrate
Differences ...
==== //depot/projects/gdb/sys/alpha/tlsb/zs_tlsb.c#8 (text+ko) ====
@@ -31,9 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.45 2004/06/16 09:46:27 phk Exp $");
-
-#include "opt_ddb.h"
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.46 2004/07/10 20:50:19 marcel Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
==== //depot/projects/gdb/sys/cam/scsi/scsi_low.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.6 2002/09/23 18:54:28 alfred Exp $ */
+/* $FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.7 2004/07/10 20:54:01 marcel Exp $ */
/* $NecBSD: scsi_low.h,v 1.24.10.5 2001/06/26 07:31:46 honda Exp $ */
/* $NetBSD$ */
==== //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#14 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.38 2004/06/07 01:22:48 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.39 2004/07/10 20:55:15 marcel Exp $");
#include <sys/ctype.h>
#include <sys/unistd.h>
==== //depot/projects/gdb/sys/conf/files#38 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.925 2004/07/08 22:35:34 brian Exp $
+# $FreeBSD: src/sys/conf/files,v 1.926 2004/07/10 20:35:00 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/gdb/sys/dev/acpica/Osd/OsdDebug.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.7 2004/04/14 16:24:28 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.8 2004/07/10 20:56:43 marcel Exp $
*/
/*
==== //depot/projects/gdb/sys/dev/ct/ct.c#5 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.8 2004/03/13 19:46:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.9 2004/07/10 20:57:43 marcel Exp $");
/* $NetBSD$ */
#define CT_DEBUG
==== //depot/projects/gdb/sys/dev/dcons/dcons.c#11 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $
- * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.12 2004/06/17 17:16:43 phk Exp $
+ * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.13 2004/07/10 21:02:17 marcel Exp $
*/
#include <sys/param.h>
==== //depot/projects/gdb/sys/dev/en/midway.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.61 2004/02/29 09:25:59 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.62 2004/07/10 21:03:52 marcel Exp $");
/*
*
==== //depot/projects/gdb/sys/dev/ncv/ncr53c500.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.9 2004/03/13 19:46:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.10 2004/07/10 21:05:14 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/gdb/sys/dev/nsp/nsp.c#4 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.11 2004/03/13 19:46:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.12 2004/07/10 21:06:08 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/gdb/sys/dev/ofw/ofw_console.c#9 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.25 2004/06/24 02:57:11 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.26 2004/07/10 21:07:44 marcel Exp $");
#include "opt_comconsole.h"
#include "opt_ofw.h"
==== //depot/projects/gdb/sys/dev/sab/sab.c#12 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.32 2004/07/01 15:19:08 mp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sab/sab.c,v 1.33 2004/07/10 21:09:47 marcel Exp $");
/*
* SAB82532 Dual UART driver
==== //depot/projects/gdb/sys/dev/sound/isa/mss.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
#include <dev/sound/pcm/sound.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.88 2004/04/14 14:57:48 green Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.89 2004/07/10 21:12:27 marcel Exp $");
/* board-specific include files */
#include <dev/sound/isa/mss.h>
==== //depot/projects/gdb/sys/dev/sound/pcm/sound.h#7 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.59 2004/06/16 09:46:57 phk Exp $
+ * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.60 2004/07/10 21:13:28 marcel Exp $
*/
/*
==== //depot/projects/gdb/sys/dev/stg/tmc18c30.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.11 2004/03/13 19:46:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.12 2004/07/10 21:14:20 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/gdb/sys/dev/uart/uart_core.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.9 2004/05/04 05:54:02 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.10 2004/07/10 21:16:01 marcel Exp $");
#ifndef KLD_MODULE
#include "opt_comconsole.h"
==== //depot/projects/gdb/sys/dev/vinum/vinumhdr.h#3 (text+ko) ====
@@ -37,7 +37,7 @@
/* Header files used by all modules */
/*
* $Id: vinumhdr.h,v 1.19 2001/05/22 04:07:22 grog Exp grog $
- * $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.30 2003/02/16 14:13:23 phk Exp $
+ * $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.31 2004/07/10 21:17:04 marcel Exp $
*/
#include <sys/param.h>
==== //depot/projects/gdb/sys/dev/vinum/vinuminterrupt.c#3 (text+ko) ====
@@ -1,7 +1,7 @@
/* vinuminterrupt.c: bottom half of the driver */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.43 2003/11/24 04:06:56 grog Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.44 2004/07/10 21:17:04 marcel Exp $");
/*-
* Copyright (c) 1997, 1998, 1999
==== //depot/projects/gdb/sys/dev/vinum/vinumioctl.c#4 (text+ko) ====
@@ -4,7 +4,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.50 2004/06/16 09:47:02 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.51 2004/07/10 21:17:04 marcel Exp $");
/*-
* Copyright (c) 1997, 1998, 1999
* Nan Yang Computer Services Limited. All rights reserved.
==== //depot/projects/gdb/sys/dev/vinum/vinummemory.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.34 2003/08/24 17:55:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.35 2004/07/10 21:17:04 marcel Exp $");
#include <dev/vinum/vinumhdr.h>
==== //depot/projects/gdb/sys/dev/zs/zs.c#10 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.24 2004/07/01 15:19:08 mp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.25 2004/07/10 21:18:33 marcel Exp $");
/*-
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
==== //depot/projects/gdb/sys/fs/nullfs/null_subr.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*
* @(#)null_subr.c 8.7 (Berkeley) 5/14/95
*
- * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.42 2004/04/07 20:46:01 imp Exp $
+ * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.43 2004/07/10 21:20:11 marcel Exp $
*/
#include <sys/param.h>
==== //depot/projects/gdb/sys/fs/nullfs/null_vfsops.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
* @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
*
* @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
- * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.60 2004/04/07 20:46:01 imp Exp $
+ * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.61 2004/07/10 21:20:11 marcel Exp $
*/
/*
==== //depot/projects/gdb/sys/fs/smbfs/smbfs_node.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.19 2004/02/10 05:53:02 tjr Exp $
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.20 2004/07/10 21:21:13 marcel Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/gdb/sys/gnu/ext2fs/ext2_subr.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93
- * $FreeBSD: src/sys/gnu/ext2fs/ext2_subr.c,v 1.26 2004/04/07 20:46:03 imp Exp $
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_subr.c,v 1.27 2004/07/10 21:21:55 marcel Exp $
*/
#include <sys/param.h>
==== //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_hdr.h#7 (text+ko) ====
@@ -41,7 +41,7 @@
*
* Last Edit-Date: [Wed Apr 5 18:21:32 2000]
*
- * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_hdr.h,v 1.52 2004/06/16 09:47:09 phk Exp $
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_hdr.h,v 1.53 2004/07/10 21:24:36 marcel Exp $
*
*---------------------------------------------------------------------------*/
==== //depot/projects/gdb/sys/i386/isa/pcvt/pcvt_kbd.c#5 (text+ko) ====
@@ -47,7 +47,7 @@
*
* Last Edit-Date: [Wed Apr 5 18:16:52 2000]
*
- * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_kbd.c,v 1.42 2004/06/16 09:47:09 phk Exp $
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_kbd.c,v 1.43 2004/07/10 21:24:36 marcel Exp $
*
*---------------------------------------------------------------------------*/
==== //depot/projects/gdb/sys/kern/kern_clock.c#11 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.171 2004/07/02 03:48:09 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.172 2004/07/10 21:36:01 marcel Exp $");
#include "opt_ntp.h"
#include "opt_watchdog.h"
==== //depot/projects/gdb/sys/kern/kern_malloc.c#6 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.133 2004/05/31 21:46:04 bmilekic Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.134 2004/07/10 21:36:01 marcel Exp $");
#include "opt_vm.h"
==== //depot/projects/gdb/sys/kern/kern_mutex.c#6 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.140 2004/07/02 20:21:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.141 2004/07/10 21:36:01 marcel Exp $");
#include "opt_adaptive_mutexes.h"
#include "opt_ddb.h"
==== //depot/projects/gdb/sys/kern/kern_shutdown.c#11 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.153 2004/07/02 20:21:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.154 2004/07/10 21:36:01 marcel Exp $");
#include "opt_kdb.h"
#include "opt_hw_wdog.h"
==== //depot/projects/gdb/sys/kern/kern_switch.c#6 (text+ko) ====
@@ -86,7 +86,7 @@
***/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.69 2004/07/03 00:57:43 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.70 2004/07/10 21:36:01 marcel Exp $");
#include "opt_full_preemption.h"
==== //depot/projects/gdb/sys/kern/kern_synch.c#14 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.252 2004/07/02 20:21:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.253 2004/07/10 21:36:01 marcel Exp $");
#include "opt_ktrace.h"
==== //depot/projects/gdb/sys/kern/link_elf.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.78 2004/05/19 14:36:38 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.79 2004/07/10 21:37:30 marcel Exp $");
#include "opt_gdb.h"
#include "opt_mac.h"
==== //depot/projects/gdb/sys/kern/sched_ule.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.114 2004/07/08 21:45:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.115 2004/07/10 21:38:22 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/gdb/sys/kern/subr_prf.c#7 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_prf.c,v 1.112 2004/07/10 15:42:16 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_prf.c,v 1.113 2004/07/10 21:39:15 marcel Exp $");
#include "opt_ddb.h"
==== //depot/projects/gdb/sys/kern/subr_witness.c#12 (text+ko) ====
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.175 2004/07/09 17:46:27 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.176 2004/07/10 21:42:16 marcel Exp $");
#include "opt_ddb.h"
#include "opt_witness.h"
==== //depot/projects/gdb/sys/kern/tty_cons.c#8 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_cons.c,v 1.125 2004/06/17 17:16:49 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_cons.c,v 1.126 2004/07/10 21:43:23 marcel Exp $");
#include "opt_ddb.h"
==== //depot/projects/gdb/sys/kern/uipc_socket.c#20 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.194 2004/07/10 04:38:06 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.195 2004/07/10 21:43:35 rwatson Exp $");
#include "opt_inet.h"
#include "opt_mac.h"
@@ -1001,6 +1001,8 @@
sbfree(&so->so_rcv, m);
so->so_rcv.sb_mb = m_free(m);
m = so->so_rcv.sb_mb;
+ if (m != NULL)
+ m->m_nextpkt = nextrecord;
}
}
while (m != NULL && m->m_type == MT_CONTROL && error == 0) {
==== //depot/projects/gdb/sys/kern/vfs_subr.c#16 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.507 2004/07/08 06:11:36 alfred Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.508 2004/07/10 21:44:51 marcel Exp $");
#include "opt_ddb.h"
#include "opt_mac.h"
==== //depot/projects/gdb/sys/kern/vfs_vnops.c#8 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.202 2004/06/05 02:18:28 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.203 2004/07/10 21:44:51 marcel Exp $");
#include "opt_mac.h"
==== //depot/projects/gdb/sys/netgraph/ng_base.c#8 (text+ko) ====
@@ -36,7 +36,7 @@
* Authors: Julian Elischer <julian at freebsd.org>
* Archie Cobbs <archie at freebsd.org>
*
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.79 2004/06/30 22:51:29 julian Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.80 2004/07/10 21:45:58 marcel Exp $
* $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
*/
==== //depot/projects/gdb/sys/netgraph/ng_socket.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
*
* Author: Julian Elischer <julian at freebsd.org>
*
- * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.49 2004/05/29 00:51:11 julian Exp $
+ * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.50 2004/07/10 21:45:58 marcel Exp $
* $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $
*/
==== //depot/projects/gdb/sys/pci/ncr.c#5 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/ncr.c,v 1.181 2004/05/30 20:00:41 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/ncr.c,v 1.182 2004/07/10 21:47:09 marcel Exp $");
#define NCR_DATE "pl30 98/1/1"
==== //depot/projects/gdb/sys/security/mac_test/mac_test.c#8 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.47 2004/06/24 03:34:46 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.48 2004/07/10 21:47:53 marcel Exp $
*/
/*
==== //depot/projects/gdb/sys/sys/systm.h#9 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)systm.h 8.7 (Berkeley) 3/29/95
- * $FreeBSD: src/sys/sys/systm.h,v 1.208 2004/06/17 17:16:52 phk Exp $
+ * $FreeBSD: src/sys/sys/systm.h,v 1.209 2004/07/10 21:49:15 marcel Exp $
*/
#ifndef _SYS_SYSTM_H_
==== //depot/projects/gdb/sys/ufs/ffs/ffs_softdep.c#6 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.153 2004/04/06 19:20:24 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.154 2004/07/10 20:45:47 marcel Exp $");
/*
* For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
==== //depot/projects/gdb/sys/ufs/ffs/ffs_subr.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.38 2004/04/07 03:47:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.39 2004/07/10 20:45:47 marcel Exp $");
#include <sys/param.h>
@@ -39,8 +39,6 @@
#include <ufs/ffs/fs.h>
#include "fsck.h"
#else
-#include "opt_ddb.h"
-
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/malloc.h>
More information about the p4-projects
mailing list