PERFORCE change 42398 for review

[Peter Wemm]

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

Change 42398 by peter at peter_daintree on 2003/11/14 14:38:06

	Integ -I -b smp_hammer to pick up changes via i386.
	I love it when this stuff Just Works.

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#17 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#14 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#15 integrate
.. //depot/projects/hammer/sys/amd64/include/mptable.h#5 integrate

Differences ...

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

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.6 2003/11/11 18:20:10 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.226 2003/11/14 20:51:07 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.227 2003/11/14 22:29:21 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/hammer/sys/amd64/include/apicvar.h#15 (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/i386/include/apicvar.h,v 1.4 2003/11/14 19:10:13 jhb Exp $
+ * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.5 2003/11/14 22:21:30 peter Exp $
  */
 
 #ifndef _MACHINE_APICVAR_H_

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

@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/mptable.h,v 1.220 2003/11/03 22:12:37 jhb Exp $
+ * $FreeBSD: src/sys/i386/include/mptable.h,v 1.221 2003/11/14 22:23:30 peter Exp $
  */
 
 #ifndef __MACHINE_MPTABLE_H__