summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2011-06-02 14:23:36 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2011-06-02 14:23:36 +0000
commit04c4ecf8806ec0ea1e044eef7ffd0daa9a6912f4 (patch)
tree4467e2824feabe2e466947d5ee1a60be47f4454b /sys
parent15ff71d51522dacc6c25cc02bcf55bfcd91838b7 (diff)
downloadFreeBSD-src-04c4ecf8806ec0ea1e044eef7ffd0daa9a6912f4.zip
FreeBSD-src-04c4ecf8806ec0ea1e044eef7ffd0daa9a6912f4.tar.gz
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.
Diffstat (limited to 'sys')
-rw-r--r--sys/powerpc/aim/mp_cpudep.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c
index 3ee22f3..d617fde 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;
OpenPOWER on IntegriCloud