From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 19:30:53 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3AE7816A4C0; Mon, 29 Sep 2003 19:30: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 16C7D16A4B3
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 19:30:53 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E15F44029
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 19:30:52 -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 h8U2UqXJ030964
	for <perforce@freebsd.org>; Mon, 29 Sep 2003 19:30:52 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2Uq0U030961
	for perforce@freebsd.org; Mon, 29 Sep 2003 19:30:52 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Mon, 29 Sep 2003 19:30:52 -0700 (PDT)
Message-Id: <200309300230.h8U2Uq0U030961@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 38834 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 02:30:53 -0000

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

Change 38834 by peter@peter_hammer on 2003/09/29 19:30:26

	hack! hack!

Affected files ...

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

Differences ...

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

@@ -157,7 +157,9 @@
 
 static void	set_logical_apic_ids(void);
 static int	start_all_aps(u_int boot_addr);
+#ifdef SMP_ME_HARDER
 static void	install_ap_tramp(u_int boot_addr);
+#endif
 static int	start_ap(int apic_id, u_int boot_addr);
 void		ap_init(void);
 static void	release_aps(void *dummy);
@@ -312,6 +314,7 @@
 	/* XXX: List I/O APICs?  They are done differently now. */
 }
 
+#ifdef SMP_ME_HARDER
 /*
  * AP cpu's call this to sync up protected mode.
  */
@@ -359,6 +362,7 @@
 	cr0 &= ~(CR0_CD | CR0_NW | CR0_EM);
 	load_cr0(cr0);
 }
+#endif
 
 /*******************************************************************
  * local functions and data
@@ -401,6 +405,7 @@
 static int
 start_all_aps(u_int boot_addr)
 {
+#ifdef SMP_ME_HARDER
 	u_char mpbiosreason;
 	u_long mpbioswarmvec;
 	struct pcpu *pc;
@@ -500,6 +505,7 @@
 		PTD[i] = 0;
 	invltlb();
 
+#endif
 	/* number of APs actually started */
 	return mp_naps;
 }
@@ -508,6 +514,7 @@
  * load the 1st level AP boot code into base memory.
  */
 
+#ifdef SMP_ME_HARDER
 /* targets for relocation */
 extern void bigJump(void);
 extern void bootCodeSeg(void);
@@ -560,6 +567,14 @@
 	*dst16 = (u_int) boot_addr & 0xffff;
 	*dst8 = ((u_int) boot_addr >> 16) & 0xff;
 }
+#endif
+
+void compile_hack(void);
+void
+compile_hack()
+{
+	start_ap(0, bootAP);
+}
 
 /*
  * This function starts the AP (application processor) identified