PERFORCE change 86354 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=86354

Change 86354 by peter at peter_daintree on 2005/11/04 23:57:47

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#44 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#45 integrate
.. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#16 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#40 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#42 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#59 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#145 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#109 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#43 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#79 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#83 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#81 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#85 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#36 integrate
.. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#19 integrate
.. //depot/projects/hammer/sys/amd64/include/md_var.h#36 integrate
.. //depot/projects/hammer/sys/amd64/include/smp.h#27 integrate
.. //depot/projects/hammer/sys/amd64/include/specialreg.h#18 integrate
.. //depot/projects/hammer/sys/amd64/include/trap.h#7 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#50 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/madt.c#44 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#31 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#45 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#16 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#40 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#42 (text+ko) ====

@@ -65,7 +65,7 @@
 
 #define	TODO		printf("%s: not implemented!\n", __func__)
 
-static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures");
+static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures");
 
 /*
  * I/O APIC interrupt source driver.  Each pin is assigned an IRQ cookie

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#59 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#145 (text+ko) ====

@@ -245,8 +245,8 @@
 	struct sigacts *psp;
 	char *sp;
 	struct trapframe *regs;
+	int sig;
 	int oonstack;
-	int sig;
 
 	td = curthread;
 	p = td->td_proc;

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#109 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#43 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/trap.c#79 (text+ko) ====

@@ -867,7 +867,6 @@
 	 */
 	if (orig_tf_rflags & PSL_T) {
 		frame.tf_rflags &= ~PSL_T;
-
 		ksiginfo_init_trap(&ksi);
 		ksi.ksi_signo = SIGTRAP;
 		ksi.ksi_code = TRAP_TRACE;

==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#83 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/conf/GENERIC#81 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/conf/NOTES#85 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# (XXX from i386:NOTES,v 1.1205)
+# (XXX from i386:NOTES,v 1.1210)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.47 2005/10/31 20:45:37 jhb Exp $
 #
 

==== //depot/projects/hammer/sys/amd64/include/apicvar.h#36 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#19 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/md_var.h#36 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/smp.h#27 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/specialreg.h#18 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/include/trap.h#7 (text+ko) ====

@@ -72,16 +72,6 @@
 #define	    ILL_ALIGN_FAULT	T_ALIGNFLT
 #define	    ILL_FPOP_FAULT	T_FPOPFLT	/* coprocessor operand fault */
 
-/* portable macros for SIGFPE/ARITHTRAP */
-#define FPE_INTOVF	1	/* integer overflow */
-#define FPE_INTDIV	2	/* integer divide by zero */
-#define FPE_FLTDIV	3	/* floating point divide by zero */
-#define FPE_FLTOVF	4	/* floating point overflow */
-#define FPE_FLTUND	5	/* floating point underflow */
-#define FPE_FLTRES	6	/* floating point inexact result */
-#define FPE_FLTINV	7	/* invalid floating point operation */
-#define FPE_FLTSUB	8	/* subscript out of range */
-
 /* old FreeBSD macros, deprecated */
 #define	FPE_INTOVF_TRAP	0x1	/* integer overflow */
 #define	FPE_INTDIV_TRAP	0x2	/* integer divide by zero */

==== //depot/projects/hammer/sys/amd64/isa/atpic.c#50 (text+ko) ====