git: b1482e09830e - main - SysV SHM: make kern_shmat static
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Nov 2026 11:01:52 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=b1482e09830e8ad3c55cbe183ce517736abd7f69
commit b1482e09830e8ad3c55cbe183ce517736abd7f69
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2026-11-12 11:01:30 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2026-11-12 11:01:30 +0000
SysV SHM: make kern_shmat static
This is the opposite of most kern_ cases, but SysV IP is designed to be
loaded as a module and freebsd32 support lives inside the main
implementation file. Arguably it should be in a seperate module with a
dependency, but that's a refactor for another day.
Effort: CHERI upstreaming
Sponsored by: Innovate UK
Pull Request: https://github.com/freebsd/freebsd-src/pull/2284
---
sys/kern/sysv_shm.c | 2 +-
sys/sys/syscallsubr.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 6942cb90873b..6c82f9504823 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -464,7 +464,7 @@ kern_shmat_locked(struct thread *td, int shmid, const void *shmaddr,
return (error);
}
-int
+static int
kern_shmat(struct thread *td, int shmid, const void *shmaddr, int shmflg)
{
int error;
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 2aa79c2fc1d9..f50342308aed 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -508,8 +508,6 @@ int kern_shm_open(struct thread *td, const char *userpath, int flags,
int kern_shm_open2(struct thread *td, const char *path, int flags,
mode_t mode, int shmflags, struct filecaps *fcaps,
const char *name, struct shmfd *shmfd);
-int kern_shmat(struct thread *td, int shmid, const void *shmaddr,
- int shmflg);
int kern_shm_rename(struct thread *td, const char *path_from_p,
const char *path_to_p, int flags);
int kern_shm_unlink(struct thread *td, const char *userpath);