git: ea14af2d3c40 - main - Inline critical enter/exit for "tied" kernel modules

The branch main has been updated by mjg:

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

commit ea14af2d3c407c42ac36f73fc6d5a1db0433b436
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-10-25 17:29:46 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2021-10-25 20:07:06 +0000

    Inline critical enter/exit for "tied" kernel modules
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/sys/systm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 17c110a957c9..497e09f86488 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -273,7 +273,7 @@ void	tablefull(const char *);
 extern int (*lkpi_alloc_current)(struct thread *, int);
 int linux_alloc_current_noop(struct thread *, int);
 
-#if defined(KLD_MODULE) || defined(KTR_CRITICAL) || !defined(_KERNEL) || defined(GENOFFSET)
+#if (defined(KLD_MODULE) && !defined(KLD_TIED)) || defined(KTR_CRITICAL) || !defined(_KERNEL) || defined(GENOFFSET)
 #define critical_enter() critical_enter_KBI()
 #define critical_exit() critical_exit_KBI()
 #else