The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=333731274fa3e0856c66fd3509dea7113ddaa983
commit 333731274fa3e0856c66fd3509dea7113ddaa983 Author: Christos Margiolis <[email protected]> AuthorDate: 2023-06-13 12:46:33 +0000 Commit: Christos Margiolis <[email protected]> CommitDate: 2023-06-13 12:46:33 +0000 kinst: hide KINST_TRAMPCHUNK_SIZE from ISA-specific headers Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40505 --- sys/cddl/dev/kinst/amd64/kinst_isa.h | 1 - sys/cddl/dev/kinst/trampoline.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.h b/sys/cddl/dev/kinst/amd64/kinst_isa.h index 6e8eb10fb71c..4e5873628b75 100644 --- a/sys/cddl/dev/kinst/amd64/kinst_isa.h +++ b/sys/cddl/dev/kinst/amd64/kinst_isa.h @@ -18,7 +18,6 @@ * to 16 bytes, 32 bytes is enough to cover even the worst case scenario. */ #define KINST_TRAMP_SIZE 32 -#define KINST_TRAMPCHUNK_SIZE PAGE_SIZE typedef uint8_t kinst_patchval_t; diff --git a/sys/cddl/dev/kinst/trampoline.c b/sys/cddl/dev/kinst/trampoline.c index 5c8c27343201..93eca6b7e6c8 100644 --- a/sys/cddl/dev/kinst/trampoline.c +++ b/sys/cddl/dev/kinst/trampoline.c @@ -31,6 +31,7 @@ #define KINST_TRAMP_FILL_PATTERN ((kinst_patchval_t []){KINST_PATCHVAL}) #define KINST_TRAMP_FILL_SIZE sizeof(kinst_patchval_t) +#define KINST_TRAMPCHUNK_SIZE PAGE_SIZE #define KINST_TRAMPS_PER_CHUNK (KINST_TRAMPCHUNK_SIZE / KINST_TRAMP_SIZE) struct trampchunk {
