The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4002a34e6836a10061fba8a76eeb9a092e1759dc
commit 4002a34e6836a10061fba8a76eeb9a092e1759dc Author: David E. O'Brien <[email protected]> AuthorDate: 2025-10-17 00:55:51 +0000 Commit: Colin Percival <[email protected]> CommitDate: 2025-11-03 20:28:35 +0000 random: garbage collect the RANDOM_PURE_OCTEON entropy source It was used for Octeon MIPS and all producers have been removed from the source tree. Approved by: re (cperciva) Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53146 (cherry picked from commit 283699338c5724253f721f4d0e488113dd49bd17) (cherry picked from commit b3bf22d70eb580b0a03906b17442f3950686b23a) --- sys/dev/random/fenestrasX/fx_pool.c | 3 --- sys/dev/random/random_harvestq.c | 3 +-- sys/sys/random.h | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 6a9828023678..95c2d223e0de 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,9 +167,6 @@ static const struct fxrng_ent_char { [RANDOM_RANDOMDEV] = { .entc_cls = &fxrng_lo_push, }, - [RANDOM_PURE_OCTEON] = { - .entc_cls = &fxrng_hi_push, /* Could be made pull. */ - }, [RANDOM_PURE_SAFE] = { .entc_cls = &fxrng_hi_push, }, diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 96676e8694bf..e38fd38c310b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -661,8 +661,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_UMA] = "UMA", [RANDOM_CALLOUT] = "CALLOUT", [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ - [RANDOM_PURE_OCTEON] = "PURE_OCTEON", /* PURE_START */ - [RANDOM_PURE_SAFE] = "PURE_SAFE", + [RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */ [RANDOM_PURE_GLXSB] = "PURE_GLXSB", [RANDOM_PURE_HIFN] = "PURE_HIFN", [RANDOM_PURE_RDRAND] = "PURE_RDRAND", diff --git a/sys/sys/random.h b/sys/sys/random.h index dca30dc8fde4..af6b1e117423 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,8 +89,7 @@ enum random_entropy_source { RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, - RANDOM_PURE_OCTEON = RANDOM_PURE_START, - RANDOM_PURE_SAFE, + RANDOM_PURE_SAFE = RANDOM_PURE_START, RANDOM_PURE_GLXSB, RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND,
