From 1dff98d9bbbc74fb07937a4d6d3eaf5f4101c8c5 Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 2 Jun 2011 14:23:36 +0000
Subject: [PATCH] If running under a hypervisor, don't yell at the user about
 starting unknown CPU types, instead relying on the hypervisor to have given
 us a reasonable environment.

---
 sys/powerpc/aim/mp_cpudep.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c
index 3ee22f3e412..d617fdec564 100644
--- a/sys/powerpc/aim/mp_cpudep.c
+++ b/sys/powerpc/aim/mp_cpudep.c
@@ -87,7 +87,6 @@ cpudep_ap_bootstrap(void)
 
 	msr = PSL_KERNSET & ~PSL_EE;
 	mtmsr(msr);
-	isync();
 
 	pcpup->pc_curthread = pcpup->pc_idlethread;
 	pcpup->pc_curpcb = pcpup->pc_curthread->td_pcb;
@@ -344,6 +343,10 @@ cpudep_ap_setup()
 
 		break;
 	default:
+#ifdef __powerpc64__
+		if (!(mfmsr() & PSL_HV)) /* Rely on HV to have set things up */
+			break;
+#endif
 		printf("WARNING: Unknown CPU type. Cache performace may be "
 		    "suboptimal.\n");
 		break;