On Feb 19, 2007, at 10:41 PM, matthew green wrote:

>
>
>    Module Name:	src
>    Committed By:	matt
>    Date:		Tue Feb 20 04:29:01 UTC 2007
>
>    Modified Files:
>    	src/sys/arch/arm/include: lock.h
>
>    Log Message:
>    Protect MB_* and <arm/cpufunc.h> by _KERNEL
>
>
> hmm, this leaves shark build failing at usr.sbin/ipf, i assume
> since it plays -D_KERNEL games..

I have worked around it in my tree but it's admittedly a hack:

Index: dist/ipf/ipsend/iptests.c
===================================================================
RCS file: /cvsroot/src/dist/ipf/ipsend/iptests.c,v
retrieving revision 1.10
diff -u -r1.10 iptests.c
--- dist/ipf/ipsend/iptests.c   9 May 2006 20:18:06 -0000       1.10
+++ dist/ipf/ipsend/iptests.c   20 Feb 2007 06:54:39 -0000
@@ -22,6 +22,9 @@
#endif
#include <sys/time.h>
#if !defined(__osf__)
+# ifdef __NetBSD__
+#  include <machine/lock.h>
+# endif
# define _KERNEL
# define KERNEL
# if !defined(solaris) && !defined(linux) && !defined(__sgi) && ! 
defined(hpux)
Index: dist/ipf/ipsend/sock.c
===================================================================
RCS file: /cvsroot/src/dist/ipf/ipsend/sock.c,v
retrieving revision 1.10
diff -u -r1.10 sock.c
--- dist/ipf/ipsend/sock.c      27 Dec 2006 18:13:53 -0000      1.10
+++ dist/ipf/ipsend/sock.c      20 Feb 2007 06:54:39 -0000
@@ -31,6 +31,9 @@
# include <sys/dir.h>
#endif
#if !defined(__osf__)
+# ifdef __NetBSD__
+#  include <machine/lock.h>
+# endif
# define _KERNEL
# define       KERNEL
# ifdef        ultrix