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

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-03-13 18:28:34 +00:00
parent 25869dc67a
commit 14b4e966dd
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
10 changed files with 311 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sys/arch/arm64/arm64/machdep.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: machdep.c,v 1.86 2024/02/21 01:45:14 dlg Exp $ */
/* $OpenBSD: machdep.c,v 1.87 2024/03/13 14:57:08 kettenis Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
* Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
@ -366,6 +366,7 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
return sysctl_rdquad(oldp, oldlenp, newp, value);
case CPU_ID_AA64PFR1:
value = 0;
value |= cpu_id_aa64pfr1 & ID_AA64PFR1_BT_MASK;
value |= cpu_id_aa64pfr1 & ID_AA64PFR1_SBSS_MASK;
return sysctl_rdquad(oldp, oldlenp, newp, value);
case CPU_ID_AA64ISAR2:

4
sys/conf/GENERIC
View file

@ -1,4 +1,4 @@
# $OpenBSD: GENERIC,v 1.294 2024/03/10 13:25:10 jsg Exp $
# $OpenBSD: GENERIC,v 1.295 2024/03/13 14:43:31 bluhm Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@ -16,7 +16,7 @@ option KMEMSTATS # collect malloc(9) statistics
option PTRACE # ptrace(2) system call
#option KVA_GUARDPAGES # slow virtual address recycling (+ guarding)
#option POOL_DEBUG # pool corruption detection
option POOL_DEBUG # pool corruption detection
#option VFSLCKDEBUG # VFS locking checks
option CRYPTO # Cryptographic framework

6
sys/dev/dt/dt_prov_profile.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: dt_prov_profile.c,v 1.6 2024/02/09 17:42:18 cheloha Exp $ */
/* $OpenBSD: dt_prov_profile.c,v 1.7 2024/03/13 13:13:57 bluhm Exp $ */
/*
* Copyright (c) 2019 Martin Pieuchot <mpi@openbsd.org>
@ -53,13 +53,13 @@ int
dt_prov_profile_init(void)
{
dtpp_profile = dt_dev_alloc_probe("hz", "97", &dt_prov_profile);
dt_dev_register_probe(dtpp_profile);
if (dtpp_profile == NULL)
return 0;
dt_dev_register_probe(dtpp_profile);
dtpp_interval = dt_dev_alloc_probe("hz", "1", &dt_prov_interval);
dt_dev_register_probe(dtpp_interval);
if (dtpp_interval == NULL)
return 1;
dt_dev_register_probe(dtpp_interval);
return 2;
}