git: 6272ef2f058b - stable/15 - sound: Remove SV_ABI_LINUX ifdef
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 May 2026 10:13:23 UTC
The branch stable/15 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=6272ef2f058b2884c7c1868a235cc7921f037f05
commit 6272ef2f058b2884c7c1868a235cc7921f037f05
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-05-22 10:57:59 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-05-29 10:12:07 +0000
sound: Remove SV_ABI_LINUX ifdef
This ifdef does not do anything, SV_ABI_LINUX is a flag.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Reviewed by: ivy, brooks
Pull-Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/37
(cherry picked from commit 3a3b0545913625360e38b30dba10c74dae71bbcc)
---
sys/dev/sound/pcm/dsp.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 52bf2d66114a..6d76877e90ba 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -54,12 +54,10 @@ struct dsp_cdevpriv {
struct pcm_channel *wrch;
};
-#ifdef SV_ABI_LINUX
static int dsp_mmap_allow_prot_exec = 0;
SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN,
&dsp_mmap_allow_prot_exec, 0,
"linux mmap compatibility (-1=force-disable 0=auto)");
-#endif
static int dsp_basename_clone = 1;
SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN,
@@ -1924,16 +1922,12 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset,
struct pcm_channel *wrch, *rdch, *c;
int err;
-#ifdef SV_ABI_LINUX
/*
* https://lists.freebsd.org/pipermail/freebsd-emulation/2007-June/003698.html
*/
if ((nprot & PROT_EXEC) && (dsp_mmap_allow_prot_exec < 0 ||
(dsp_mmap_allow_prot_exec == 0 &&
SV_CURPROC_ABI() != SV_ABI_LINUX)))
-#else
- if (nprot & PROT_EXEC)
-#endif
return (EINVAL);
/*