From 512a1f4864ea0e4699f920f3c9b2ceddde0c5a69 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@cvs.openbsd.org>
Date: Fri, 17 Nov 2006 20:55:48 +0000
Subject: Decide whether we need to attach the primary cpu by checking the
 CPUF_PRESENT flag just like we do on i386.

---
 sys/arch/amd64/amd64/mainbus.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c
index 804a7c0308c..4767cf38930 100644
--- a/sys/arch/amd64/amd64/mainbus.c
+++ b/sys/arch/amd64/amd64/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.8 2006/05/08 22:51:17 gwk Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.9 2006/11/17 20:55:47 kettenis Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $	*/
 
 /*
@@ -200,7 +200,8 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
 		mpbios_scan(self);
 	else
 #endif
-	{
+
+	if ((cpu_info_primary.ci_flags & CPUF_PRESENT) == 0) {
 		struct cpu_attach_args caa;
                         
 		memset(&caa, 0, sizeof(caa));
-- 
cgit v1.2.3