Module Name: src Committed By: ryoon Date: Sat Jul 26 04:54:20 UTC 2014
Modified Files: src/external/cddl/osnet/dev/fbt: fbt.c src/external/cddl/osnet/dev/sdt: sdt.c src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c Log Message: Fix dtrace kernel module build. Add nodiscard to cdevsw. They are not fixed in fallocate/fdiscard changes. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/cddl/osnet/dev/fbt/fbt.c cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/dev/sdt/sdt.c cvs rdiff -u -r1.27 -r1.28 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dev/fbt/fbt.c diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.15 src/external/cddl/osnet/dev/fbt/fbt.c:1.16 --- src/external/cddl/osnet/dev/fbt/fbt.c:1.15 Wed Mar 19 11:14:12 2014 +++ src/external/cddl/osnet/dev/fbt/fbt.c Sat Jul 26 04:54:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fbt.c,v 1.15 2014/03/19 11:14:12 ozaki-r Exp $ */ +/* $NetBSD: fbt.c,v 1.16 2014/07/26 04:54:20 ryoon Exp $ */ /* * CDDL HEADER START @@ -153,7 +153,7 @@ static void fbt_resume(void *, dtrace_id static const struct cdevsw fbt_cdevsw = { fbt_open, noclose, noread, nowrite, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, + nostop, notty, nopoll, nommap, nokqfilter, nodiscard, D_OTHER }; Index: src/external/cddl/osnet/dev/sdt/sdt.c diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.8 src/external/cddl/osnet/dev/sdt/sdt.c:1.9 --- src/external/cddl/osnet/dev/sdt/sdt.c:1.8 Sat Jul 30 10:12:14 2011 +++ src/external/cddl/osnet/dev/sdt/sdt.c Sat Jul 26 04:54:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sdt.c,v 1.8 2011/07/30 10:12:14 uebayasi Exp $ */ +/* $NetBSD: sdt.c,v 1.9 2014/07/26 04:54:20 ryoon Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ static void sdt_load(void *); static const struct cdevsw sdt_cdevsw = { sdt_open, noclose, noread, nowrite, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, + nostop, notty, nopoll, nommap, nokqfilter, nodiscard, D_OTHER }; Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.27 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.28 --- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.27 Thu Mar 27 15:50:48 2014 +++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sat Jul 26 04:54:20 2014 @@ -15349,7 +15349,7 @@ static dev_type_open(dtrace_open); /* Just opens, clones to the fileops below */ const struct cdevsw dtrace_cdevsw = { dtrace_open, noclose, noread, nowrite, noioctl, - nostop, notty, nopoll, nommap, nokqfilter, + nostop, notty, nopoll, nommap, nokqfilter, nodiscard, D_OTHER | D_MPSAFE };