diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh index d300e3ac321e..31173f1db6d3 100644 --- a/sys/kern/vnode_if.sh +++ b/sys/kern/vnode_if.sh @@ -33,7 +33,7 @@ copyright="\ * SUCH DAMAGE. */ " -SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.21 2000/09/13 16:09:27 thorpej Exp $' +SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.22 2000/12/22 14:58:40 mrg Exp $' # Script to produce VFS front-end sugar. # @@ -162,7 +162,7 @@ echo '#ifndef _SYS_VNODE_IF_H_' echo '#define _SYS_VNODE_IF_H_' echo '' echo '#ifdef _KERNEL' -echo '#ifdef _LKM' +echo '#if defined(LKM) && !defined(VNODE_OP_NOINLINE)' echo '/* LKMs always use non-inlined vnode ops. */' echo '#define VNODE_OP_NOINLINE' echo '#else' @@ -266,7 +266,7 @@ echo ' * If we have LKM support, always include the non-inline versions for * LKMs. Otherwise, do it based on the option. */ -#ifdef LKM +#if defined(LKM) && !defined(VNODE_OP_NOINLINE) #define VNODE_OP_NOINLINE #endif' echo ' diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h index 714c2f7d2f8c..725a7528932b 100644 --- a/sys/sys/vnode_if.h +++ b/sys/sys/vnode_if.h @@ -1,4 +1,4 @@ -/* $NetBSD: vnode_if.h,v 1.26 2000/11/27 09:04:59 chs Exp $ */ +/* $NetBSD: vnode_if.h,v 1.27 2000/12/22 14:58:39 mrg Exp $ */ /* * Warning: This file is generated automatically. @@ -47,7 +47,7 @@ #define _SYS_VNODE_IF_H_ #ifdef _KERNEL -#ifdef _LKM +#if defined(LKM) && !defined(VNODE_OP_NOINLINE) /* LKMs always use non-inlined vnode ops. */ #define VNODE_OP_NOINLINE #else