Don't bother ucode updates in ramdisk. We don't have the files....

ok patrick

diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c
index 6454ecd..8a779aa 100644 (file)
--- a/sys/arch/amd64/amd64/cpu.c
+++ b/sys/arch/amd64/amd64/cpu.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpu.c,v 1.109 2018/01/11 22:31:09 patrick Exp $       */
+/*     $OpenBSD: cpu.c,v 1.110 2018/01/12 20:14:20 deraadt Exp $       */
 /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
 
 /*-
@@ -412,7 +412,9 @@ cpu_attach(struct device *parent, struct device *self, void *aux)
 #endif /* MTRR */
                cpu_init(ci);
                cpu_init_mwait(sc);
+#ifndef SMALL_KERNEL
                config_mountroot(NULL, cpu_ucode_attachhook);
+#endif
                break;
 
        case CPU_ROLE_BP:
@@ -436,7 +438,9 @@ cpu_attach(struct device *parent, struct device *self, void *aux)
                ioapic_bsp_id = caa->cpu_apicid;
 #endif
                cpu_init_mwait(sc);
+#ifndef SMALL_KERNEL
                config_mountroot(NULL, cpu_ucode_attachhook);
+#endif
                break;
 
        case CPU_ROLE_AP:

diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 68e39ff..2ac3517 100644 (file)
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.amd64,v 1.93 2018/01/11 22:31:09 patrick Exp $
+#      $OpenBSD: files.amd64,v 1.94 2018/01/12 20:14:21 deraadt Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -16,7 +16,7 @@ file  arch/amd64/amd64/locore.S
 file   arch/amd64/amd64/aes_intel.S            crypto
 file   arch/amd64/amd64/aesni.c                crypto
 file   arch/amd64/amd64/amd64errata.c
-file   arch/amd64/amd64/ucode.c
+file   arch/amd64/amd64/ucode.c                !small_kernel
 file   arch/amd64/amd64/mem.c
 file   arch/amd64/amd64/amd64_mem.c            mtrr
 file   arch/amd64/amd64/mtrr.c                 mtrr