CVS commit: src
Module Name:src Committed By: christos Date: Sat Mar 2 07:33:00 UTC 2013 Modified Files: src: UPDATING Log Message: add netiso caveat To generate a diff of this commit: cvs rdiff -u -r1.241 -r1.242 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.241 src/UPDATING:1.242 --- src/UPDATING:1.241 Wed Oct 3 15:17:00 2012 +++ src/UPDATING Sat Mar 2 02:32:59 2013 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.241 2012/10/03 19:17:00 wiz Exp $ +$NetBSD: UPDATING,v 1.242 2013/03/02 07:32:59 christos Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -16,6 +16,10 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20130301: + The removal of netiso requires manual removal of /usr/include/netiso + prior to the build. + 20120726: The update of OpenSSL requires cleaning both the OpenSSL build directory and DESTDIR. *Even non-update builds require cleaning
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 1 18:57:59 UTC 2013 Modified Files: src/sys/rump: VERSION Log Message: Bump tree version for rumpcomp_user stuff. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/VERSION Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/VERSION diff -u src/sys/rump/VERSION:1.4 src/sys/rump/VERSION:1.5 --- src/sys/rump/VERSION:1.4 Thu Jan 31 19:16:11 2013 +++ src/sys/rump/VERSION Fri Mar 1 18:57:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: VERSION,v 1.4 2013/01/31 19:16:11 pooka Exp $ +# $NetBSD: VERSION,v 1.5 2013/03/01 18:57:59 pooka Exp $ # # Since cvs does not provide a version number for the entire tree, provide # identifiers which can be used by external parties to check if the NetBSD @@ -9,4 +9,4 @@ # when date is bumped. # -BUILDRUMP=20130131:0 +BUILDRUMP=20130301:0
CVS commit: src/share/man/man4
Module Name:src Committed By: joerg Date: Fri Mar 1 18:39:53 UTC 2013 Modified Files: src/share/man/man4: sem.4 Log Message: All current semaphores support process sharing. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/sem.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/sem.4 diff -u src/share/man/man4/sem.4:1.3 src/share/man/man4/sem.4:1.4 --- src/share/man/man4/sem.4:1.3 Mon Jun 20 13:25:24 2005 +++ src/share/man/man4/sem.4 Fri Mar 1 18:39:52 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: sem.4,v 1.3 2005/06/20 13:25:24 peter Exp $ +.\" $NetBSD: sem.4,v 1.4 2013/03/01 18:39:52 joerg Exp $ .\" .\" Copyright (c) 2002 Tim J. Robbins .\" All rights reserved. @@ -26,7 +26,7 @@ .\" .\" From: FreeBSD: src/share/man/man4/sem.4,v 1.2 2003/06/02 11:19:23 ru .\" -.Dd January 21, 2005 +.Dd March 1, 2013 .Dt SEM 4 .Os .Sh NAME @@ -59,5 +59,3 @@ The .Nm facility appeared as a kernel option in .Nx 2.0 . -.Sh BUGS -The current implementation does not support shared, unnamed semaphores.
CVS commit: src
Module Name:src Committed By: pooka Date: Fri Mar 1 18:15:39 UTC 2013 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/lib/librumpuser: Makefile shlib_version Added Files: src/lib/librumpuser: rumpuser_component.c rumpuser_component.h Log Message: Add interfaces that out-of-librumpuser hypercalls can use to unschedule and reschedule themselves if they plan to block. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.191 -r1.192 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.179 -r1.180 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.651 -r1.652 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1807 -r1.1808 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/ad.mips64eb cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/ad.mips64el \ src/distrib/sets/lists/debug/md.amd64 \ src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.7 -r1.8 src/lib/librumpuser/Makefile cvs rdiff -u -r0 -r1.1 src/lib/librumpuser/rumpuser_component.c \ src/lib/librumpuser/rumpuser_component.h cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.114 src/distrib/sets/lists/base/ad.mips64eb:1.115 --- src/distrib/sets/lists/base/ad.mips64eb:1.114 Sat Feb 16 21:40:08 2013 +++ src/distrib/sets/lists/base/ad.mips64eb Fri Mar 1 18:15:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.114 2013/02/16 21:40:08 jmmv Exp $ +# $NetBSD: ad.mips64eb,v 1.115 2013/03/01 18:15:36 pooka Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -244,7 +244,7 @@ ./usr/lib/64/librumpnet.so.0 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic,rump -./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic,rump +./usr/lib/64/librumpuser.so.0.1 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpvfs.so.0 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpvfs.so.0.0 base-compat-shlib compat,pic,rump ./usr/lib/64/libsaslc.so.0 base-compat-shlib compat,pic,crypto @@ -560,7 +560,7 @@ ./usr/lib/o32/librumpnet.so.0 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic,rump -./usr/lib/o32/librumpuser.so.0.0 base-compat-shlib compat,pic,rump +./usr/lib/o32/librumpuser.so.0.1 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpvfs.so.0 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpvfs.so.0.0 base-compat-shlib compat,pic,rump ./usr/lib/o32/libsaslc.so.0 base-compat-shlib compat,pic,crypto Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.114 src/distrib/sets/lists/base/ad.mips64el:1.115 --- src/distrib/sets/lists/base/ad.mips64el:1.114 Sat Feb 16 21:40:09 2013 +++ src/distrib/sets/lists/base/ad.mips64el Fri Mar 1 18:15:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.114 2013/02/16 21:40:09 jmmv Exp $ +# $NetBSD: ad.mips64el,v 1.115 2013/03/01 18:15:36 pooka Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -242,7 +242,7 @@ ./usr/lib/64/librumpnet.so.0 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic,rump -./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic,rump +./usr/lib/64/librumpuser.so.0.1 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpvfs.so.0 base-compat-shlib compat,pic,rump ./usr/lib/64/librumpvfs.so.0.0 base-compat-shlib compat,pic,rump ./usr/lib/64/libsaslc.so.0 base-compat-shlib compat,pic,crypto @@ -560,7 +560,7 @@ ./usr/lib/o32/librumpnet.so.0 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic,rump -./usr/lib/o32/librumpuser.so.0.0 base-compat-shlib compat,pic,rump +./usr/lib/o32/librumpuser.so.0.1 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpvfs.so.0 base-compat-shlib compat,pic,rump ./usr/lib/o32/librumpvfs.so.0.0 base-compat-shlib compat,pi
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 1 18:11:11 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Shuffle the namespaces in the previous around a bit, and make it
rumpcomp_user instead of rumpuser_component. This makes sure the
rumpuser namespace is used only by librumpuser.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.69 src/sys/rump/Makefile.rump:1.70
--- src/sys/rump/Makefile.rump:1.69 Fri Mar 1 14:05:43 2013
+++ src/sys/rump/Makefile.rump Fri Mar 1 18:11:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.69 2013/03/01 14:05:43 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.70 2013/03/01 18:11:11 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -76,25 +76,25 @@ DPSRCS+= ${RUMPTOP}/Makefile.rump
# Support for component-specific hypercalls
#
-.ifdef RUMPUSER_COMPONENT
-rumpuser_component.d: rumpuser_component.c
+.ifdef RUMPCOMP_USER
+rumpcomp_user.d: rumpcomp_user.c
${_MKTARGET_CREATE}
- ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${.CURDIR}/rumpuser_component.c
+ ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${.CURDIR}/rumpcomp_user.c
-rumpuser_component.o: rumpuser_component.c
+rumpcomp_user.o: rumpcomp_user.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${RUMPUSER_COMPONENT_CFLAGS} -c ${.CURDIR}/rumpuser_component.c
+ ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
-rumpuser_component.pico: rumpuser_component.c
+rumpcomp_user.pico: rumpcomp_user.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${RUMPUSER_COMPONENT_CFLAGS} -c ${.CURDIR}/rumpuser_component.c
+ ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
-rumpuser_component.po: rumpuser_component.c
+rumpcomp_user.po: rumpcomp_user.c
${_MKTARGET_COMPILE}
- ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${RUMPUSER_COMPONENT_CFLAGS} -c ${.CURDIR}/rumpuser_component.c
+ ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.CURDIR}/rumpcomp_user.c
-RUMPUSER_OBJ=rumpuser_component.*o
-SRCS+=rumpuser_component.c
+RUMPCOMP_USEROBJ=rumpcomp_user.*o
+SRCS+=rumpcomp_user.c
.endif
#
@@ -157,7 +157,7 @@ __archivebuild: .USE
${_MKTARGET_BUILD}
rm -f ${.TARGET}
.endif
- for obj in ${RUMP_SYMREN:U${.ALLSRC:N${RUMPUSER_OBJ}}}; do \
+ for obj in ${RUMP_SYMREN:U${.ALLSRC:N${RUMPCOMP_USEROBJ}}}; do \
${NM} -go $${obj} | ${TOOL_AWK} ' \
$$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \
{s=$$NF;sub(/^'${_PQ}'/, "&rumpns_", s); print $$NF, s}'\
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: htodd
Date: Fri Mar 1 14:28:23 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Disklabel need to use sectors, not bytes. Thanks to agc.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/evbarm.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.9 src/distrib/utils/embedded/conf/evbarm.conf:1.10
--- src/distrib/utils/embedded/conf/evbarm.conf:1.9 Thu Feb 21 15:13:10 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Fri Mar 1 14:28:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.9 2013/02/21 15:13:10 hans Exp $
+# $NetBSD: evbarm.conf,v 1.10 2013/03/01 14:28:22 htodd Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -14,7 +14,9 @@ size=0 # autocompute
msdosid=12
make_label_evbarm() {
- local totalsize=$(( ${newsize} * 1024 * 2 ))
+ # compute all sizes in terms of sectors
+ local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+
local swapsize=$(( ${swap} * 1024 ))
local bootsize=$(( ${boot} * 1024 ))
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 1 14:05:44 UTC 2013
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Allow rump kernel components to define their own hypercalls. This is
useful for example for supporting the tap device on Linux, for which
Linux-specific ioctl's are required (or at least so I was told).
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.68 src/sys/rump/Makefile.rump:1.69
--- src/sys/rump/Makefile.rump:1.68 Thu Nov 22 21:21:21 2012
+++ src/sys/rump/Makefile.rump Fri Mar 1 14:05:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.68 2012/11/22 21:21:21 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.69 2013/03/01 14:05:43 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -73,6 +73,31 @@ CPPFLAGS+= -DPPC_OEA
DPSRCS+= ${RUMPTOP}/Makefile.rump
#
+# Support for component-specific hypercalls
+#
+
+.ifdef RUMPUSER_COMPONENT
+rumpuser_component.d: rumpuser_component.c
+ ${_MKTARGET_CREATE}
+ ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${.CURDIR}/rumpuser_component.c
+
+rumpuser_component.o: rumpuser_component.c
+ ${_MKTARGET_COMPILE}
+ ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${RUMPUSER_COMPONENT_CFLAGS} -c ${.CURDIR}/rumpuser_component.c
+
+rumpuser_component.pico: rumpuser_component.c
+ ${_MKTARGET_COMPILE}
+ ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${RUMPUSER_COMPONENT_CFLAGS} -c ${.CURDIR}/rumpuser_component.c
+
+rumpuser_component.po: rumpuser_component.c
+ ${_MKTARGET_COMPILE}
+ ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPUSER_COMPONENT_CPPFLAGS} ${RUMPUSER_COMPONENT_CFLAGS} -c ${.CURDIR}/rumpuser_component.c
+
+RUMPUSER_OBJ=rumpuser_component.*o
+SRCS+=rumpuser_component.c
+.endif
+
+#
# Rename library symbols before use. If a symbol does not already belong
# to a rump namespace ("rump" or "RUMP"), prefix it with "rumpns". This
# avoids accidentally linking any kernel symbol against host platform
@@ -131,17 +156,19 @@ __archivebuild: .USE
.else
${_MKTARGET_BUILD}
rm -f ${.TARGET}
- ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
.endif
- ${NM} -go ${RUMP_SYMREN:U${.TARGET}} | ${TOOL_AWK} ' \
- $$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \
- {s = $$NF; sub(/^'${_PQ}'/, "&rumpns_", s); print $$NF, s}' \
- | sort | uniq > renametab.${.TARGET}
- ${OBJCOPY} --preserve-dates --redefine-syms \
- renametab.${.TARGET} ${RUMP_SYMREN:U${.TARGET}}
- rm -f renametab.${.TARGET}
+ for obj in ${RUMP_SYMREN:U${.ALLSRC:N${RUMPUSER_OBJ}}}; do \
+ ${NM} -go $${obj} | ${TOOL_AWK} ' \
+ $$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \
+ {s=$$NF;sub(/^'${_PQ}'/, "&rumpns_", s); print $$NF, s}'\
+ | sort | uniq > renametab.$${obj}; \
+ ${OBJCOPY} --preserve-dates --redefine-syms \
+ renametab.$${obj} $${obj}; \
+ rm -f renametab.$${obj}; \
+ done
.if !defined(RUMP_SYMREN)
- ${AR} ${_ARRANFL} ${.TARGET}
+ ${AR} ${_ARFL} ${.TARGET} \
+ `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
.endif
_BSD_IOCONF_MK_USER_=1
CVS commit: src
Module Name:src
Committed By: pooka
Date: Fri Mar 1 13:52:31 UTC 2013
Modified Files:
src/lib/librumpuser: Makefile
src/sys/rump/include/rump: rumpuser.h
Log Message:
limit use of rumpuser.h to where it is meant to be used from
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.73 -r1.74 src/sys/rump/include/rump/rumpuser.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.6 src/lib/librumpuser/Makefile:1.7
--- src/lib/librumpuser/Makefile:1.6 Wed Mar 21 05:37:44 2012
+++ src/lib/librumpuser/Makefile Fri Mar 1 13:52:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/03/21 05:37:44 matt Exp $
+# $NetBSD: Makefile,v 1.7 2013/03/01 13:52:31 pooka Exp $
#
WARNS?= 5
@@ -8,6 +8,7 @@ WARNS?= 5
LIB= rumpuser
LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
+CPPFLAGS+= -DLIBRUMPUSER
#CPPFLAGS+= -D_DIAGNOSTIC
SRCS= rumpuser.c rumpuser_net.c
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.73 src/sys/rump/include/rump/rumpuser.h:1.74
--- src/sys/rump/include/rump/rumpuser.h:1.73 Fri Sep 14 16:29:21 2012
+++ src/sys/rump/include/rump/rumpuser.h Fri Mar 1 13:52:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.73 2012/09/14 16:29:21 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.74 2013/03/01 13:52:31 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -28,6 +28,10 @@
#ifndef _RUMP_RUMPUSER_H_
#define _RUMP_RUMPUSER_H_
+#if !defined(_KERNEL) && !defined(LIBRUMPUSER)
+#error The rump/rumpuser.h interface is not for non-kernel consumers
+#endif
+
#ifdef _KERNEL
#include
#else
CVS commit: src/tests/net/bpf
Module Name:src Committed By: pooka Date: Fri Mar 1 13:49:42 UTC 2013 Modified Files: src/tests/net/bpf: t_div-by-zero.c Log Message: Rump kernel hypercalls are not necessary here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/net/bpf/t_div-by-zero.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/bpf/t_div-by-zero.c diff -u src/tests/net/bpf/t_div-by-zero.c:1.3 src/tests/net/bpf/t_div-by-zero.c:1.4 --- src/tests/net/bpf/t_div-by-zero.c:1.3 Wed Nov 3 16:10:24 2010 +++ src/tests/net/bpf/t_div-by-zero.c Fri Mar 1 13:49:42 2013 @@ -7,7 +7,6 @@ #include #include -#include #include ATF_TC(div_by_zero);
