SecBSD/src
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with OpenBSD -current

Browse Source
This commit is contained in:
purplerain 2024-02-18 07:18:37 +00:00
parent 6c3f0964c3
commit 4d1da8f2ce
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/sets/lists/base/mi
View File

@ -305,7 +305,7 @@
./etc/signify/secbsd-15-base.pub ./etc/signify/secbsd-15-base.pub
./etc/signify/secbsd-15-fw.pub ./etc/signify/secbsd-15-fw.pub
./etc/signify/secbsd-15-pkg.pub ./etc/signify/secbsd-15-pkg.pub
./etc/signify/secbsd-145-syspatch.pub ./etc/signify/secbsd-15-syspatch.pub
./etc/skel ./etc/skel
./etc/skel/.ssh ./etc/skel/.ssh
./etc/ssh ./etc/ssh

6
sys/arch/amd64/amd64/cpu.c
View File

@ -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 $ */ /* $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, atomic_setbits_int(&ci->ci_flags,
CPUF_PRESENT | CPUF_SP | CPUF_PRIMARY); CPUF_PRESENT | CPUF_SP | CPUF_PRIMARY);
cpu_intr_init(ci); cpu_intr_init(ci);
#ifndef SMALL_KERNEL
cpu_ucode_apply(ci);
#endif
cpu_tsx_disable(ci);
identifycpu(ci); identifycpu(ci);
cpu_fix_msrs(ci); cpu_fix_msrs(ci);
#ifdef MTRR #ifdef MTRR

4
sys/dev/dt/dt_dev.c
View File

@ -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> * 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) { if (dp->dp_nsecs != 0) {
clockintr_bind(&dp->dp_clockintr, dp->dp_cpu, dt_clock, clockintr_bind(&dp->dp_clockintr, dp->dp_cpu, dt_clock,
dp); dp);
clockintr_stagger(&dp->dp_clockintr, dp->dp_nsecs,
CPU_INFO_UNIT(dp->dp_cpu), MAXCPUS);
clockintr_advance(&dp->dp_clockintr, dp->dp_nsecs); clockintr_advance(&dp->dp_clockintr, dp->dp_nsecs);
} }
} }