PERFORCE change 42648 for review
Peter Wemm
peter at FreeBSD.org
Mon Nov 17 00:31:57 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=42648
Change 42648 by peter at peter_overcee on 2003/11/17 00:31:21
The great $Id$ sync
Affected files ...
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#19 edit
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#9 edit
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#15 edit
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#21 edit
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#24 edit
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#40 edit
.. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#7 edit
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#16 edit
.. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#6 edit
.. //depot/projects/hammer/sys/amd64/include/apicreg.h#7 edit
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#17 edit
.. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#10 edit
.. //depot/projects/hammer/sys/amd64/include/mptable.h#7 edit
.. //depot/projects/hammer/sys/amd64/include/smp.h#12 edit
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#28 edit
.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#9 edit
.. //depot/projects/hammer/sys/amd64/isa/nmi.c#8 edit
Differences ...
==== //depot/projects/hammer/sys/amd64/acpica/madt.c#19 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/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/apic_vector.S#9 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.94 2003/11/14 19:10:12 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.94 2003/11/14 19:10:12 jhb Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#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/i386/intr_machdep.c,v 1.4 2003/11/17 06:10:14 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.4 2003/11/17 06:10:14 peter Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#21 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.6 2003/11/12 18:13:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.6 2003/11/12 18:13:57 jhb Exp $");
#include "opt_atpic.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#24 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.3 2003/11/14 19:10:12 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.3 2003/11/14 19:10:12 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#40 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.225 2003/11/16 00:55:53 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.225 2003/11/16 00:55:53 bde Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#7 (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/i386/i386/mpboot.s,v 1.23 2003/11/03 22:32:03 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/mpboot.s,v 1.23 2003/11/03 22:32:03 jhb Exp $
*/
#include <machine/asmacros.h> /* miscellaneous asm macros */
==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#16 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.227 2003/11/14 22:29:21 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/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/amd64/mptable_pci.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mptable_pci.c,v 1.1 2003/11/03 22:12:37 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.1 2003/11/03 22:12:37 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/include/apicreg.h#7 (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/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $
*/
#ifndef _MACHINE_APICREG_H_
==== //depot/projects/hammer/sys/amd64/include/apicvar.h#17 (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.5 2003/11/14 22:21:30 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.5 2003/11/14 22:21:30 peter Exp $
*/
#ifndef _MACHINE_APICVAR_H_
==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#10 (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/i386/include/intr_machdep.h,v 1.2 2003/11/14 19:10:13 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.2 2003/11/14 19:10:13 jhb Exp $
*/
#ifndef __MACHINE_INTR_MACHDEP_H__
==== //depot/projects/hammer/sys/amd64/include/mptable.h#7 (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.221 2003/11/14 22:23:30 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.221 2003/11/14 22:23:30 peter Exp $
*/
#ifndef __MACHINE_MPTABLE_H__
==== //depot/projects/hammer/sys/amd64/include/smp.h#12 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/i386/include/smp.h,v 1.77 2003/11/03 22:32:04 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.77 2003/11/03 22:32:04 jhb Exp $
*
*/
==== //depot/projects/hammer/sys/amd64/isa/atpic.c#28 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.5 2003/11/14 21:02:49 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.5 2003/11/14 21:02:49 jhb Exp $");
#include "opt_auto_eoi.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#9 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.40 2003/11/14 20:06:24 peter Exp $
+ * $FreeBSD: src/sys/amd64/isa/atpic_vector.s,v 1.40 2003/11/14 20:06:24 peter Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/isa/nmi.c#8 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/nmi.c,v 1.78 2003/11/04 13:01:41 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/nmi.c,v 1.78 2003/11/04 13:01:41 nyan Exp $");
#include "opt_mca.h"
More information about the p4-projects
mailing list