From 4d1da8f2ce8b1030bb348558c113507372f8608b Mon Sep 17 00:00:00 2001
From: purplerain <purplerain@secbsd.org>
Date: Sun, 18 Feb 2024 07:18:37 +0000
Subject: [PATCH] sync with OpenBSD -current

---
 distrib/sets/lists/base/mi | 2 +-
 sys/arch/amd64/amd64/cpu.c | 6 +-----
 sys/dev/dt/dt_dev.c        | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 4dbee35a2..631d24aab 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -305,7 +305,7 @@
 ./etc/signify/secbsd-15-base.pub
 ./etc/signify/secbsd-15-fw.pub
 ./etc/signify/secbsd-15-pkg.pub
-./etc/signify/secbsd-145-syspatch.pub
+./etc/signify/secbsd-15-syspatch.pub
 ./etc/skel
 ./etc/skel/.ssh
 ./etc/ssh
diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c
index 0cb38c365..c28946b09 100644
--- a/sys/arch/amd64/amd64/cpu.c
+++ b/sys/arch/amd64/amd64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.180 2024/02/12 02:57:14 jsg Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.181 2024/02/18 05:42:50 guenther Exp $	*/
 /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
 
 /*-
@@ -653,10 +653,6 @@ cpu_attach(struct device *parent, struct device *self, void *aux)
 		atomic_setbits_int(&ci->ci_flags,
 		    CPUF_PRESENT | CPUF_SP | CPUF_PRIMARY);
 		cpu_intr_init(ci);
-#ifndef SMALL_KERNEL
-		cpu_ucode_apply(ci);
-#endif
-		cpu_tsx_disable(ci);
 		identifycpu(ci);
 		cpu_fix_msrs(ci);
 #ifdef MTRR
diff --git a/sys/dev/dt/dt_dev.c b/sys/dev/dt/dt_dev.c
index 2383d3a73..e11122687 100644
--- a/sys/dev/dt/dt_dev.c
+++ b/sys/dev/dt/dt_dev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dt_dev.c,v 1.30 2024/02/09 17:42:18 cheloha Exp $ */
+/*	$OpenBSD: dt_dev.c,v 1.31 2024/02/18 00:54:03 cheloha Exp $ */
 
 /*
  * Copyright (c) 2019 Martin Pieuchot <mpi@openbsd.org>
@@ -497,8 +497,6 @@ dt_ioctl_record_start(struct dt_softc *sc)
 		if (dp->dp_nsecs != 0) {
 			clockintr_bind(&dp->dp_clockintr, dp->dp_cpu, dt_clock,
 			    dp);
-			clockintr_stagger(&dp->dp_clockintr, dp->dp_nsecs,
-			    CPU_INFO_UNIT(dp->dp_cpu), MAXCPUS);
 			clockintr_advance(&dp->dp_clockintr, dp->dp_nsecs);
 		}
 	}