From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 17:45:43 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8247916A4C1; Tue, 30 Sep 2003 17:45:43 -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 5C64816A4B3
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 17:45:43 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7B95243FF5
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 17:45:42 -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 h910jgXJ041894
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 17:45:42 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h910jg9N041891
	for perforce@freebsd.org; Tue, 30 Sep 2003 17:45:42 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Tue, 30 Sep 2003 17:45:42 -0700 (PDT)
Message-Id: <200310010045.h910jg9N041891@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 38935 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: Wed, 01 Oct 2003 00:45:44 -0000

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

Change 38935 by peter@peter_hammer on 2003/09/30 17:44:55

	bioswarmvec is a 32 bit int (actually 2x16 bits next to each
	other).  XXX alignment checking will break here.

Affected files ...

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

Differences ...

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

@@ -402,9 +402,8 @@
 static int
 start_all_aps(u_int boot_addr)
 {
-#ifdef SMP_ME_HARDER
 	u_char mpbiosreason;
-	u_long mpbioswarmvec;
+	u_int32_t mpbioswarmvec;
 	struct pcpu *pc;
 	char *stack;
 	uintptr_t kptbase;
@@ -416,7 +415,7 @@
 	install_ap_tramp(boot_addr);
 
 	/* save the current value of the warm-start vector */
-	mpbioswarmvec = *((u_long *) WARMBOOT_OFF);
+	mpbioswarmvec = *((u_int32_t *) WARMBOOT_OFF);
 	outb(CMOS_REG, BIOS_RESET);
 	mpbiosreason = inb(CMOS_DATA);
 
@@ -475,7 +474,7 @@
 	PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
 
 	/* restore the warmstart vector */
-	*(u_long *) WARMBOOT_OFF = mpbioswarmvec;
+	*(u_int32_t *) WARMBOOT_OFF = mpbioswarmvec;
 
 	outb(CMOS_REG, BIOS_RESET);
 	outb(CMOS_DATA, mpbiosreason);
@@ -497,7 +496,6 @@
 		PTD[i] = 0;
 	invltlb();
 
-#endif
 	/* number of APs actually started */
 	return mp_naps;
 }