Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jun 2022 19:32:17 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: cc22c0d6bbd9 - stable/13 - LinuxKPI: Put compat code under appropriate condition.
Message-ID:  <202206171932.25HJWHU4008262@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin:

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

commit cc22c0d6bbd923f86a3a34a9cd8159a66e3ae730
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2021-06-29 17:19:17 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-06-17 19:30:28 +0000

    LinuxKPI: Put compat code under appropriate condition.
    
    Reviewed by:            hselasky, emaste, kib
    Differential Revision:  https://reviews.freebsd.org/D30927
    MFC after:              2 weeks
    
    (cherry picked from commit 1fd26da926d55bc0923b1218af65720dfaa4ca28)
---
 sys/compat/linuxkpi/common/src/linux_compat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
index f3e018796249..4e98ed67e26d 100644
--- a/sys/compat/linuxkpi/common/src/linux_compat.c
+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
@@ -1096,7 +1096,7 @@ linux_file_ioctl_sub(struct file *fp, struct linux_file *filp,
 		/* fetch user-space pointer */
 		data = *(void **)data;
 	}
-#if defined(__amd64__)
+#ifdef COMPAT_FREEBSD32
 	if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
 		/* try the compat IOCTL handler first */
 		if (fop->compat_ioctl != NULL) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206171932.25HJWHU4008262>