CVS commit: src/doc
Module Name:src Committed By: mrg Date: Mon Dec 6 04:01:56 UTC 2010 Modified Files: src/doc: CHANGES Log Message: meantion prenice(1). To generate a diff of this commit: cvs rdiff -u -r1.1469 -r1.1470 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1469 src/doc/CHANGES:1.1470 --- src/doc/CHANGES:1.1469 Sun Dec 5 06:05:25 2010 +++ src/doc/CHANGES Mon Dec 6 04:01:56 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1469 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1470 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -803,3 +803,5 @@ for the list of changes [christos 20101205] tcpdump(8): Update to 4.1.1; see src/external/bsd/tcpdump/dist/CHANGES for the list of changes [christos 20101205] + prenice(1): Add new command to change process priorities based upon + the command name, like pkill(1) and pgrep(1). [mrg 20101205]
CVS commit: src/usr.bin/pkill
Module Name:src
Committed By: mrg
Date: Mon Dec 6 04:00:12 UTC 2010
Modified Files:
src/usr.bin/pkill: pkill.1 pkill.c
Log Message:
add a "prenice " command.
use it like "prenice -4 mplayer".
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/pkill/pkill.1
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/pkill/pkill.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pkill/pkill.1
diff -u src/usr.bin/pkill/pkill.1:1.18 src/usr.bin/pkill/pkill.1:1.19
--- src/usr.bin/pkill/pkill.1:1.18 Sat Feb 28 19:21:42 2009
+++ src/usr.bin/pkill/pkill.1 Mon Dec 6 04:00:11 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkill.1,v 1.18 2009/02/28 19:21:42 wiz Exp $
+.\" $NetBSD: pkill.1,v 1.19 2010/12/06 04:00:11 mrg Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -56,6 +56,9 @@
.Op Fl U Ar uid
.Op Fl u Ar euid
.Op Ar pattern ...
+.Nm prenice
+.Op Ar priority
+.Op Ar pattern ...
.Sh DESCRIPTION
The
.Nm pgrep
@@ -68,7 +71,15 @@
command searches the process table on the running system and signals all
processes that match the criteria given on the command line.
.Pp
-The following options are available:
+The
+.Nm prenice
+command searches the process table on the running system and sets the
+priority of all processes that match the criteria given on the command line.
+.Pp
+The following options are available for
+.Nm pkill
+and
+.Nm pgrep :
.Bl -tag -width
.It Fl d Ar delim
Specify a delimiter to be printed between each process ID.
@@ -166,9 +177,10 @@
process will never consider itself or system processes (kernel threads) as
a potential match.
.Sh EXIT STATUS
-.Nm pgrep
-and
+.Nm pgrep ,
.Nm pkill
+and
+.Nm prenice
return one of the following values upon exit:
.Bl -tag -width foo
.It 0
@@ -187,6 +199,7 @@
.Xr kill 2 ,
.Xr sigaction 2 ,
.Xr re_format 7 ,
+.Xr renice 1 ,
.Xr signal 7
.Sh HISTORY
.Nm pkill
@@ -196,3 +209,7 @@
.Nx 1.6 .
They are modelled after utilities of the same name that appeared in Sun
Solaris 7.
+.Pp
+.Nm prenice
+was introduced in
+.Nx 6.0 .
Index: src/usr.bin/pkill/pkill.c
diff -u src/usr.bin/pkill/pkill.c:1.25 src/usr.bin/pkill/pkill.c:1.26
--- src/usr.bin/pkill/pkill.c:1.25 Mon Apr 13 00:12:16 2009
+++ src/usr.bin/pkill/pkill.c Mon Dec 6 04:00:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pkill.c,v 1.25 2009/04/13 00:12:16 lukem Exp $ */
+/* $NetBSD: pkill.c,v 1.26 2010/12/06 04:00:11 mrg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: pkill.c,v 1.25 2009/04/13 00:12:16 lukem Exp $");
+__RCSID("$NetBSD: pkill.c,v 1.26 2010/12/06 04:00:11 mrg Exp $");
#endif /* !lint */
#include
@@ -82,7 +82,9 @@
static const char *delim = "\n";
static int nproc;
static int pgrep;
+static int prenice;
static int signum = SIGTERM;
+static int nicenum;
static int newest;
static int inverse;
static int longfmt;
@@ -103,6 +105,7 @@
int main(int, char **);
static void usage(void) __dead;
static int killact(const struct kinfo_proc2 *);
+static int reniceact(const struct kinfo_proc2 *);
static int grepact(const struct kinfo_proc2 *);
static void makelist(struct listhead *, enum listtype, char *);
@@ -124,6 +127,20 @@
if (strcmp(getprogname(), "pgrep") == 0) {
action = grepact;
pgrep = 1;
+ } else if (strcmp(getprogname(), "prenice") == 0) {
+ prenice = 1;
+ if (argc < 2)
+ usage();
+ action = reniceact;
+ p = argv[1];
+
+ i = (int)strtol(p, &q, 10);
+ if (*q == '\0') {
+ nicenum = i;
+ argv++;
+ argc--;
+ } else
+ usage();
} else {
action = killact;
p = argv[1];
@@ -152,64 +169,66 @@
criteria = 0;
- while ((ch = getopt(argc, argv, "G:P:U:d:fg:ilns:t:u:vx")) != -1)
- switch (ch) {
- case 'G':
- makelist(&rgidlist, LT_GROUP, optarg);
- criteria = 1;
- break;
- case 'P':
- makelist(&ppidlist, LT_GENERIC, optarg);
- criteria = 1;
- break;
- case 'U':
- makelist(&ruidlist, LT_USER, optarg);
- criteria = 1;
- break;
- case 'd':
- if (!pgrep)
+ if (!prenice) {
+ while ((ch = getopt(argc, argv, "G:P:U:d:fg:ilns:t:u:vx")) != -1)
+ switch (ch) {
+ case 'G':
+makelist(&rgidlist, LT_GROUP, optarg);
+criteria = 1;
+break;
+ case 'P':
+makelist(&ppidlist, LT_GENERIC, optarg);
+criteria = 1;
+break;
+ case 'U':
+makelist(&ruidlist, LT_USER, optarg);
+criteria = 1;
+break;
+ case 'd':
+if (!pgrep)
+ usage();
+delim = optarg;
+break;
+ case 'f':
+matchargs = 1;
+break;
+ case 'g':
+makelist(&pgrplist, LT_PGRP, optarg);
+criteria = 1;
+break;
+ case 'i':
+cflags |= REG_ICASE;
+break;
+ case 'l':
+longfmt = 1;
+break;
+ case 'n':
+newest = 1;
+criteria = 1;
+break;
+ case 's':
+makelist(&sidlist, LT_SID, optarg);
+criteria = 1;
+break;
+ case 't':
+
CVS commit: src/external/bsd/libpcap/dist/bpf/net
Module Name:src
Committed By: christos
Date: Mon Dec 6 01:08:03 UTC 2010
Modified Files:
src/external/bsd/libpcap/dist/bpf/net: bpf_filter.c
Log Message:
propagate the fixes from /usr/src/sys/net/bpf_filter.c here, so that
we don't merge backwards again.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/bpf/net/bpf_filter.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/bsd/libpcap/dist/bpf/net/bpf_filter.c
diff -u src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c:1.2 src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c:1.3
--- src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c:1.2 Sat Dec 4 22:02:41 2010
+++ src/external/bsd/libpcap/dist/bpf/net/bpf_filter.c Sun Dec 5 20:08:02 2010
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
*may be used to endorse or promote products derived from this software
*without specific prior written permission.
*
@@ -35,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)bpf.c 7.5 (Berkeley) 7/15/91
+ * @(#)bpf_filter.c 8.1 (Berkeley) 6/10/93
*/
#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
@@ -138,15 +134,17 @@
} \
}
+static int m_xword (const struct mbuf *, uint32_t, int *);
+static int m_xhalf (const struct mbuf *, uint32_t, int *);
+
static int
-m_xword(m, k, err)
- register struct mbuf *m;
- register int k, *err;
+m_xword(const struct mbuf *m, uint32_t k, int *err)
{
- register int len;
- register u_char *cp, *np;
- register struct mbuf *m0;
+ int len;
+ u_char *cp, *np;
+ struct mbuf *m0;
+ *err = 1;
MINDEX(len, m, k);
cp = mtod(m, u_char *) + k;
if (len - k >= 4) {
@@ -155,7 +153,7 @@
}
m0 = m->m_next;
if (m0 == 0 || MLEN(m0) + len - k < 4)
- goto bad;
+ return 0;
*err = 0;
np = mtod(m0, u_char *);
switch (len - k) {
@@ -169,20 +167,16 @@
default:
return (cp[0] << 24) | (cp[1] << 16) | (cp[2] << 8) | np[0];
}
-bad:
- *err = 1;
- return 0;
}
static int
-m_xhalf(m, k, err)
- register struct mbuf *m;
- register int k, *err;
+m_xhalf(const struct mbuf *m, uint32_t k, int *err)
{
- register int len;
- register u_char *cp;
- register struct mbuf *m0;
+ int len;
+ u_char *cp;
+ struct mbuf *m0;
+ *err = 1;
MINDEX(len, m, k);
cp = mtod(m, u_char *) + k;
if (len - k >= 2) {
@@ -191,12 +185,9 @@
}
m0 = m->m_next;
if (m0 == 0)
- goto bad;
+ return 0;
*err = 0;
return (cp[0] << 8) | mtod(m0, u_char *)[0];
- bad:
- *err = 1;
- return 0;
}
#endif
@@ -208,14 +199,10 @@
* in all other cases, p is a pointer to a buffer and buflen is its size.
*/
u_int
-bpf_filter(pc, p, wirelen, buflen)
- register const struct bpf_insn *pc;
- register const u_char *p;
- u_int wirelen;
- register u_int buflen;
+bpf_filter(const struct bpf_insn *pc, const u_char *p, u_int wirelen,
+u_int buflen)
{
- register u_int32 A, X;
- register int k;
+ u_int32 A, X, k;
int32 mem[BPF_MEMWORDS];
#if defined(KERNEL) || defined(_KERNEL)
struct mbuf *m, *n;
@@ -237,6 +224,7 @@
A = 0;
X = 0;
--pc;
+ /* CONSTCOND */
while (1) {
++pc;
switch (pc->code) {
@@ -533,13 +521,12 @@
* Otherwise, a bogus program could easily crash the system.
*/
int
-bpf_validate(f, len)
- const struct bpf_insn *f;
- int len;
+bpf_validate(const struct bpf_insn *f, int signed_len)
{
- u_int i, from;
+ u_int i, from, len;
const struct bpf_insn *p;
+ len = (u_int)signed_len;
if (len < 1)
return 0;
/*
@@ -550,7 +537,7 @@
return 0;
#endif
- for (i = 0; i < (u_int)len; ++i) {
+ for (i = 0; i < len; ++i) {
p = &f[i];
switch (BPF_CLASS(p->code)) {
/*
@@ -559,11 +546,7 @@
case BPF_LD:
case BPF_LDX:
switch (BPF_MODE(p->code)) {
- case BPF_IMM:
-break;
- case BPF_ABS:
- case BPF_IND:
- case BPF_MSH:
+ case BPF_MEM:
/*
* There's no maximum packet data size
* in userland. The runtime packet length
@@ -574,10 +557,14 @@
* More strict check with actual packet length
* is done runtime.
*/
-if (p->k >= bpf_maxbufsize)
+if (p->k >= BPF_MEMWORDS)
return 0;
#endif
break;
+ case BPF_ABS:
+ case BPF_IND:
+ case BPF_MSH:
+ case BPF_IMM:
case BPF_MEM:
if (p->k >= BPF_MEMWORDS)
return 0;
@@ -608,7 +59
CVS commit: src/lib/libedit
Module Name:src
Committed By: dholland
Date: Mon Dec 6 00:05:39 UTC 2010
Modified Files:
src/lib/libedit: filecomplete.c
Log Message:
Improve previous to avoid changing the interface of an externally
exposed function. (But note that this function is neither documented
nor declared in any installed header file, and it probably should not
be externally exposed.) Related to PR 44183, closes PR 44186.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libedit/filecomplete.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.22 src/lib/libedit/filecomplete.c:1.23
--- src/lib/libedit/filecomplete.c:1.22 Thu Dec 2 04:42:46 2010
+++ src/lib/libedit/filecomplete.c Mon Dec 6 00:05:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.22 2010/12/02 04:42:46 dholland Exp $ */
+/* $NetBSD: filecomplete.c,v 1.23 2010/12/06 00:05:38 dholland Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.22 2010/12/02 04:42:46 dholland Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.23 2010/12/06 00:05:38 dholland Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -341,8 +341,8 @@
* 'matches' is list of strings, 'num' is number of strings in 'matches',
* 'width' is maximum length of string in 'matches'.
*
- * matches[0] is not one of the match strings, so the strings are
- * matches[1] *through* matches[num].
+ * matches[0] is not one of the match strings, but it is counted in
+ * num, so the strings are matches[1] *through* matches[num-1].
*/
void
fn_display_match_list (EditLine *el, char **matches, size_t num, size_t width)
@@ -352,6 +352,7 @@
/* Ignore matches[0]. Avoid 1-based array logic below. */
matches++;
+ num--;
/*
* Find out how many entries can be put on one line; count
@@ -518,9 +519,17 @@
(void)fprintf(el->el_outfile, "\n");
}
- if (match_display)
-fn_display_match_list(el, matches, matches_num,
-maxlen);
+ if (match_display) {
+/*
+ * Interface of this function requires the
+ * strings be matches[1..num-1] for compat.
+ * We have matches_num strings not counting
+ * the prefix in matches[0], so we need to
+ * add 1 to matches_num for the call.
+ */
+fn_display_match_list(el, matches,
+matches_num+1, maxlen);
+ }
retval = CC_REDISPLAY;
} else if (matches[0][0]) {
/*
CVS commit: src/bin/dd
Module Name:src
Committed By: jym
Date: Sun Dec 5 23:35:59 UTC 2010
Modified Files:
src/bin/dd: args.c
Log Message:
Hmm, for 'rof', I believe that C_ROF|C_OF is invalid rather than
C_ROF|C_ROF.
Hi pooka :)
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/dd/args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/dd/args.c
diff -u src/bin/dd/args.c:1.27 src/bin/dd/args.c:1.28
--- src/bin/dd/args.c:1.27 Mon Nov 22 21:04:27 2010
+++ src/bin/dd/args.c Sun Dec 5 23:35:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.27 2010/11/22 21:04:27 pooka Exp $ */
+/* $NetBSD: args.c,v 1.28 2010/12/05 23:35:59 jym Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: args.c,v 1.27 2010/11/22 21:04:27 pooka Exp $");
+__RCSID("$NetBSD: args.c,v 1.28 2010/12/05 23:35:59 jym Exp $");
#endif
#endif /* not lint */
@@ -100,7 +100,7 @@
{ "progress", f_progress, 0, 0 },
#ifndef SMALL
{ "rif", f_rif, C_RIF|C_RUMP, C_RIF|C_IF },
- { "rof", f_rof, C_ROF|C_RUMP, C_ROF|C_ROF },
+ { "rof", f_rof, C_ROF|C_RUMP, C_ROF|C_OF },
#endif
{ "seek", f_seek, C_SEEK, C_SEEK },
{ "skip", f_skip, C_SKIP, C_SKIP },
CVS commit: src/sys/net
Module Name:src Committed By: mrg Date: Sun Dec 5 22:40:56 UTC 2010 Modified Files: src/sys/net: bpf_filter.c Log Message: revert another part of bpf_filter 1.38 that broke the check for divide by zero while validating the bpf program. originally spotted by skrll@, and broke atf the month-old atf test for this exact problem: net_bpf_t_div-by-zero_div_by_zero. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/net/bpf_filter.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/bpf_filter.c diff -u src/sys/net/bpf_filter.c:1.40 src/sys/net/bpf_filter.c:1.41 --- src/sys/net/bpf_filter.c:1.40 Sun Dec 5 09:42:20 2010 +++ src/sys/net/bpf_filter.c Sun Dec 5 22:40:56 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bpf_filter.c,v 1.40 2010/12/05 09:42:20 mrg Exp $ */ +/* $NetBSD: bpf_filter.c,v 1.41 2010/12/05 22:40:56 mrg Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.40 2010/12/05 09:42:20 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.41 2010/12/05 22:40:56 mrg Exp $"); #if 0 #if !(defined(lint) || defined(KERNEL)) @@ -529,7 +529,7 @@ /* * Check for constant division by 0. */ -if (BPF_RVAL(p->code) == BPF_K && p->k == 0) +if (BPF_SRC(p->code) == BPF_K && p->k == 0) return 0; break; default:
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Sun Dec 5 22:01:24 UTC 2010
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Log Message:
dm uses non-MI 64bit atomic ops, so don't include it in the default list.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/Makefile.rumpdevcomp
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/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.2 src/sys/rump/dev/Makefile.rumpdevcomp:1.3
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.2 Sun Dec 5 20:39:10 2010
+++ src/sys/rump/dev/Makefile.rumpdevcomp Sun Dec 5 22:01:23 2010
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.2 2010/12/05 20:39:10 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.3 2010/12/05 22:01:23 pooka Exp $
#
-RUMPDEVLIST= audio bpf cgd disk dm fss md netsmb pad putter raidframe \
+RUMPDEVLIST= audio bpf cgd disk fss md netsmb pad putter raidframe \
rnd scsipi scsitest sysmon wscons
RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
+RUMP64ATOMICDEVS= dm
+
.for var in ${RUMPDEVLIST}
RUMPDEVLIBS+=lib${var}
RUMPDEVLDADD+=-lrumpdev_${var}
@@ -14,3 +16,7 @@
.for var in ${RUMPUSBDEVS}
RUMPDEVLIBS+=lib${var}
.endfor
+
+.for var in ${RUMP64ATOMICDEVS}
+RUMPDEVLIBS+=lib${var}
+.endfor
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Sun Dec 5 20:39:10 UTC 2010
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Log Message:
Leave usb-stuff out of alldevs until DELAY() is mi.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/Makefile.rumpdevcomp
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/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.1 src/sys/rump/dev/Makefile.rumpdevcomp:1.2
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.1 Sun Dec 5 16:53:46 2010
+++ src/sys/rump/dev/Makefile.rumpdevcomp Sun Dec 5 20:39:10 2010
@@ -1,10 +1,16 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.1 2010/12/05 16:53:46 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.2 2010/12/05 20:39:10 pooka Exp $
#
RUMPDEVLIST= audio bpf cgd disk dm fss md netsmb pad putter raidframe \
- rnd scsipi scsitest sysmon ubt ucom ugenhc ulpt umass usb wscons
+ rnd scsipi scsitest sysmon wscons
+
+RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
.for var in ${RUMPDEVLIST}
RUMPDEVLIBS+=lib${var}
RUMPDEVLDADD+=-lrumpdev_${var}
.endfor
+
+.for var in ${RUMPUSBDEVS}
+RUMPDEVLIBS+=lib${var}
+.endfor
CVS commit: src
Module Name:src
Committed By: pooka
Date: Sun Dec 5 20:13:27 UTC 2010
Modified Files:
src/sbin/cgdconfig: Makefile.cgdconfig
src/share/examples/rump/wirelessconf: Makefile
src/usr.sbin/puffs/rump_smbfs: Makefile
Log Message:
mirror change of -lrumpcrypto ==> -lrumpkern_crypto
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/cgdconfig/Makefile.cgdconfig
cvs rdiff -u -r1.4 -r1.5 src/share/examples/rump/wirelessconf/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/puffs/rump_smbfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/Makefile.cgdconfig
diff -u src/sbin/cgdconfig/Makefile.cgdconfig:1.2 src/sbin/cgdconfig/Makefile.cgdconfig:1.3
--- src/sbin/cgdconfig/Makefile.cgdconfig:1.2 Sat Dec 19 15:03:34 2009
+++ src/sbin/cgdconfig/Makefile.cgdconfig Sun Dec 5 20:13:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cgdconfig,v 1.2 2009/12/19 15:03:34 pooka Exp $
+# $NetBSD: Makefile.cgdconfig,v 1.3 2010/12/05 20:13:26 pooka Exp $
#
SRCS+= cgdconfig.c \
@@ -24,7 +24,7 @@
CPPFLAGS+= -I${CGDCONFIGDIR}
.ifdef RUMP_ACTION
-LDADD+= -lrumpdev_cgd -lrumpdev_disk -lrumpdev -lrumpcrypto
+LDADD+= -lrumpdev_cgd -lrumpdev_disk -lrumpdev -lrumpkern_crypto
LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
SRCS+= cgd_rumpops.c
.else
Index: src/share/examples/rump/wirelessconf/Makefile
diff -u src/share/examples/rump/wirelessconf/Makefile:1.4 src/share/examples/rump/wirelessconf/Makefile:1.5
--- src/share/examples/rump/wirelessconf/Makefile:1.4 Wed Feb 10 02:31:01 2010
+++ src/share/examples/rump/wirelessconf/Makefile Sun Dec 5 20:13:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/02/10 02:31:01 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/05 20:13:26 pooka Exp $
#
PROG= wirelessconf
@@ -6,7 +6,8 @@
LDADD+= -lrumpdev_usbrum -lrumpdev_ugenhc
LDADD+= -lrumpdev_usb -lrumpdev
LDADD+= -lrumpnet_net80211 -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+= -lrumpvfs -lrumpcrypto -lrump
+LDADD+= -lrumpkern_crypto
+LDADD+= -lrumpvfs -lrump
LDADD+= -lrumpuser -lpthread
DBG= -g
Index: src/usr.sbin/puffs/rump_smbfs/Makefile
diff -u src/usr.sbin/puffs/rump_smbfs/Makefile:1.5 src/usr.sbin/puffs/rump_smbfs/Makefile:1.6
--- src/usr.sbin/puffs/rump_smbfs/Makefile:1.5 Fri Dec 11 16:46:27 2009
+++ src/usr.sbin/puffs/rump_smbfs/Makefile Sun Dec 5 20:13:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/12/11 16:46:27 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/05 20:13:26 pooka Exp $
#
WARNS=2
@@ -9,7 +9,7 @@
SRCS+= smb_rumpops.c
LDADD+= -lrumpnet_sockin -lrumpnet
-LDADD+= -lrumpcrypto -lrumpdev_netsmb -lrumpdev
+LDADD+= -lrumpkern_crypto -lrumpdev_netsmb -lrumpdev
ISRUMP= # it is
CVS commit: src/usr.bin/rump_allserver
Module Name:src
Committed By: pooka
Date: Sun Dec 5 20:12:56 UTC 2010
Modified Files:
src/usr.bin/rump_allserver: Makefile
Log Message:
rumpcrypto now comes as part of RUMPKERNLDADD
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_allserver/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rump_allserver/Makefile
diff -u src/usr.bin/rump_allserver/Makefile:1.1 src/usr.bin/rump_allserver/Makefile:1.2
--- src/usr.bin/rump_allserver/Makefile:1.1 Sun Dec 5 17:37:33 2010
+++ src/usr.bin/rump_allserver/Makefile Sun Dec 5 20:12:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/12/05 17:37:33 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 20:12:55 pooka Exp $
#
PROG= rump_allserver
@@ -12,6 +12,6 @@
.include "${RUMPTOP}/net/Makefile.rumpnetcomp"
LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
-LDADD+= -lrumpcrypto -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
+LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
.include
CVS commit: src
Module Name:src Committed By: pooka Date: Sun Dec 5 20:11:23 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/lib: Makefile src/sys/rump/kern: Makefile.rumpkerncomp src/sys/rump/librump: Makefile Added Files: src/sys/rump/kern/lib/libcrypto: Makefile shlib_version Removed Files: src/lib/librumpcrypto: Makefile src/sys/rump/librump/rumpcrypto: Makefile Makefile.rumpcrypto Log Message: rumpcrypto should never have been its own faction, so finally make it a component under kern, i.e. rumpcrypto -> rumpkern_crypto. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.560 -r1.561 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1529 -r1.1530 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.156 -r1.157 src/lib/Makefile cvs rdiff -u -r1.1 -r0 src/lib/librumpcrypto/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/Makefile.rumpkerncomp cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libcrypto/Makefile \ src/sys/rump/kern/lib/libcrypto/shlib_version cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpcrypto/Makefile cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpcrypto/Makefile.rumpcrypto 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.31 src/distrib/sets/lists/base/ad.mips64eb:1.32 --- src/distrib/sets/lists/base/ad.mips64eb:1.31 Sun Dec 5 06:02:28 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Sun Dec 5 20:11:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.31 2010/12/05 06:02:28 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.32 2010/12/05 20:11:22 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 @@ -193,8 +193,8 @@ ./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic ./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic -./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto -./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/librumpcrypto.so.0 base-obsolete obsolete +./usr/lib/64/librumpcrypto.so.0.0 base-obsolete obsolete ./usr/lib/64/librumpdev.so.0 base-compat-shlib compat,pic ./usr/lib/64/librumpdev.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpvfs.so.0 base-compat-shlib compat,pic @@ -446,8 +446,8 @@ ./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpuser.so.0.0 base-compat-shlib compat,pic -./usr/lib/o32/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto -./usr/lib/o32/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/librumpcrypto.so.0 base-obsolete obsolete +./usr/lib/o32/librumpcrypto.so.0.0 base-obsolete obsolete ./usr/lib/o32/librumpdev.so.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpdev.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/librumpvfs.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.29 src/distrib/sets/lists/base/ad.mips64el:1.30 --- src/distrib/sets/lists/base/ad.mips64el:1.29 Sun Dec 5 06:02:28 2010 +++ src/distrib/sets/lists/base/ad.mips64el Sun Dec 5 20:11:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.29 2010/12/05 06:02:28 christos Exp $ +# $NetBSD: ad.mips64el,v 1.30 2010/12/05 20:11:22 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 @@ -193,8 +193,8 @@ ./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic ./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic -./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto -./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/librumpcrypto.so.0 base-obsolete obsolete +.
CVS commit: src/doc
Module Name:src Committed By: riz Date: Sun Dec 5 18:21:50 UTC 2010 Modified Files: src/doc: NetBSD-6 Log Message: Add GPT bootloader to "Possibly" list To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/doc/NetBSD-6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/NetBSD-6 diff -u src/doc/NetBSD-6:1.1 src/doc/NetBSD-6:1.2 --- src/doc/NetBSD-6:1.1 Sat Nov 27 21:31:11 2010 +++ src/doc/NetBSD-6 Sun Dec 5 18:21:50 2010 @@ -46,6 +46,8 @@ + kernel modules need work + Xen suspend/resume - jym working on it + TNF funding for release engineering ++ GPT-aware bootloader for i386/amd64 - seeking volunteer to finish and + integrate existing work. Alistair Crooks
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: pooka
Date: Sun Dec 5 18:01:46 UTC 2010
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
claim ENOTTY for PRU_CONTROL for now
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/net/lib/libsockin/sockin.c
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/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.24 src/sys/rump/net/lib/libsockin/sockin.c:1.25
--- src/sys/rump/net/lib/libsockin/sockin.c:1.24 Sun Dec 5 17:59:12 2010
+++ src/sys/rump/net/lib/libsockin/sockin.c Sun Dec 5 18:01:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.24 2010/12/05 17:59:12 pooka Exp $ */
+/* $NetBSD: sockin.c,v 1.25 2010/12/05 18:01:46 pooka Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.24 2010/12/05 17:59:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.25 2010/12/05 18:01:46 pooka Exp $");
#include
#include
@@ -490,6 +490,10 @@
break;
}
+ case PRU_CONTROL:
+ error = ENOTTY;
+ break;
+
default:
panic("sockin_usrreq: IMPLEMENT ME, req %d not supported", req);
}
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: pooka
Date: Sun Dec 5 17:59:12 UTC 2010
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
Revert previous: it introduces a dependency between sockin and the
netinet rump components and will have to be done another way.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/net/lib/libsockin/sockin.c
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/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.23 src/sys/rump/net/lib/libsockin/sockin.c:1.24
--- src/sys/rump/net/lib/libsockin/sockin.c:1.23 Sun Dec 5 15:54:50 2010
+++ src/sys/rump/net/lib/libsockin/sockin.c Sun Dec 5 17:59:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.23 2010/12/05 15:54:50 pooka Exp $ */
+/* $NetBSD: sockin.c,v 1.24 2010/12/05 17:59:12 pooka Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.23 2010/12/05 15:54:50 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.24 2010/12/05 17:59:12 pooka Exp $");
#include
#include
@@ -49,7 +49,6 @@
#include
#include
#include
-#include
#include
@@ -491,10 +490,6 @@
break;
}
- case PRU_CONTROL:
- return in_control(so, (long)m, (void *)nam,
- (struct ifnet *)control, l);
-
default:
panic("sockin_usrreq: IMPLEMENT ME, req %d not supported", req);
}
CVS commit: src/usr.bin
Module Name:src Committed By: pooka Date: Sun Dec 5 17:45:08 UTC 2010 Modified Files: src/usr.bin: Makefile Log Message: dumdidumdum, fix name in previous To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/usr.bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.193 src/usr.bin/Makefile:1.194 --- src/usr.bin/Makefile:1.193 Sun Dec 5 17:37:32 2010 +++ src/usr.bin/Makefile Sun Dec 5 17:45:08 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.193 2010/12/05 17:37:32 pooka Exp $ +# $NetBSD: Makefile,v 1.194 2010/12/05 17:45:08 pooka Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include @@ -22,7 +22,7 @@ pagesize passwd paste patch pathchk pkill pmap pmc pr \ printenv printf progress pwhash qsubst quota radioctl rdist \ renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh \ - rump_superserver rup ruptime rusers rwall rwho \ + rump_allserver rup ruptime rusers rwall rwho \ script sdiff sdpquery sed seq shar shlock \ showmount shuffle sockstat soelim sort spell split stat su systat \ tabs tail talk tcopy tee telnet tftp tic time tip touch tput \
CVS commit: src
Module Name:src Committed By: pooka Date: Sun Dec 5 17:37:34 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/usr.bin: Makefile Added Files: src/usr.bin/rump_allserver: Makefile rump_allserver.c Log Message: Add a rump server which comes with all the drivers currently available. In terms of modules it maps to: golem> rump.modstat NAME CLASS SOURCE REFS SIZE REQUIRES bpf driver builtin0 -- cd9660 vfsbuiltin0 -- cgd driver builtin0 -- dm driver builtin0 -- efs vfsbuiltin0 -- ext2fs vfsbuiltin0 -ffs fdescvfsbuiltin0 -- ffs vfsbuiltin3 -- fss driver builtin0 -- hfs vfsbuiltin0 -- kernfs vfsbuiltin0 -- ksem misc builtin0 -- layerfs misc builtin2 -- lfs vfsbuiltin0 -ffs mfs vfsbuiltin0 -ffs msdosvfsbuiltin0 -- nfs vfsbuiltin1 -- nfsservermisc builtin0 -nfs nilfsvfsbuiltin0 -- ntfs vfsbuiltin0 -- null vfsbuiltin0 -layerfs pad driver builtin0 -- ptyfsvfsbuiltin0 -- puffsvfsbuiltin0 -putter putter driver builtin1 -- scsiverbose misc builtin0 -- smbfsvfsbuiltin0 -- susersecmodel builtin0 -- swsensor driver builtin0 -- sysvbfs vfsbuiltin0 -- tmpfsvfsbuiltin0 -- udf vfsbuiltin0 -- umap vfsbuiltin0 -layerfs unionvfsbuiltin0 -- usbverbose misc builtin0 -- wapblvfsbuiltin0 -- In terms of interfaces: golem> rump.ifconfig -C shmif virt lo carp and dmesg: NetBSD 5.99.41 (RUMP-ROAST) #0: Tue Nov 30 15:35:05 CET 2010 po...@pain-rustique.localhost:/usr/allsrc/src/sys/rump/librump/rumpkern total memory = unlimited (host limit) timecounter: Timecounters tick every 10.000 msec timecounter: Timecounter "rumpclk" frequency 100 Hz quality 0 cpu0 at thinair0: rump virtual cpu cpu1 at thinair0: rump virtual cpu root file system type: rumpfs mainbus0 (root) ugenhc0 at mainbus0 usb0 at ugenhc0: USB revision 2.0 uhub0 at usb0: vendor 0x7275 product 0x6d70, class 9/0, rev 0.00/0.00, addr 1 uhub0: 1 port with 1 removable, self powered ugenhc1 at mainbus0 usb1 at ugenhc1: USB revision 2.0 uhub1 at usb1: vendor 0x7275 product 0x6d70, class 9/0, rev 0.00/0.00, addr 1 uhub1: 1 port with 1 removable, self powered ugenhc2 at mainbus0 usb2 at ugenhc2: USB revision 2.0 uhub2 at usb2: vendor 0x7275 product 0x6d70, class 9/0, rev 0.00/0.00, addr 1 uhub2: 1 port with 1 removable, self powered ugenhc3 at mainbus0 usb3 at ugenhc3: USB revision 2.0 uhub3 at usb3: vendor 0x7275 product 0x6d70, class 9/0, rev 0.00/0.00, addr 1 uhub3: 1 port with 1 removable, self powered scsitest0 at mainbus0 scsibus0 at scsitest0: 2 targets, 1 lun per target cd0 at scsibus0 target 1 lun 0: cdrom removable Chicony Electronics Chicony Electronics, class 0/0, rev 2.00/1.00, addr 2, uhub0 port 1 not configured AuthenTec AuthenTec, class 255/255, rev 1.10/6.21, addr 2, uhub1 port 1 not configured swwdog0: software watchdog initialized Kernelized RAIDframe activated pad0: outputs: 44100Hz, 16-bit, stereo audio0 at pad0: half duplex, playback, capture There a bunch of other stuff which doesn't show up as any of the above, plus of course the usb drivers which are probed only if I have the appropriate hardware plugged into my workstation. To generate a diff of this commit: cvs rdiff -u -r1.893 -r1.894 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1528 -r1.1529 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.192 -r1.193 src/usr.bin/Makefile cvs rdiff -u -r0 -r1.1 src/usr.bin/rump_allserver/Makefile \ src/usr.bin/rump_allserver/rump_allserver.c 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/mi diff -u src/distrib/sets/lists/base/mi:1.893 src/distrib/sets/lists/base/mi:1.894 --- src/distrib/sets/lists/base/mi:1.893 Sun
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Sun Dec 5 16:53:47 UTC 2010
Modified Files:
src/sys/rump/dev/lib: Makefile
src/sys/rump/fs/lib: Makefile
src/sys/rump/net/lib: Makefile
Added Files:
src/sys/rump/dev: Makefile.rumpdevcomp
src/sys/rump/fs: Makefile.rumpfscomp
src/sys/rump/net: Makefile.rumpnetcomp
Removed Files:
src/sys/rump/dev: Makefile.rumpdev
src/sys/rump/fs: Makefile.rumpfs
src/sys/rump/net: Makefile.rumpnet
Log Message:
Rename Makefile.rump${x} to Makefile.rump${x}comp for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r0 src/sys/rump/dev/Makefile.rumpdev
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/Makefile
cvs rdiff -u -r1.26 -r0 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/Makefile.rumpfscomp
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/rump/net/Makefile.rumpnet
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/Makefile
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/dev/lib/Makefile
diff -u src/sys/rump/dev/lib/Makefile:1.1 src/sys/rump/dev/lib/Makefile:1.2
--- src/sys/rump/dev/lib/Makefile:1.1 Tue Jun 9 16:16:15 2009
+++ src/sys/rump/dev/lib/Makefile Sun Dec 5 16:53:46 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2009/06/09 16:16:15 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 16:53:46 pooka Exp $
#
-.include "${.CURDIR}/../Makefile.rumpdev"
+.include "${.CURDIR}/../Makefile.rumpdevcomp"
SUBDIR+= ${RUMPDEVLIBS}
Index: src/sys/rump/fs/lib/Makefile
diff -u src/sys/rump/fs/lib/Makefile:1.1 src/sys/rump/fs/lib/Makefile:1.2
--- src/sys/rump/fs/lib/Makefile:1.1 Sun Aug 5 22:28:03 2007
+++ src/sys/rump/fs/lib/Makefile Sun Dec 5 16:53:46 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2007/08/05 22:28:03 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 16:53:46 pooka Exp $
#
-.include "${.CURDIR}/../Makefile.rumpfs"
+.include "${.CURDIR}/../Makefile.rumpfscomp"
SUBDIR+= ${RUMPFSLIBS}
Index: src/sys/rump/net/lib/Makefile
diff -u src/sys/rump/net/lib/Makefile:1.1 src/sys/rump/net/lib/Makefile:1.2
--- src/sys/rump/net/lib/Makefile:1.1 Thu Oct 2 21:59:19 2008
+++ src/sys/rump/net/lib/Makefile Sun Dec 5 16:53:47 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2008/10/02 21:59:19 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 16:53:47 pooka Exp $
#
-.include "${.CURDIR}/../Makefile.rumpnet"
+.include "${.CURDIR}/../Makefile.rumpnetcomp"
SUBDIR+= ${RUMPNETLIBS}
Added files:
Index: src/sys/rump/dev/Makefile.rumpdevcomp
diff -u /dev/null src/sys/rump/dev/Makefile.rumpdevcomp:1.1
--- /dev/null Sun Dec 5 16:53:47 2010
+++ src/sys/rump/dev/Makefile.rumpdevcomp Sun Dec 5 16:53:46 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile.rumpdevcomp,v 1.1 2010/12/05 16:53:46 pooka Exp $
+#
+
+RUMPDEVLIST= audio bpf cgd disk dm fss md netsmb pad putter raidframe \
+ rnd scsipi scsitest sysmon ubt ucom ugenhc ulpt umass usb wscons
+
+.for var in ${RUMPDEVLIST}
+RUMPDEVLIBS+=lib${var}
+RUMPDEVLDADD+=-lrumpdev_${var}
+.endfor
Index: src/sys/rump/fs/Makefile.rumpfscomp
diff -u /dev/null src/sys/rump/fs/Makefile.rumpfscomp:1.1
--- /dev/null Sun Dec 5 16:53:47 2010
+++ src/sys/rump/fs/Makefile.rumpfscomp Sun Dec 5 16:53:46 2010
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.rumpfscomp,v 1.1 2010/12/05 16:53:46 pooka Exp $
+#
+
+RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
+ nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs \
+ tmpfs udf umap union
+
+RUMPFSCOMP+= nfsserver
+
+RUMPVFSCOMP+= fifo layer
+
+.for var in ${RUMPFSCOMP}
+RUMPFSLIBS+=lib${var}
+RUMPFSLDADD+=-lrumpfs_${var}
+.endfor
+
+.for var in ${RUMPVFSCOMP}
+RUMPFSLIBS+=lib${var}vfs
+RUMPFSLDADD+=-lrumpvfs_${var}fs
+.endfor
Index: src/sys/rump/net/Makefile.rumpnetcomp
diff -u /dev/null src/sys/rump/net/Makefile.rumpnetcomp:1.1
--- /dev/null Sun Dec 5 16:53:47 2010
+++ src/sys/rump/net/Makefile.rumpnetcomp Sun Dec 5 16:53:46 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.rumpnetcomp,v 1.1 2010/12/05 16:53:46 pooka Exp $
+#
+
+RUMPNETCOMP= net net80211 netbt netinet local sockin shmif virtif
+
+.for var in ${RUMPNETCOMP}
+RUMPNETLIBS+=lib${var}
+RUMPNETLDADD+=-lrumpnet_${var}
+.endfor
CVS commit: src/sys/rump/dev/lib/libusb
Module Name:src
Committed By: pooka
Date: Sun Dec 5 16:51:00 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libusb: Makefile
Log Message:
include usb_verbose in the component (at least for the time being)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libusb/Makefile
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/dev/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.4 src/sys/rump/dev/lib/libusb/Makefile:1.5
--- src/sys/rump/dev/lib/libusb/Makefile:1.4 Mon Mar 8 10:24:37 2010
+++ src/sys/rump/dev/lib/libusb/Makefile Sun Dec 5 16:51:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/03/08 10:24:37 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/05 16:51:00 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -9,7 +9,7 @@
IOCONF= USB.ioconf
SRCS= usb.c usbdi.c usbdi_util.c usb_mem.c usb_subr.c usb_quirks.c \
- uhub.c usbroothub_subr.c
+ uhub.c usbroothub_subr.c usb_verbose.c
SRCS+= usb_at_ugenhc.c
.else
SRCS= dummy.c
CVS commit: src/sys/rump/dev/lib/libsysmon
Module Name:src
Committed By: pooka
Date: Sun Dec 5 16:50:09 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libsysmon: Makefile
Log Message:
whitespace polish
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libsysmon/Makefile
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/dev/lib/libsysmon/Makefile
diff -u src/sys/rump/dev/lib/libsysmon/Makefile:1.4 src/sys/rump/dev/lib/libsysmon/Makefile:1.5
--- src/sys/rump/dev/lib/libsysmon/Makefile:1.4 Tue Oct 19 11:58:01 2010
+++ src/sys/rump/dev/lib/libsysmon/Makefile Sun Dec 5 16:50:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/10/19 11:58:01 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/05 16:50:09 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/sysmon
@@ -10,7 +10,7 @@
sysmon_envsys_tables.c sysmon_envsys_util.c sysmon_wdog.c sysmon.c \
swsensor.c swwdog.c
-SRCS+= component.c
+SRCS+= component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
CVS commit: src/sys/rump/kern
Module Name:src
Committed By: pooka
Date: Sun Dec 5 16:27:43 UTC 2010
Modified Files:
src/sys/rump/kern/lib: Makefile
Added Files:
src/sys/rump/kern: Makefile.rumpkerncomp
Log Message:
Make build similar to fs, net & dev.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/Makefile.rumpkerncomp
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/kern/lib/Makefile
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/kern/lib/Makefile
diff -u src/sys/rump/kern/lib/Makefile:1.3 src/sys/rump/kern/lib/Makefile:1.4
--- src/sys/rump/kern/lib/Makefile:1.3 Mon Jun 21 21:43:28 2010
+++ src/sys/rump/kern/lib/Makefile Sun Dec 5 16:27:42 2010
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/06/21 21:43:28 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/05 16:27:42 pooka Exp $
#
-SUBDIR+= libksem libtty libz
+.include "${.CURDIR}/../Makefile.rumpkerncomp"
+
+SUBDIR+= ${RUMPKERNLIBS}
.include
Added files:
Index: src/sys/rump/kern/Makefile.rumpkerncomp
diff -u /dev/null src/sys/rump/kern/Makefile.rumpkerncomp:1.1
--- /dev/null Sun Dec 5 16:27:43 2010
+++ src/sys/rump/kern/Makefile.rumpkerncomp Sun Dec 5 16:27:42 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.rumpkerncomp,v 1.1 2010/12/05 16:27:42 pooka Exp $
+#
+
+RUMPKERNCOMPS= ksem tty z
+
+.for var in ${RUMPKERNCOMPS}
+RUMPKERNLIBS+=lib${var}
+RUMPKERNLDADD+=-lrumpkern_${var}
+.endfor
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Sun Dec 5 16:11:17 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/libnull: Makefile shlib_version
src/sys/rump/fs/lib/libumap: Makefile shlib_version
Removed Files:
src/sys/rump/fs/lib/libnullfs: Makefile shlib_version
src/sys/rump/fs/lib/libumapfs: Makefile shlib_version
Log Message:
Fix RUMPFSLIBS etc. As collateral, rename nullfs/umapfs to match
the vfsname, i.e. to "null" and "umap".
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libnull/Makefile \
src/sys/rump/fs/lib/libnull/shlib_version
cvs rdiff -u -r1.2 -r0 src/sys/rump/fs/lib/libnullfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnullfs/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libumap/Makefile \
src/sys/rump/fs/lib/libumap/shlib_version
cvs rdiff -u -r1.2 -r0 src/sys/rump/fs/lib/libumapfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libumapfs/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/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.25 src/sys/rump/fs/Makefile.rumpfs:1.26
--- src/sys/rump/fs/Makefile.rumpfs:1.25 Mon Jul 26 15:55:41 2010
+++ src/sys/rump/fs/Makefile.rumpfs Sun Dec 5 16:11:16 2010
@@ -1,15 +1,20 @@
-# $NetBSD: Makefile.rumpfs,v 1.25 2010/07/26 15:55:41 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.26 2010/12/05 16:11:16 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
- nfs nilfs ntfs nullfs ptyfs smbfs syspuffs sysvbfs \
- tmpfs udf umapfs union
+RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
+ nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs \
+ tmpfs udf umap union
-RUMPFSLIST+= fifovfs layervfs
+RUMPFSCOMP+= nfsserver
-RUMPFSLIST+= nfsserver
+RUMPVFSCOMP+= fifo layer
-.for var in ${RUMPFSLIST}
+.for var in ${RUMPFSCOMP}
RUMPFSLIBS+=lib${var}
RUMPFSLDADD+=-lrumpfs_${var}
.endfor
+
+.for var in ${RUMPVFSCOMP}
+RUMPFSLIBS+=lib${var}vfs
+RUMPFSLDADD+=-lrumpvfs_${var}fs
+.endfor
Added files:
Index: src/sys/rump/fs/lib/libnull/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libnull/Makefile:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libnull/Makefile Sun Dec 5 16:11:16 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/nullfs
+
+LIB= rumpfs_null
+
+SRCS= null_vfsops.c null_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libnull/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libnull/shlib_version:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libnull/shlib_version Sun Dec 5 16:11:16 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/fs/lib/libumap/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libumap/Makefile:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libumap/Makefile Sun Dec 5 16:11:17 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../miscfs/umapfs
+
+LIB= rumpfs_umap
+
+SRCS= umap_subr.c umap_vfsops.c umap_vnops.c
+
+.include
+.include
Index: src/sys/rump/fs/lib/libumap/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libumap/shlib_version:1.1
--- /dev/null Sun Dec 5 16:11:17 2010
+++ src/sys/rump/fs/lib/libumap/shlib_version Sun Dec 5 16:11:17 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs/rumptest
Module Name:src Committed By: pooka Date: Sun Dec 5 16:02:04 UTC 2010 Removed Files: src/sys/rump/fs/rumptest: Makefile rumptest.c Log Message: get rid of this uninstalled "test", even i haven't compiled it for ages To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 src/sys/rump/fs/rumptest/Makefile cvs rdiff -u -r1.3 -r0 src/sys/rump/fs/rumptest/rumptest.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader
Module Name:src
Committed By: adam
Date: Sun Dec 5 15:57:40 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
Log Message:
Fix building on case-insensitive file-system.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.8 Tue Nov 23 10:19:55 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Sun Dec 5 15:57:40 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/23 10:19:55 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/05 15:57:40 adam Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -29,7 +29,6 @@
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/xfixes \
-I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: pooka
Date: Sun Dec 5 15:54:50 UTC 2010
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
use in_control() for PRU_CONTROL
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/net/lib/libsockin/sockin.c
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/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.22 src/sys/rump/net/lib/libsockin/sockin.c:1.23
--- src/sys/rump/net/lib/libsockin/sockin.c:1.22 Mon Apr 5 07:22:50 2010
+++ src/sys/rump/net/lib/libsockin/sockin.c Sun Dec 5 15:54:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.22 2010/04/05 07:22:50 joerg Exp $ */
+/* $NetBSD: sockin.c,v 1.23 2010/12/05 15:54:50 pooka Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.22 2010/04/05 07:22:50 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.23 2010/12/05 15:54:50 pooka Exp $");
#include
#include
@@ -49,6 +49,7 @@
#include
#include
#include
+#include
#include
@@ -490,6 +491,10 @@
break;
}
+ case PRU_CONTROL:
+ return in_control(so, (long)m, (void *)nam,
+ (struct ifnet *)control, l);
+
default:
panic("sockin_usrreq: IMPLEMENT ME, req %d not supported", req);
}
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: phx
Date: Sun Dec 5 13:33:50 UTC 2010
Modified Files:
src/sys/arch/macppc/dev: obio.c
Log Message:
The gpio children have either register offsets based on gpio or on obio.
Implemented a workaround to deal with this uncertainty.
This fixes the machdep.cpu_speed control for 7447A-based iBookG4s.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/macppc/dev/obio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/obio.c
diff -u src/sys/arch/macppc/dev/obio.c:1.30 src/sys/arch/macppc/dev/obio.c:1.31
--- src/sys/arch/macppc/dev/obio.c:1.30 Wed Oct 20 18:52:33 2010
+++ src/sys/arch/macppc/dev/obio.c Sun Dec 5 13:33:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.30 2010/10/20 18:52:33 phx Exp $ */
+/* $NetBSD: obio.c,v 1.31 2010/12/05 13:33:50 phx Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.30 2010/10/20 18:52:33 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.31 2010/12/05 13:33:50 phx Exp $");
#include
#include
@@ -329,10 +329,10 @@
static void
obio_setup_gpios(struct obio_softc *sc, int node)
{
- uint32_t reg[6];
+ uint32_t gpio_base, reg[6];
struct sysctlnode *sysctl_node;
char name[32];
- int gpio_base, child, use_dfs;
+ int child, use_dfs;
if (of_compatible(sc->sc_node, keylargo) == -1)
return;
@@ -353,6 +353,15 @@
if (OF_getprop(child, "reg", reg, sizeof(reg)) < 4)
continue;
+ /*
+ * These register offsets either have to be added to the obio
+ * base address or to the gpio base address. This differs
+ * even in the same OF-tree! So we guess the offset is
+ * based on obio when it is larger than the gpio_base.
+ */
+ if (reg[0] >= gpio_base)
+ reg[0] -= gpio_base;
+
if (strcmp(name, "frequency-gpio") == 0) {
DPRINTF("found frequency_gpio at %02x\n", reg[0]);
sc->sc_busspeed = gpio_base + reg[0];
@@ -381,9 +390,8 @@
CTLFLAG_READWRITE | CTLFLAG_OWNDESC | CTLFLAG_IMMEDIATE,
CTLTYPE_INT, "cpu_speed", "CPU speed", sysctl_cpuspeed_temp,
(unsigned long)sc, NULL, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL);
- if (sysctl_node != NULL) {
+ if (sysctl_node != NULL)
sysctl_node->sysctl_data = (void *)sc;
- }
}
static void
@@ -437,7 +445,7 @@
if (sc->sc_busspeed >= 0) {
if (bus_space_read_1(sc->sc_tag, sc->sc_bh, sc->sc_busspeed)
& 1)
- return 1;
+ return 1;
}
else
return cpu_get_dfs() == 1;
CVS commit: src/sys/arch/hp700
Module Name:src
Committed By: skrll
Date: Sun Dec 5 12:19:09 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: apic.c asp.c dino.c lasi.c mongoose.c
siop_sgc.c wax.c
src/sys/arch/hp700/gsc: com_gsc.c gscbus.c gsckbc.c harmony.c
if_ie_gsc.c if_iee_gsc.c lpt_gsc.c oosiop_gsc.c osiop_gsc.c
siop_gsc.c
src/sys/arch/hp700/hp700: intr.c intr.h
Log Message:
Make the interrupt evcnt name consistent everywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/dev/apic.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/dev/asp.c \
src/sys/arch/hp700/dev/lasi.c src/sys/arch/hp700/dev/wax.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp700/dev/mongoose.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/dev/siop_sgc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp700/gsc/com_gsc.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp700/gsc/gscbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/gsc/gsckbc.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp700/gsc/harmony.c \
src/sys/arch/hp700/gsc/if_iee_gsc.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp700/gsc/if_ie_gsc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp700/gsc/lpt_gsc.c \
src/sys/arch/hp700/gsc/siop_gsc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp700/gsc/oosiop_gsc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/gsc/osiop_gsc.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hp700/hp700/intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp700/hp700/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/dev/apic.c
diff -u src/sys/arch/hp700/dev/apic.c:1.7 src/sys/arch/hp700/dev/apic.c:1.8
--- src/sys/arch/hp700/dev/apic.c:1.7 Sat Apr 24 10:41:21 2010
+++ src/sys/arch/hp700/dev/apic.c Sun Dec 5 12:19:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: apic.c,v 1.7 2010/04/24 10:41:21 skrll Exp $ */
+/* $NetBSD: apic.c,v 1.8 2010/12/05 12:19:09 skrll Exp $ */
/* $OpenBSD: apic.c,v 1.7 2007/10/06 23:50:54 krw Exp $ */
@@ -71,6 +71,7 @@
void *arg;
struct apic_iv *next;
struct evcnt *cnt;
+ char aiv_name[32];
};
struct apic_iv *apic_intr_list[CPU_NINTS];
@@ -189,8 +190,11 @@
return NULL;
}
+ snprintf(aiv->aiv_name, sizeof(aiv->aiv_name), "line %d irq %d",
+ line, irq);
+
evcnt_attach_dynamic(cnt, EVCNT_TYPE_INTR, NULL,
- device_xname(sc->sc_dv), "irq" /* XXXNH */);
+ device_xname(sc->sc_dv), aiv->aiv_name);
biv = apic_intr_list[irq];
while (biv->next)
biv = biv->next;
@@ -199,8 +203,8 @@
return arg;
}
- if ((iv = hp700_intr_establish(sc->sc_dv, pri, apic_intr,
- aiv, &int_reg_cpu, irq))) {
+ iv = hp700_intr_establish(pri, apic_intr, aiv, &int_reg_cpu, irq);
+ if (iv) {
ent0 = (31 - irq) & APIC_ENT0_VEC;
ent0 |= apic_get_int_ent0(sc, line);
#if 0
Index: src/sys/arch/hp700/dev/asp.c
diff -u src/sys/arch/hp700/dev/asp.c:1.15 src/sys/arch/hp700/dev/asp.c:1.16
--- src/sys/arch/hp700/dev/asp.c:1.15 Tue Nov 3 05:07:25 2009
+++ src/sys/arch/hp700/dev/asp.c Sun Dec 5 12:19:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: asp.c,v 1.15 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: asp.c,v 1.16 2010/12/05 12:19:09 skrll Exp $ */
/* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.15 2009/11/03 05:07:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.16 2010/12/05 12:19:09 skrll Exp $");
#include
#include
@@ -246,6 +246,7 @@
/* Establish the interrupt register. */
hp700_intr_reg_establish(&sc->sc_int_reg);
+ sc->sc_int_reg.int_reg_name = device_xname(self);
sc->sc_int_reg.int_reg_mask = &sc->sc_trs->asp_imr;
sc->sc_int_reg.int_reg_req = &sc->sc_trs->asp_irr;
Index: src/sys/arch/hp700/dev/lasi.c
diff -u src/sys/arch/hp700/dev/lasi.c:1.15 src/sys/arch/hp700/dev/lasi.c:1.16
--- src/sys/arch/hp700/dev/lasi.c:1.15 Tue Nov 3 05:07:25 2009
+++ src/sys/arch/hp700/dev/lasi.c Sun Dec 5 12:19:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lasi.c,v 1.15 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: lasi.c,v 1.16 2010/12/05 12:19:09 skrll Exp $ */
/* $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.15 2009/11/03 05:07:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.16 2010/12/05 12:19:09 skrll Exp $");
#undef LASIDEBUG
@@ -190,6 +190,7 @@
/* Establish the interrupt register. */
hp700_intr_reg_establish(&sc->sc_int_reg);
+ sc->sc_int_reg.int_reg_name = device_xname(self);
sc->sc_int_reg.int_reg_mask = &sc->sc_trs->lasi_imr;
sc->sc_int_reg.int_reg_req = &sc->sc_trs->lasi_irr;
Index: src/sys/arch/hp700/dev/wax.c
diff -u src/sys/arch/hp700/dev/wax.c:1.15 src/sys/arch/hp700/dev/wax.c:1.16
--- src/sys/arch/hp700/dev/wax.c:1.15 Wed Feb 10 20:33:27 2010
+++ src/sys/arch/hp700/dev/wax.c Sun Dec 5 12:19:0
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Sun Dec 5 10:47:23 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: intr.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hp700/hp700/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/intr.c
diff -u src/sys/arch/hp700/hp700/intr.c:1.28 src/sys/arch/hp700/hp700/intr.c:1.29
--- src/sys/arch/hp700/hp700/intr.c:1.28 Sun Dec 5 10:27:50 2010
+++ src/sys/arch/hp700/hp700/intr.c Sun Dec 5 10:47:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.28 2010/12/05 10:27:50 skrll Exp $ */
+/* $NetBSD: intr.c,v 1.29 2010/12/05 10:47:22 skrll Exp $ */
/* $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.28 2010/12/05 10:27:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.29 2010/12/05 10:47:22 skrll Exp $");
#define __MUTEX_PRIVATE
@@ -190,7 +190,7 @@
panic("hp700_intr_establish: unknown int reg");
int_reg->int_reg_bits_map[31 ^ bit_pos] =
(INT_REG_BIT_REG | idx);
- return (NULL);
+ return NULL;
}
/*
@@ -215,7 +215,7 @@
int_bit->int_bit_handler = handler;
int_bit->int_bit_arg = arg;
- return (int_bit);
+ return int_bit;
}
/*
@@ -234,7 +234,7 @@
break;
if (bit_pos >= 0)
int_reg->int_reg_allocatable_bits &= ~mask;
- return (bit_pos);
+ return bit_pos;
}
/*
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Sun Dec 5 10:27:50 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: intr.c intr.h
Log Message:
G/C unused _hp700_intr_spl_mask
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hp700/hp700/intr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp700/hp700/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/intr.c
diff -u src/sys/arch/hp700/hp700/intr.c:1.27 src/sys/arch/hp700/hp700/intr.c:1.28
--- src/sys/arch/hp700/hp700/intr.c:1.27 Sun Dec 5 10:11:46 2010
+++ src/sys/arch/hp700/hp700/intr.c Sun Dec 5 10:27:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.27 2010/12/05 10:11:46 skrll Exp $ */
+/* $NetBSD: intr.c,v 1.28 2010/12/05 10:27:50 skrll Exp $ */
/* $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.27 2010/12/05 10:11:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.28 2010/12/05 10:27:50 skrll Exp $");
#define __MUTEX_PRIVATE
@@ -254,17 +254,6 @@
}
/*
- * This return the single-bit spl mask for an interrupt. This can only be
- * called immediately after hp700_intr_establish, and is not intended for wide
- * use.
- */
-int
-_hp700_intr_spl_mask(void *_int_bit)
-{
- return ((struct hp700_int_bit *) _int_bit)->int_bit_spl;
-}
-
-/*
* This finally initializes interrupts.
*/
void
Index: src/sys/arch/hp700/hp700/intr.h
diff -u src/sys/arch/hp700/hp700/intr.h:1.11 src/sys/arch/hp700/hp700/intr.h:1.12
--- src/sys/arch/hp700/hp700/intr.h:1.11 Sun Dec 5 10:21:18 2010
+++ src/sys/arch/hp700/hp700/intr.h Sun Dec 5 10:27:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.11 2010/12/05 10:21:18 skrll Exp $ */
+/* $NetBSD: intr.h,v 1.12 2010/12/05 10:27:50 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -88,6 +88,5 @@
struct hp700_int_reg *, int);
int hp700_intr_allocate_bit(struct hp700_int_reg *);
int _hp700_intr_ipl_next(void);
-int _hp700_intr_spl_mask(void *);
void hp700_intr_init(void);
void hp700_intr_dispatch(int, int, struct trapframe *);
CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Sun Dec 5 10:21:18 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: intr.h Log Message: Reformat/Improve comment. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp700/hp700/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/hp700/intr.h diff -u src/sys/arch/hp700/hp700/intr.h:1.10 src/sys/arch/hp700/hp700/intr.h:1.11 --- src/sys/arch/hp700/hp700/intr.h:1.10 Fri May 8 09:33:58 2009 +++ src/sys/arch/hp700/hp700/intr.h Sun Dec 5 10:21:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.10 2009/05/08 09:33:58 skrll Exp $ */ +/* $NetBSD: intr.h,v 1.11 2010/12/05 10:21:18 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -56,22 +56,20 @@ volatile int *int_reg_level; /* - * This array has one entry for each bit in the - * interrupt request register. If the 24 most - * significant bits are set, the low 8 - * bits are the index of the hp700_int_reg - * that this interrupt bit leads to, with zero - * meaning that the interrupt bit is unused. - * Otherwise this bits correspond to the - * hp700_int_bits. I.e. this bits are ored to - * ipending_new in hp700_intr_ipending_new() - * when an interrupt happend. + * This array has one entry for each bit in the interrupt request + * register. * - * Note that this array is indexed by HP bit - * number, *not* by "normal" bit number. In - * other words, the least significant bit in - * the interrupt register corresponds to array - * index 31. + * If the 24 most significant bits are set, the low 8 bits are the + * index of the hp700_int_reg that this interrupt bit leads to, with + * zero meaning that the interrupt bit is unused. + * + * Otherwise these bits correspond to hp700_int_bits. That is, these + * bits are ORed to ipending_new in hp700_intr_ipending_new() when an + * interrupt happens. + * + * Note that this array is indexed by HP bit number, *not* by "normal" + * bit number. In other words, the least significant bit in the inter- + * rupt register corresponds to array index 31. */ unsigned int int_reg_bits_map[HP700_INT_BITS]; #define INT_REG_BIT_REG 0xff00
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Sun Dec 5 10:11:46 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: intr.c
Log Message:
Reformat comments.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hp700/hp700/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/intr.c
diff -u src/sys/arch/hp700/hp700/intr.c:1.26 src/sys/arch/hp700/hp700/intr.c:1.27
--- src/sys/arch/hp700/hp700/intr.c:1.26 Wed Jul 7 01:18:39 2010
+++ src/sys/arch/hp700/hp700/intr.c Sun Dec 5 10:11:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.26 2010/07/07 01:18:39 chs Exp $ */
+/* $NetBSD: intr.c,v 1.27 2010/12/05 10:11:46 skrll Exp $ */
/* $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.26 2010/07/07 01:18:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.27 2010/12/05 10:11:46 skrll Exp $");
#define __MUTEX_PRIVATE
@@ -171,16 +171,16 @@
panic("%s: bad interrupt bit %d", __func__, bit_pos);
/*
- * Panic if this int bit is already handled,
- * but allow shared interrupts for PCI.
+ * Panic if this int bit is already handled, but allow shared
+ * interrupts for PCI.
*/
if (int_reg->int_reg_bits_map[31 ^ bit_pos] != INT_REG_BIT_UNUSED
&& strncmp(device_xname(dv), "dino", 4) != 0 && handler == NULL)
panic("hp700_intr_establish: int already handled");
/*
- * If this interrupt bit leads us to another interrupt
- * register, simply note that in the mapping for the bit.
+ * If this interrupt bit leads us to another interrupt register,
+ * simply note that in the mapping for the bit.
*/
if (handler == NULL) {
for (idx = 0; idx < HP700_INT_BITS; idx++)
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Dec 5 09:54:34 UTC 2010
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch ofppc to xorg.
To generate a diff of this commit:
cvs rdiff -u -r1.644 -r1.645 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.644 src/share/mk/bsd.own.mk:1.645
--- src/share/mk/bsd.own.mk:1.644 Sun Nov 28 18:44:13 2010
+++ src/share/mk/bsd.own.mk Sun Dec 5 09:54:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.644 2010/11/28 18:44:13 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.645 2010/12/05 09:54:34 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -753,7 +753,6 @@
${MACHINE} == "ews4800mips" || \
${MACHINE} == "mac68k" || \
${MACHINE} == "newsmips" || \
-${MACHINE} == "ofppc" || \
${MACHINE} == "pmax" || \
${MACHINE} == "sun3" || \
${MACHINE} == "x68k"
CVS commit: src/sys/net
Module Name:src
Committed By: mrg
Date: Sun Dec 5 09:42:21 UTC 2010
Modified Files:
src/sys/net: bpf_filter.c
Log Message:
consider BPF_ABS, BPF_IND and BPF_MSH as they used to be in rev 1.37.
this fixes dhclient, and i'm told dhcpcd as well.
this patch from sk...@netbsd.org, tested by me.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/net/bpf_filter.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.39 src/sys/net/bpf_filter.c:1.40
--- src/sys/net/bpf_filter.c:1.39 Sun Dec 5 08:45:46 2010
+++ src/sys/net/bpf_filter.c Sun Dec 5 09:42:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.39 2010/12/05 08:45:46 mrg Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.40 2010/12/05 09:42:20 mrg Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.39 2010/12/05 08:45:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.40 2010/12/05 09:42:20 mrg Exp $");
#if 0
#if !(defined(lint) || defined(KERNEL))
@@ -484,11 +484,7 @@
case BPF_LD:
case BPF_LDX:
switch (BPF_MODE(p->code)) {
- case BPF_IMM:
-break;
- case BPF_ABS:
- case BPF_IND:
- case BPF_MSH:
+ case BPF_MEM:
/*
* There's no maximum packet data size
* in userland. The runtime packet length
@@ -503,10 +499,10 @@
return 0;
#endif
break;
- case BPF_MEM:
-if (p->k >= BPF_MEMWORDS)
- return 0;
-break;
+ case BPF_ABS:
+ case BPF_IND:
+ case BPF_MSH:
+ case BPF_IMM:
case BPF_LEN:
break;
default:
CVS commit: src/external/bsd/libpcap/bin
Module Name:src
Committed By: mrg
Date: Sun Dec 5 09:09:39 UTC 2010
Modified Files:
src/external/bsd/libpcap/bin: Makefile
Log Message:
- use SCRIPTS* for scripts instead of FILES*.
- add pcap-config to CLEANFILES.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/bin/Makefile
diff -u src/external/bsd/libpcap/bin/Makefile:1.1 src/external/bsd/libpcap/bin/Makefile:1.2
--- src/external/bsd/libpcap/bin/Makefile:1.1 Sun Dec 5 03:00:44 2010
+++ src/external/bsd/libpcap/bin/Makefile Sun Dec 5 09:09:39 2010
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2010/12/05 03:00:44 christos Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 09:09:39 mrg Exp $
.include
.PATH: ${.CURDIR}/../dist
-FILESDIR=/usr/bin
-FILESMODE=555
-FILES=pcap-config
+SCRIPTSDIR=/usr/bin
+SCRIPTS=pcap-config
+
MAN=pcap-config.1
pcap-config: pcap-config.in
@@ -15,7 +15,9 @@
-e 's,@includedir@,/usr/include,g' \
-e 's,@LIBS@,,g' < ${.ALLSRC} > ${.TARGET}
chmod a+x ${.TARGET}
-
-.include
-.include
+CLEANFILES+= pcap-config
+
+NOPROG=
+
+.include
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Dec 5 09:02:28 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi Log Message: fix some set lists issues after the recent bpf and pcap updates. To generate a diff of this commit: cvs rdiff -u -r1.892 -r1.893 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1259 -r1.1260 src/distrib/sets/lists/man/mi 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/mi diff -u src/distrib/sets/lists/base/mi:1.892 src/distrib/sets/lists/base/mi:1.893 --- src/distrib/sets/lists/base/mi:1.892 Sun Dec 5 06:02:28 2010 +++ src/distrib/sets/lists/base/mi Sun Dec 5 09:02:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.892 2010/12/05 06:02:28 christos Exp $ +# $NetBSD: mi,v 1.893 2010/12/05 09:02:28 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -820,6 +820,7 @@ ./usr/include/objcbase-objc-usr ./usr/include/openpgpsdk base-obsolete obsolete ./usr/include/opensslbase-c-usr +./usr/include/pcapbase-c-usr ./usr/include/propbase-c-usr ./usr/include/protocolsbase-c-usr ./usr/include/readlinebase-c-usr Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1259 src/distrib/sets/lists/man/mi:1.1260 --- src/distrib/sets/lists/man/mi:1.1259 Sun Dec 5 06:02:29 2010 +++ src/distrib/sets/lists/man/mi Sun Dec 5 09:02:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1259 2010/12/05 06:02:29 christos Exp $ +# $NetBSD: mi,v 1.1260 2010/12/05 09:02:28 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -374,6 +374,7 @@ ./usr/share/man/cat1/pawd.0 man-amd-catman .cat ./usr/share/man/cat1/pax.0 man-util-catman .cat ./usr/share/man/cat1/paxctl.0 man-obsolete obsolete +./usr/share/man/cat1/pcap-config.0 man-util-catman .cat ./usr/share/man/cat1/pcc.0 man-util-catman pcccmds,.cat ./usr/share/man/cat1/pcpp.0 man-util-catman pcccmds,.cat ./usr/share/man/cat1/pgrep.0 man-util-catman .cat @@ -1887,6 +1888,7 @@ ./usr/share/man/cat5/pam.conf.0 man-sys-catman .cat ./usr/share/man/cat5/passwd.0 man-sys-catman .cat ./usr/share/man/cat5/passwd.conf.0 man-sys-catman .cat +./usr/share/man/cat5/pcap-savefile.0 man-net-catman .cat ./usr/share/man/cat5/pcfs.0 man-obsolete obsolete ./usr/share/man/cat5/pcre_table.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/pf.boot.conf.0 man-pf-catman pf,.cat @@ -1976,6 +1978,8 @@ ./usr/share/man/cat7/nls.0 man-reference-catman .cat ./usr/share/man/cat7/orders.0 man-reference-catman .cat ./usr/share/man/cat7/packages.0 man-obsolete obsolete +./usr/share/man/cat7/pcap-filter.0 man-netutil-catman .cat +./usr/share/man/cat7/pcap-linktype.0 man-netutil-catman .cat ./usr/share/man/cat7/pkgsrc.0 man-reference-catman .cat ./usr/share/man/cat7/re_format.0 man-reference-catman .cat ./usr/share/man/cat7/release.0 man-reference-catman .cat @@ -3149,6 +3153,7 @@ ./usr/share/man/html1/pathchk.html man-util-htmlman html ./usr/share/man/html1/pawd.html man-amd-htmlman html ./usr/share/man/html1/pax.html man-util-htmlman html +./usr/share/man/html1/pcap-config.html man-util-htmlman html ./usr/share/man/html1/pcc.html man-util-htmlman pcccmds,html ./usr/share/man/html1/pcpp.html man-util-htmlman pcccmds,html ./usr/share/man/html1/pgrep.html man-util-htmlman html @@ -4510,6 +4515,7 @@ ./usr/share/man/html5/pam.conf.html man-sys-htmlman html ./usr/share/man/html5/passwd.html man-sys-htmlman html ./usr/share/man/html5/passwd.conf.html man-sys-htmlman html +./usr/share/man/html5/pcap-savefile.html man-sys-htmlman html ./usr/share/man/html5/pcre_table.html man-postfix-htmlman postfix,html ./usr/share/man/html5/pf.boot.conf.html man-pf-htmlman pf,html ./usr/share/man/html5/pf.conf.html man-pf-htmlman pf,html @@ -4584,6 +4590,8 @@ ./usr/share/man/html7/mdoc.html man-groff-htmlman html,groff ./usr/share/man/html7/nls.html man-reference-htmlman html ./usr/share/man/html7/orders.html man-reference-htmlman html +./usr/share/man/html7/pcap-filter.html man-netutil-htmlman html +./usr/share/man/html7/pcap-linktype.html man-netutil-htmlman html ./usr/share/man/html7/pkgsrc.html man-reference-htmlman html ./usr/share/man/html7/re_format.html man-reference-htmlman html ./usr/share/man/html7/release.html man-reference-htmlman html @@ -7088,6 +7096,7 @@ ./usr/share/man/man5/pam.conf.5 man-sys-man .man ./usr/share/man/man5/passwd.5 man-sys-man .man ./usr/share/man/man5/passwd.conf.5 man-sys-man .man +./usr/share/man/man5/pcap-savefile.5 man-netutil-man .man ./usr/share/man/man5/pcfs.5 man-obsolete obsolete ./usr/share/man/man5/pcre_table.5 man-postfix-man postfix,.man ./usr/share/man/man5/pf.boot.conf.5 man-pf-man pf,.man @@ -7176
CVS commit: src/sys/net
Module Name:src
Committed By: mrg
Date: Sun Dec 5 08:45:46 UTC 2010
Modified Files:
src/sys/net: bpf_filter.c
Log Message:
apply the smallest hack to allow this to build without warnings again.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/net/bpf_filter.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.38 src/sys/net/bpf_filter.c:1.39
--- src/sys/net/bpf_filter.c:1.38 Sun Dec 5 02:40:40 2010
+++ src/sys/net/bpf_filter.c Sun Dec 5 08:45:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.38 2010/12/05 02:40:40 christos Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.39 2010/12/05 08:45:46 mrg Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.38 2010/12/05 02:40:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.39 2010/12/05 08:45:46 mrg Exp $");
#if 0
#if !(defined(lint) || defined(KERNEL))
@@ -462,11 +462,12 @@
* Otherwise, a bogus program could easily crash the system.
*/
int
-bpf_validate(const struct bpf_insn *f, int len)
+bpf_validate(const struct bpf_insn *f, int signed_len)
{
- u_int i, from;
+ u_int i, from, len;
const struct bpf_insn *p;
+ len = (u_int)signed_len;
if (len < 1)
return 0;
#if defined(KERNEL) || defined(_KERNEL)
CVS commit: src/external/bsd/wpa/dist/src/l2_packet
Module Name:src Committed By: mrg Date: Sun Dec 5 08:43:24 UTC 2010 Modified Files: src/external/bsd/wpa/dist/src/l2_packet: l2_packet_freebsd.c Log Message: netbsd needs net/bpf.h, too. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.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/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c diff -u src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c:1.1.1.1 src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c:1.2 --- src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c:1.1.1.1 Wed Aug 4 10:20:22 2010 +++ src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c Sun Dec 5 08:43:23 2010 @@ -14,7 +14,7 @@ */ #include "includes.h" -#if defined(__APPLE__) || defined(__GLIBC__) +#if defined(__APPLE__) || defined(__GLIBC__) || defined(__NetBSD__) #include #endif /* __APPLE__ */ #include
