From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 18:44:54 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0240316A4E3; Mon, 29 Sep 2003 18:44:53 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A034F16A4BF
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:44:53 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0B4ED44031
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:44:53 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1iqXJ027977
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 18:44:52 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1iq8g027974
	for perforce@freebsd.org; Mon, 29 Sep 2003 18:44:52 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Mon, 29 Sep 2003 18:44:52 -0700 (PDT)
Message-Id: <200309300144.h8U1iq8g027974@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38829 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2003 01:44:54 -0000

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

Change 38829 by peter@peter_hammer on 2003/09/29 18:44:20

	oh the horror that this file is!  I don't know where to start.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#7 edit

Differences ...

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

@@ -251,10 +251,10 @@
 	setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0);
 
 	/* Install an inter-CPU IPI for forwarding hardclock() */
-	setidt(IPI_HARDCLOCK, IDTVEC(hardclock), SDT_SYSIGT, 0);
+	setidt(IPI_HARDCLOCK, IDTVEC(hardclock), SDT_SYSIGT, SEL_KPL, 0);
 	
 	/* Install an inter-CPU IPI for forwarding statclock() */
-	setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, 0);
+	setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, SEL_KPL, 0);
 	
 	/* Install an inter-CPU IPI for lazy pmap release */
 	setidt(IPI_LAZYPMAP, IDTVEC(lazypmap), SDT_SYSIGT, SEL_KPL, 0);
@@ -322,9 +322,9 @@
 	int	x, myid = bootAP;
 	u_int	cr0;
 
-	gdt_segs[GPRIV_SEL].ssd_base = (int) &SMP_prvspace[myid];
+	gdt_segs[GPRIV_SEL].ssd_base = (long) &SMP_prvspace[myid];
 	gdt_segs[GPROC0_SEL].ssd_base =
-		(int) &SMP_prvspace[myid].pcpu.pc_common_tss;
+		(long) &SMP_prvspace[myid].pcpu.pc_common_tss;
 	SMP_prvspace[myid].pcpu.pc_prvspace =
 		&SMP_prvspace[myid].pcpu;
 
@@ -333,7 +333,7 @@
 	}
 
 	r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1;
-	r_gdt.rd_base = (int) &gdt[myid * NGDT];
+	r_gdt.rd_base = (long) &gdt[myid * NGDT];
 	lgdt(&r_gdt);			/* does magic intra-segment return */
 
 	lidt(&r_idt);
@@ -434,7 +434,7 @@
 		cpu++;
 
 		/* first page of AP's private space */
-		pg = cpu * i386_btop(sizeof(struct privatespace));
+		pg = cpu * amd64_btop(sizeof(struct privatespace));
 
 		/* allocate a new private data page */
 		pc = (struct pcpu *)kmem_alloc(kernel_map, PAGE_SIZE);