PERFORCE change 48905 for review
Peter Wemm
peter at FreeBSD.org
Sat Mar 13 12:05:38 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=48905
Change 48905 by peter at peter_overcee on 2004/03/13 12:05:30
IFC @48903
Affected files ...
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#44 integrate
.. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#9 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#16 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#13 integrate
.. //depot/projects/hammer/sys/dev/ct/bshw_machdep.c#4 integrate
.. //depot/projects/hammer/sys/dev/ct/ct.c#4 integrate
.. //depot/projects/hammer/sys/dev/ct/ct_isa.c#7 integrate
.. //depot/projects/hammer/sys/dev/ncv/ncr53c500.c#4 integrate
.. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#8 integrate
.. //depot/projects/hammer/sys/dev/ncv/ncr53c500hw.h#3 integrate
.. //depot/projects/hammer/sys/dev/nsp/nsp.c#5 integrate
.. //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#7 integrate
.. //depot/projects/hammer/sys/dev/stg/tmc18c30.c#5 integrate
.. //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#8 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/amd64/trap.c#44 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.274 2004/03/11 00:17:45 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $");
/*
* AMD64 Trap and System call handling
==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#9 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $
*
*/
==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#16 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $");
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#13 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.105 2004/01/28 20:46:31 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.106 2004/03/13 19:19:13 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/dev/ct/bshw_machdep.c#4 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.5 2003/08/24 17:46:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.6 2004/03/13 19:46:27 peter Exp $");
/* $NetBSD$ */
/*
==== //depot/projects/hammer/sys/dev/ct/ct.c#4 (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.7 2003/08/24 17:46:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.8 2004/03/13 19:46:27 peter Exp $");
/* $NetBSD$ */
#define CT_DEBUG
==== //depot/projects/hammer/sys/dev/ct/ct_isa.c#7 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.9 2003/08/24 17:46:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.10 2004/03/13 19:46:27 peter Exp $");
/* $NetBSD$ */
/*
==== //depot/projects/hammer/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.8 2003/08/24 17:54:12 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.9 2004/03/13 19:46:27 peter Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
==== //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#8 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.18 2003/10/26 00:51:40 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/dev/ncv/ncr53c500hw.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.2 2001/07/14 00:38:50 non Exp $ */
+/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.3 2004/03/13 19:46:27 peter Exp $ */
/* $NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $ */
/* $NetBSD$ */
==== //depot/projects/hammer/sys/dev/nsp/nsp.c#5 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.10 2003/08/24 17:54:13 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.11 2004/03/13 19:46:27 peter Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
==== //depot/projects/hammer/sys/dev/nsp/nsp_pccard.c#7 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.16 2003/08/24 17:54:13 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.17 2004/03/13 19:46:27 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/dev/stg/tmc18c30.c#5 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.10 2003/12/17 16:12:01 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.11 2004/03/13 19:46:27 peter Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
==== //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.18 2003/08/24 18:17:23 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
More information about the p4-projects
mailing list