Author: markj
Date: Tue Aug 14 13:56:42 2018
New Revision: 337751
URL: https://svnweb.freebsd.org/changeset/base/337751
Log:
Fix the !SMP x86 build.
Reported by: Michael Butler <i...@protected-networks.net>
X-MFC with: r337715
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/x86/x86/ucode.c
Modified: head/sys/x86/x86/ucode.c
==============================================================================
--- head/sys/x86/x86/ucode.c Tue Aug 14 13:52:10 2018 (r337750)
+++ head/sys/x86/x86/ucode.c Tue Aug 14 13:56:42 2018 (r337751)
@@ -255,11 +255,15 @@ SYSINIT(ucode_release, SI_SUB_KMEM + 1, SI_ORDER_ANY,
void
ucode_load_ap(int cpu)
{
-
+#ifdef SMP
KASSERT(cpu_info[cpu_apic_ids[cpu]].cpu_present,
("cpu %d not present", cpu));
- if (ucode_data != NULL && !cpu_info[cpu_apic_ids[cpu]].cpu_hyperthread)
+ if (!cpu_info[cpu_apic_ids[cpu]].cpu_hyperthread)
+ return;
+#endif
+
+ if (ucode_data != NULL)
(void)ucode_intel_load(ucode_data, false);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
