The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=59486443cccdf65b3a312a8896e177e2e17b216c
commit 59486443cccdf65b3a312a8896e177e2e17b216c Author: Andrew Turner <and...@freebsd.org> AuthorDate: 2025-06-23 10:15:08 +0000 Commit: Andrew Turner <and...@freebsd.org> CommitDate: 2025-06-23 10:18:19 +0000 arm64: Remove extract_user_id_field It's unneeded now we have get_user_reg. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50904 --- sys/arm64/arm64/identcpu.c | 17 ----------------- sys/arm64/include/cpu.h | 1 - 2 files changed, 18 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 0f0e727f5b1f..c1960812928f 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2496,23 +2496,6 @@ mrs_field_cmp(uint64_t a, uint64_t b, u_int shift, int width, bool sign) return (a - b); } -bool -extract_user_id_field(u_int reg, u_int field_shift, uint8_t *val) -{ - uint64_t value; - int i; - - for (i = 0; i < nitems(user_regs); i++) { - if (user_regs[i].reg == reg) { - value = CPU_DESC_FIELD(user_cpu_desc, i); - *val = value >> field_shift; - return (true); - } - } - - return (false); -} - bool get_kernel_reg(u_int reg, uint64_t *val) { diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 6ac5d53f28fc..2dd1a905b2b7 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -233,7 +233,6 @@ void ptrauth_mp_start(uint64_t); /* Functions to read the sanitised view of the special registers */ void update_special_regs(u_int); void update_special_reg(u_int reg, uint64_t, uint64_t); -bool extract_user_id_field(u_int, u_int, uint8_t *); bool get_kernel_reg(u_int, uint64_t *); bool get_kernel_reg_masked(u_int, uint64_t *, uint64_t); bool get_user_reg(u_int, uint64_t *, bool);