PERFORCE change 59898 for review
Peter Wemm
peter at FreeBSD.org
Mon Aug 16 16:20:24 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=59898
Change 59898 by peter at peter_daintree on 2004/08/16 23:19:28
IFC @59897
Affected files ...
.. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#17 integrate
.. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#30 integrate
.. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#27 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/legacy.c#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#39 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#98 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#52 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#48 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#52 integrate
.. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#14 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#44 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#29 integrate
.. //depot/projects/hammer/sys/amd64/isa/isa.h#10 integrate
.. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#13 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#27 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#17 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $");
#include <sys/param.h>
#include <sys/bus.h>
==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.56 2004/07/08 01:28:33 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.57 2004/08/16 22:53:03 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#30 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.150 2004/05/16 22:43:57 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.151 2004/08/16 22:53:29 peter Exp $
*/
#include <machine/asmacros.h>
==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#22 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.79 2004/07/10 23:47:18 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.80 2004/08/16 23:10:46 peter Exp $");
/*
* Interface to new debugger.
==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#27 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.8 2004/07/19 16:37:47 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#31 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.10 2004/07/08 01:42:49 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.11 2004/08/16 23:12:29 peter Exp $");
#include "opt_atpic.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#15 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.55 2004/06/03 20:25:05 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.56 2004/08/16 22:54:50 peter Exp $");
/*
* This code implements a system driver for legacy systems that do not
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#39 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.9 2004/05/16 20:30:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.10 2004/08/16 22:55:32 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#98 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.617 2004/08/10 12:15:27 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.618 2004/08/16 22:57:47 peter Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
==== //depot/projects/hammer/sys/amd64/amd64/trap.c#52 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.278 2004/08/09 23:57:59 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.279 2004/08/16 22:56:20 peter Exp $");
/*
* AMD64 Trap and System call handling
==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#48 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.236 2004/08/11 23:23:05 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.237 2004/08/16 22:57:13 peter Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
==== //depot/projects/hammer/sys/amd64/conf/GENERIC#52 (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/amd64/conf/GENERIC,v 1.420 2004/08/16 12:51:32 obrien Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.421 2004/08/16 22:59:24 peter Exp $
machine amd64
cpu HAMMER
==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#14 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.3 2004/05/16 20:30:46 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.4 2004/08/16 23:12:30 peter Exp $
*/
#ifndef __MACHINE_INTR_MACHDEP_H__
==== //depot/projects/hammer/sys/amd64/isa/atpic.c#44 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.12 2004/06/03 05:58:30 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.13 2004/08/16 23:12:30 peter Exp $");
#include "opt_auto_eoi.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/amd64/isa/clock.c#29 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.213 2004/07/11 18:07:55 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.214 2004/08/16 22:52:02 peter Exp $");
/*
* Routines to handle clock hardware.
==== //depot/projects/hammer/sys/amd64/isa/isa.h#10 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.h 5.7 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.25 2004/04/05 21:25:52 imp Exp $
+ * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.26 2004/08/16 22:51:44 peter Exp $
*/
#ifndef _I386_ISA_ISA_H_
==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#13 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.18 2004/04/05 21:25:52 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.19 2004/08/16 22:51:13 peter Exp $");
/*
* code to manage AT bus
==== //depot/projects/hammer/sys/dev/ciss/ciss.c#27 (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/ciss/ciss.c,v 1.55 2004/07/28 06:18:05 ps Exp $
+ * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.56 2004/08/16 23:13:16 peter Exp $
*/
/*
@@ -630,7 +630,8 @@
ciss_printf(sc, "can't allocate interrupt\n");
return(ENXIO);
}
- if (bus_setup_intr(sc->ciss_dev, sc->ciss_irq_resource, INTR_TYPE_CAM, ciss_intr, sc,
+ if (bus_setup_intr(sc->ciss_dev, sc->ciss_irq_resource,
+ INTR_TYPE_CAM|INTR_ENTROPY, ciss_intr, sc,
&sc->ciss_intr)) {
ciss_printf(sc, "can't set up interrupt\n");
return(ENXIO);
More information about the p4-projects
mailing list