Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 May 2026 11:04:21 +0000
From:      Christos Margiolis <christos@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 3a3b05459136 - main - sound: Remove SV_ABI_LINUX ifdef
Message-ID:  <6a103835.22c76.25b4256@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=3a3b0545913625360e38b30dba10c74dae71bbcc

commit 3a3b0545913625360e38b30dba10c74dae71bbcc
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-05-22 10:57:59 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-05-22 11:03:09 +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
---
 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 7b4f3f15645e..0f76791448ca 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 = -1;
 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,
@@ -1925,16 +1923,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);
 
 	/*


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a103835.22c76.25b4256>