CVS commit: src/sys/net
Module Name:src
Committed By: kefren
Date: Fri Jun 17 09:15:24 UTC 2011
Modified Files:
src/sys/net: if_loop.c if_mpls.c
Log Message:
teach loopback about MPLS. Prerequisite for MPLS tunnels
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/net/if_loop.c
cvs rdiff -u -r1.4 -r1.5 src/sys/net/if_mpls.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/if_loop.c
diff -u src/sys/net/if_loop.c:1.73 src/sys/net/if_loop.c:1.74
--- src/sys/net/if_loop.c:1.73 Mon Apr 25 22:20:59 2011
+++ src/sys/net/if_loop.c Fri Jun 17 09:15:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_loop.c,v 1.73 2011/04/25 22:20:59 yamt Exp $ */
+/* $NetBSD: if_loop.c,v 1.74 2011/06/17 09:15:24 kefren Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,13 +65,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_loop.c,v 1.73 2011/04/25 22:20:59 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_loop.c,v 1.74 2011/06/17 09:15:24 kefren Exp $);
#include opt_inet.h
#include opt_atalk.h
#include opt_iso.h
#include opt_ipx.h
#include opt_mbuftrace.h
+#include opt_mpls.h
#include sys/param.h
@@ -117,6 +118,11 @@
#include netiso/iso_var.h
#endif
+#ifdef MPLS
+#include netmpls/mpls.h
+#include netmpls/mpls_var.h
+#endif
+
#ifdef NETATALK
#include netatalk/at.h
#include netatalk/at_var.h
@@ -314,6 +320,18 @@
m_freem(m);
return (EAFNOSUPPORT);
}
+#ifdef MPLS
+ if (rt != NULL rt_gettag(rt) != NULL
+ rt_gettag(rt)-sa_family == AF_MPLS
+ (m-m_flags (M_MCAST | M_BCAST)) == 0) {
+ union mpls_shim msh;
+ msh.s_addr = MPLS_GETSADDR(rt);
+ if (msh.shim.label != MPLS_LABEL_IMPLNULL) {
+ ifq = mplsintrq;
+ isr = NETISR_MPLS;
+ }
+ }
+#endif
s = splnet();
if (IF_QFULL(ifq)) {
IF_DROP(ifq);
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.4 src/sys/net/if_mpls.c:1.5
--- src/sys/net/if_mpls.c:1.4 Thu Jun 16 19:47:31 2011
+++ src/sys/net/if_mpls.c Fri Jun 17 09:15:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.4 2011/06/16 19:47:31 kefren Exp $ */
+/* $NetBSD: if_mpls.c,v 1.5 2011/06/17 09:15:24 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.4 2011/06/16 19:47:31 kefren Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.5 2011/06/17 09:15:24 kefren Exp $);
#include opt_inet.h
#include opt_mpls.h
@@ -396,11 +396,11 @@
}
switch(ifp-if_type) {
- /* only these two are supported for now */
+ /* only these are supported for now */
case IFT_ETHER:
case IFT_TUNNEL:
- return (*ifp-if_output)(ifp, m, rt-rt_gateway, rt);
case IFT_LOOP:
+ return (*ifp-if_output)(ifp, m, rt-rt_gateway, rt);
break;
default:
return ENETUNREACH;
CVS commit: src/sys/uvm
Module Name:src
Committed By: hannken
Date: Fri Jun 17 09:50:52 UTC 2011
Modified Files:
src/sys/uvm: uvm_bio.c
Log Message:
When ubc_alloc() reuses a cached mapping window remove the object from
the lists AFTER clearing its mapping.
Removes a race where uvm_obj_destroy() sees an empty uo_ubc list and
destroys the object before ubc_alloc() gets the objects lock to clear
the mapping.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.74 src/sys/uvm/uvm_bio.c:1.75
--- src/sys/uvm/uvm_bio.c:1.74 Thu Jun 16 09:21:03 2011
+++ src/sys/uvm/uvm_bio.c Fri Jun 17 09:50:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.74 2011/06/16 09:21:03 hannken Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.75 2011/06/17 09:50:52 hannken Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.74 2011/06/16 09:21:03 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.75 2011/06/17 09:50:52 hannken Exp $);
#include opt_uvmhist.h
#include opt_ubc.h
@@ -507,8 +507,6 @@
*/
if (oobj != NULL) {
- LIST_REMOVE(umap, hash);
- LIST_REMOVE(umap, list);
if (umap-flags UMAP_MAPPING_CACHED) {
umap-flags = ~UMAP_MAPPING_CACHED;
mutex_enter(oobj-vmobjlock);
@@ -517,6 +515,8 @@
pmap_update(pmap_kernel());
mutex_exit(oobj-vmobjlock);
}
+ LIST_REMOVE(umap, hash);
+ LIST_REMOVE(umap, list);
} else {
KASSERT((umap-flags UMAP_MAPPING_CACHED) == 0);
}
CVS commit: src
Module Name:src
Committed By: manu
Date: Fri Jun 17 14:23:52 UTC 2011
Modified Files:
src/include: mntopts.h
src/lib/libc/sys: mount.2
src/sbin/mount: mount.8
src/sbin/mount_ffs: mount_ffs.c
src/share/man/man4: options.4
src/sys/kern: vfs_syscalls.c
src/sys/sys: extattr.h fstypes.h statvfs.h
src/sys/ufs/ffs: ffs_extern.h ffs_vfsops.c
src/sys/ufs/ufs: extattr.h ufs_extattr.c
src/usr.sbin/extattrctl: extattrctl.8
Log Message:
Add mount -o extattr option to enable extended attributs (corrently only
for UFS1).
Remove kernel option for EA backing store autocreation and do it by
default. Add a sysctl so that autocreated attriutr size can be modified.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/include/mntopts.h
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/sys/mount.2
cvs rdiff -u -r1.70 -r1.71 src/sbin/mount/mount.8
cvs rdiff -u -r1.25 -r1.26 src/sbin/mount_ffs/mount_ffs.c
cvs rdiff -u -r1.406 -r1.407 src/share/man/man4/options.4
cvs rdiff -u -r1.429 -r1.430 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/extattr.h
cvs rdiff -u -r1.28 -r1.29 src/sys/sys/fstypes.h
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/statvfs.h
cvs rdiff -u -r1.77 -r1.78 src/sys/ufs/ffs/ffs_extern.h
cvs rdiff -u -r1.267 -r1.268 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/ufs/extattr.h
cvs rdiff -u -r1.31 -r1.32 src/sys/ufs/ufs/ufs_extattr.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/extattrctl/extattrctl.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/mntopts.h
diff -u src/include/mntopts.h:1.13 src/include/mntopts.h:1.14
--- src/include/mntopts.h:1.13 Mon Jan 12 18:14:20 2009
+++ src/include/mntopts.h Fri Jun 17 14:23:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mntopts.h,v 1.13 2009/01/12 18:14:20 pooka Exp $ */
+/* $NetBSD: mntopts.h,v 1.14 2011/06/17 14:23:50 manu Exp $ */
/*-
* Copyright (c) 1994
@@ -57,6 +57,7 @@
#define MOPT_SOFTDEP { softdep, 0, MNT_SOFTDEP, 0 }
#define MOPT_LOG { log, 0, MNT_LOG, 0 }
#define MOPT_IGNORE { hidden, 0, MNT_IGNORE, 0 }
+#define MOPT_EXTATTR { extattr, 0, MNT_EXTATTR, 0 }
/* Control flags. */
#define MOPT_FORCE { force, 0, MNT_FORCE, 0 }
Index: src/lib/libc/sys/mount.2
diff -u src/lib/libc/sys/mount.2:1.45 src/lib/libc/sys/mount.2:1.46
--- src/lib/libc/sys/mount.2:1.45 Mon May 31 12:16:20 2010
+++ src/lib/libc/sys/mount.2 Fri Jun 17 14:23:50 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: mount.2,v 1.45 2010/05/31 12:16:20 njoly Exp $
+.\ $NetBSD: mount.2,v 1.46 2011/06/17 14:23:50 manu Exp $
.\
.\ Copyright (c) 1980, 1989, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -119,6 +119,9 @@
filesystem, creating a record of meta-data writes to be
performed, allowing the actual writes to be deferred.
This improves performance in most cases.
+.It MNT_EXTATTR
+Enable extended attributes, if the filesystem supports them and do not enable
+them by default. Currently this is only the case for UFS1.
.El
.Pp
The
Index: src/sbin/mount/mount.8
diff -u src/sbin/mount/mount.8:1.70 src/sbin/mount/mount.8:1.71
--- src/sbin/mount/mount.8:1.70 Sun Nov 21 18:33:08 2010
+++ src/sbin/mount/mount.8 Fri Jun 17 14:23:51 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: mount.8,v 1.70 2010/11/21 18:33:08 pooka Exp $
+.\ $NetBSD: mount.8,v 1.71 2011/06/17 14:23:51 manu Exp $
.\
.\ Copyright (c) 1980, 1989, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -190,6 +190,9 @@
Clear
.Cm async
mode.
+.It Cm extattr
+Enable extended attributes, if the filesystem supports them and do not enable
+them by default. Currently this is only the case for UFS1.
.It Cm force
The same as
.Fl f ;
Index: src/sbin/mount_ffs/mount_ffs.c
diff -u src/sbin/mount_ffs/mount_ffs.c:1.25 src/sbin/mount_ffs/mount_ffs.c:1.26
--- src/sbin/mount_ffs/mount_ffs.c:1.25 Tue Aug 5 20:57:45 2008
+++ src/sbin/mount_ffs/mount_ffs.c Fri Jun 17 14:23:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_ffs.c,v 1.25 2008/08/05 20:57:45 pooka Exp $ */
+/* $NetBSD: mount_ffs.c,v 1.26 2011/06/17 14:23:51 manu Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)mount_ufs.c 8.4 (Berkeley) 4/26/95;
#else
-__RCSID($NetBSD: mount_ffs.c,v 1.25 2008/08/05 20:57:45 pooka Exp $);
+__RCSID($NetBSD: mount_ffs.c,v 1.26 2011/06/17 14:23:51 manu Exp $);
#endif
#endif /* not lint */
@@ -74,6 +74,7 @@
MOPT_SOFTDEP,
MOPT_LOG,
MOPT_GETARGS,
+ MOPT_EXTATTR,
MOPT_NULL,
};
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.406 src/share/man/man4/options.4:1.407
--- src/share/man/man4/options.4:1.406 Tue Jun 7 20:23:14 2011
+++ src/share/man/man4/options.4 Fri Jun 17 14:23:51 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: options.4,v 1.406 2011/06/07 20:23:14 wiz Exp $
+.\ $NetBSD: options.4,v 1.407 2011/06/17 14:23:51 manu
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: christos Date: Fri Jun 17 16:30:30 UTC 2011 Added Files: src/tests/lib/libcurses: Makefile.inc Log Message: turn on warnings To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tests/lib/libcurses/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/tests/lib/libcurses/Makefile.inc diff -u /dev/null src/tests/lib/libcurses/Makefile.inc:1.1 --- /dev/null Fri Jun 17 12:30:30 2011 +++ src/tests/lib/libcurses/Makefile.inc Fri Jun 17 12:30:30 2011 @@ -0,0 +1 @@ +.include ../Makefile.inc
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: christos Date: Fri Jun 17 16:30:58 UTC 2011 Modified Files: src/tests/lib/libcurses: t_curses.sh Log Message: turn off verbose To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/t_curses.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libcurses/t_curses.sh diff -u src/tests/lib/libcurses/t_curses.sh:1.2 src/tests/lib/libcurses/t_curses.sh:1.3 --- src/tests/lib/libcurses/t_curses.sh:1.2 Thu Jun 16 22:15:28 2011 +++ src/tests/lib/libcurses/t_curses.sh Fri Jun 17 12:30:58 2011 @@ -10,7 +10,6 @@ $(atf_get_srcdir)/director \ -T $(atf_get_srcdir) \ - -v \ -t atf \ -I $(atf_get_srcdir)/tests \ -C $(atf_get_srcdir)/check_files \
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: christos
Date: Fri Jun 17 16:32:31 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: testlang_parse.y
Log Message:
vis'ify the excess byte printing so that xstlproc does not barf.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libcurses/director/testlang_parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.5 src/tests/lib/libcurses/director/testlang_parse.y:1.6
--- src/tests/lib/libcurses/director/testlang_parse.y:1.5 Thu Jun 16 22:15:28 2011
+++ src/tests/lib/libcurses/director/testlang_parse.y Fri Jun 17 12:32:31 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.5 2011/06/17 02:15:28 christos Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.6 2011/06/17 16:32:31 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -40,6 +40,7 @@
#include string.h
#include sys/syslimits.h
#include time.h
+#include vis.h
#include returns.h
#define YYDEBUG 1
@@ -413,6 +414,24 @@
%%
+static void
+excess(const char *fname, size_t lineno, const char *func, const char *comment,
+const void *data, size_t datalen)
+{
+ size_t dstlen = datalen * 4 + 1;
+ char *dst = malloc(dstlen);
+
+ if (dst == NULL)
+ err(1, malloc);
+
+ if (strnvisx(dst, dstlen, data, datalen, VIS_WHITE | VIS_OCTAL) == -1)
+ err(1, strnvisx);
+
+ warnx(%s, %zu: [%s] Excess %zu bytes%s [%s],
+ fname, lineno, func, datalen, comment, dst);
+ free(dst);
+}
+
/*
* Get the value of a variable, error if the variable has not been set or
* is not a numeric type.
@@ -752,10 +771,8 @@
if (saved_output.count 0)
- warnx(%s, %zu: [%s] Excess %zu bytes from slave [%.*s],
- cur_file, line, __func__, saved_output.count,
- (int)saved_output.count,
- saved_output.data[saved_output.readp]);
+ excess(cur_file, line, __func__, from slave,
+ saved_output.data[saved_output.readp], saved_output.count);
/* discard any excess saved output if required */
if (discard) {
@@ -784,8 +801,8 @@
err(1, read of data file failed);
if (result 0) {
-warnx(%s: Excess %zd bytes [%.*s],
-check_file, result, (int)result, drain);
+excess(check_file, 0, __func__, , drain,
+result);
if (!verbose)
exit(2);
}
@@ -951,10 +968,8 @@
}
#if 0
if (saved_output.count 0)
- warnx(%s, %zu: [%s] Excess %zu bytes from slave [%.*s],
- cur_file, line, __func__, saved_output.count,
- (int)saved_output.count,
- saved_output.data[saved_output.readp]);
+ excess(cur_file, line, __func__, from slave,
+ saved_output.data[saved_output.readp], saved_output.count);
#endif
init_parse_variables(0);
CVS commit: src/tests/lib/libcurses
Module Name:src
Committed By: christos
Date: Fri Jun 17 16:59:51 UTC 2011
Modified Files:
src/tests/lib/libcurses: Makefile t_curses.sh
src/tests/lib/libcurses/director: director.c
Log Message:
Remove environment variable settings.
Now that we are not abusing $HOME to get to the terminfo db, make it visible.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/t_curses.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libcurses/director/director.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/lib/libcurses/Makefile
diff -u src/tests/lib/libcurses/Makefile:1.1 src/tests/lib/libcurses/Makefile:1.2
--- src/tests/lib/libcurses/Makefile:1.1 Sun Apr 10 05:55:08 2011
+++ src/tests/lib/libcurses/Makefile Fri Jun 17 12:59:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/10 09:55:08 blymn Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/17 16:59:51 christos Exp $
NOMAN= # defined
@@ -9,7 +9,7 @@
TESTSDIR= ${TESTSBASE}/lib/libcurses
TEST_TERMINFO= atf.terminfo
-TERMINFO_DB= .terminfo
+TERMINFO_DB= terminfo
TERMINFODIR= ${TESTSDIR}
FILESDIR= ${TESTSDIR}
Index: src/tests/lib/libcurses/t_curses.sh
diff -u src/tests/lib/libcurses/t_curses.sh:1.3 src/tests/lib/libcurses/t_curses.sh:1.4
--- src/tests/lib/libcurses/t_curses.sh:1.3 Fri Jun 17 12:30:58 2011
+++ src/tests/lib/libcurses/t_curses.sh Fri Jun 17 12:59:51 2011
@@ -3,11 +3,6 @@
{
file=$(atf_get_srcdir)/tests/${1}
- HOME=$(atf_get_srcdir)
- CHECK_PATH=
- INCLUDE_PATH=$(atf_get_srcdir)/tests
- export CHECK_PATH INCLUDE_PATH HOME
-
$(atf_get_srcdir)/director \
-T $(atf_get_srcdir) \
-t atf \
Index: src/tests/lib/libcurses/director/director.c
diff -u src/tests/lib/libcurses/director/director.c:1.6 src/tests/lib/libcurses/director/director.c:1.7
--- src/tests/lib/libcurses/director/director.c:1.6 Thu Jun 16 22:15:28 2011
+++ src/tests/lib/libcurses/director/director.c Fri Jun 17 12:59:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: director.c,v 1.6 2011/06/17 02:15:28 christos Exp $ */
+/* $NetBSD: director.c,v 1.7 2011/06/17 16:59:51 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -199,16 +199,14 @@
if (S_ISDIR(st.st_mode)) {
char tinfo[MAXPATHLEN];
- snprintf(tinfo, sizeof(tinfo), %s/%s, termpath,
- .terminfo.db);
- if (stat(tinfo, st) == -1) {
- snprintf(tinfo, sizeof(tinfo), %s/%s, termpath,
- terminfo.db);
- if (stat(tinfo, st) == -1)
-err(1, Cannot stat `%s/%s' or `%s/%s',
-termpath, terminfo.db, termpath,
-.terminfo.db);
- }
+ int l = snprintf(tinfo, sizeof(tinfo), %s/%s, termpath,
+ terminfo.db);
+ if (stat(tinfo, st) == -1)
+ err(1, Cannot stat `%s', tinfo);
+ if (l = 3)
+ tinfo[l - 3] = '\0';
+ if (setenv(TERMINFO, tinfo, 1) != 0)
+ err(1, Failed to set TERMINFO variable);
} else {
int fd;
char *tinfo;
@@ -218,7 +216,7 @@
fd, 0)) == MAP_FAILED)
err(1, Cannot map `%s', termpath);
if (setenv(TERMINFO, tinfo, 1) != 0)
- err(2, Failed to set TERMINFO variable);
+ err(1, Failed to set TERMINFO variable);
close(fd);
munmap(tinfo, (size_t)st.st_size);
}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Fri Jun 17 17:00:58 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: terminfo has moved. To generate a diff of this commit: cvs rdiff -u -r1.352 -r1.353 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.352 src/distrib/sets/lists/tests/mi:1.353 --- src/distrib/sets/lists/tests/mi:1.352 Tue Jun 14 01:25:20 2011 +++ src/distrib/sets/lists/tests/mi Fri Jun 17 13:00:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.352 2011/06/14 05:25:20 jruoho Exp $ +# $NetBSD: mi,v 1.353 2011/06/17 17:00:58 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2011,7 +2011,8 @@ ./usr/tests/lib/libc/t_strptime tests-obsolete obsolete ./usr/tests/lib/libc/time tests-lib-tests ./usr/tests/lib/libcurses tests-lib-tests -./usr/tests/lib/libcurses/.terminfo.db tests-lib-tests atf +./usr/tests/lib/libcurses/.terminfo.db tests-obsolete obsolete +./usr/tests/lib/libcurses/terminfo.db tests-lib-tests atf ./usr/tests/lib/libcurses/Atffile tests-lib-tests atf ./usr/tests/lib/libcurses/check_files tests-lib-tests ./usr/tests/lib/libcurses/check_files/addch.chk tests-lib-tests atf
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Fri Jun 17 18:08:53 UTC 2011 Modified Files: src/lib/libc/sys: mount.2 Log Message: New sentence, new line. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libc/sys/mount.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/mount.2 diff -u src/lib/libc/sys/mount.2:1.46 src/lib/libc/sys/mount.2:1.47 --- src/lib/libc/sys/mount.2:1.46 Fri Jun 17 14:23:50 2011 +++ src/lib/libc/sys/mount.2 Fri Jun 17 18:08:53 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount.2,v 1.46 2011/06/17 14:23:50 manu Exp $ +.\ $NetBSD: mount.2,v 1.47 2011/06/17 18:08:53 wiz Exp $ .\ .\ Copyright (c) 1980, 1989, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mount.2 8.3 (Berkeley) 5/24/95 .\ -.Dd April 10, 2009 +.Dd June 17, 2011 .Dt MOUNT 2 .Os .Sh NAME @@ -121,7 +121,8 @@ This improves performance in most cases. .It MNT_EXTATTR Enable extended attributes, if the filesystem supports them and do not enable -them by default. Currently this is only the case for UFS1. +them by default. +Currently this is only the case for UFS1. .El .Pp The
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Jun 17 18:13:49 UTC 2011 Modified Files: src/share/man/man4: options.4 Log Message: Remove trailing whitespace. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.407 -r1.408 src/share/man/man4/options.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/options.4 diff -u src/share/man/man4/options.4:1.407 src/share/man/man4/options.4:1.408 --- src/share/man/man4/options.4:1.407 Fri Jun 17 14:23:51 2011 +++ src/share/man/man4/options.4 Fri Jun 17 18:13:49 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.407 2011/06/17 14:23:51 manu Exp $ +.\ $NetBSD: options.4,v 1.408 2011/06/17 18:13:49 wiz Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd April 27, 2011 +.Dd June 17, 2011 .Dt OPTIONS 4 .Os .Sh NAME @@ -960,7 +960,7 @@ Maybe useful for install media kernels, small memory systems and embedded systems which don't require the snapshot support. .It Cd options UFS_EXTATTR -Enable extended attribute support for UFS1 filesystems. +Enable extended attribute support for UFS1 filesystems. .It Cd options WAPBL Enable .Dq Write Ahead Physical Block Logging file system journaling .
CVS commit: src/usr.sbin/extattrctl
Module Name:src Committed By: wiz Date: Fri Jun 17 18:20:40 UTC 2011 Modified Files: src/usr.sbin/extattrctl: extattrctl.8 Log Message: New sentence, new line. Fix some typos and an xref. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/extattrctl/extattrctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/extattrctl/extattrctl.8 diff -u src/usr.sbin/extattrctl/extattrctl.8:1.4 src/usr.sbin/extattrctl/extattrctl.8:1.5 --- src/usr.sbin/extattrctl/extattrctl.8:1.4 Fri Jun 17 14:23:52 2011 +++ src/usr.sbin/extattrctl/extattrctl.8 Fri Jun 17 18:20:40 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: extattrctl.8,v 1.4 2011/06/17 14:23:52 manu Exp $ +.\ $NetBSD: extattrctl.8,v 1.5 2011/06/17 18:20:40 wiz Exp $ .\ .\ Copyright (c) 2000-2001 Robert N. M. Watson .\ All rights reserved. @@ -31,7 +31,7 @@ .\ Developed by the TrustedBSD Project. .\ Support for file system extended attribute. .\ -.Dd July 11, 2005 +.Dd June 17, 2011 .Dt EXTATTRCTL 8 .Os .Sh NAME @@ -82,16 +82,17 @@ .Ar path . The file system must be a UFS1 file system, and the .Dv UFS_EXTATTR -kernel option must have been enabled. If -.Pa .attribute/user -and +kernel option must have been enabled. +If +.Pa .attribute/user +and .Pa .attribute/system -exist at the filesystem root, extended attribute backed by files -in theses directories will be automatically enabled. Note that -extended attributes can be automatically started at mount time -by using the +exist at the filesystem root, extended attributes backed by files +in these directories will be automatically enabled. +Note that extended attributes can be automatically started at mount +time by using the .Cm -o extattr -option to +option to .Xr mount 8 . .It Cm stop Ar path Stop extended attribute support on the file system named using @@ -121,7 +122,7 @@ This file should not exist before running .Cm initattr . .Pp -When a user attempt to set a +When a user attempts to set a .Dq user or .Dq system @@ -130,7 +131,7 @@ .Pa .attribute/user or .Pa .attribute/system -exist and are writtable by the requesting user. +exist and are writable by the requesting user. .It Cm showattr Ar attrfile Show the attribute header values in the attribute file named by .Ar attrfile . @@ -192,9 +193,9 @@ .Pp Stop extended attributes on the root file system. .Sh SEE ALSO +.Xr getextattr 1 , .Xr extattr_get_file 2 , .\ .Xr ffs 7 , -.Xr getextattr 8 , .Xr extattr 9 .Sh HISTORY Extended attribute support was developed as part of the TrustedBSD @@ -203,9 +204,9 @@ and .Nx 4.0 . It was developed to support security extensions requiring additional -labels to be associated with each file or directory. Backing file -autocreation was added in -.Nx 6.0 +labels to be associated with each file or directory. +Backing file autocreation was added in +.Nx 6.0 . .Sh AUTHORS .An Robert N M Watson .Sh BUGS
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Fri Jun 17 18:59:33 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: vm_machdep.c
Log Message:
ofppc doesn't have PMAP_MAP_POOLPAGE so make the cpu_uareas do nothing.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/powerpc/powerpc/vm_machdep.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/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.88 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.89
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.88 Wed Jun 15 05:48:31 2011
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Fri Jun 17 18:59:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.88 2011/06/15 05:48:31 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.89 2011/06/17 18:59:33 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.88 2011/06/15 05:48:31 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.89 2011/06/17 18:59:33 matt Exp $);
#include opt_altivec.h
#include opt_multiprocessor.h
@@ -286,6 +286,7 @@
void *
cpu_uarea_alloc(bool system)
{
+#ifdef PMAP_MAP_POOLPAGE
struct pglist pglist;
int error;
@@ -312,6 +313,9 @@
*/
return (void *)(uintptr_t)PMAP_MAP_POOLPAGE(pa);
+#else
+ return NULL;
+#endif
}
/*
@@ -320,6 +324,7 @@
bool
cpu_uarea_free(void *vva)
{
+#ifdef PMAP_UNMAP_POOLPAGE
vaddr_t va = (vaddr_t) vva;
if (va = VM_MIN_KERNEL_ADDRESS va VM_MAX_KERNEL_ADDRESS)
return false;
@@ -334,5 +339,8 @@
uvm_pagefree(pg);
}
return true;
+#else
+ return false;
+#endif
}
#endif /* __HAVE_CPU_UAREA_ROUTINES */
CVS commit: src/sys/arch/powerpc
Module Name:src
Committed By: matt
Date: Fri Jun 17 19:03:04 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke: booke_autoconf.c
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/arch/powerpc/ibm4xx: ibm4xx_autoconf.c
src/sys/arch/powerpc/ibm4xx/dev: comopbvar.h ecc_plb.c exb.c
gpiic_opb.c gpio_opb.c if_emac.c wdog.c
src/sys/arch/powerpc/ibm4xx/pci: pchb.c pci_machdep.c
src/sys/arch/powerpc/include: isa_machdep.h
src/sys/arch/powerpc/include/ibm4xx: cpu.h pci_machdep.h
src/sys/arch/powerpc/oea: cpu_subr.c ofw_autoconf.c
src/sys/arch/powerpc/pci: pchb.c pci_machdep_common.c pcib.c
pciconf_indirect.c pciconf_ofmethod.c
src/sys/arch/powerpc/powerpc: powerpc_machdep.c rtas.c
Log Message:
struct device * - device_t
struct cfdata * - cfdata_t
split device/softc (CFATTACH_DECL_NEW)
use device_accessors and device_private
constify
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/booke_autoconf.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/ibm4xx/dev/comopbvar.h \
src/sys/arch/powerpc/ibm4xx/dev/exb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c \
src/sys/arch/powerpc/ibm4xx/dev/gpio_opb.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/ibm4xx/dev/wdog.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/ibm4xx/pci/pchb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/isa_machdep.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/ibm4xx/cpu.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/ibm4xx/pci_machdep.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/oea/ofw_autoconf.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/pci/pchb.c \
src/sys/arch/powerpc/pci/pcib.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/pci/pci_machdep_common.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/pci/pciconf_indirect.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/pci/pciconf_ofmethod.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/powerpc/rtas.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/powerpc/booke/booke_autoconf.c
diff -u src/sys/arch/powerpc/booke/booke_autoconf.c:1.2 src/sys/arch/powerpc/booke/booke_autoconf.c:1.3
--- src/sys/arch/powerpc/booke/booke_autoconf.c:1.2 Tue Jan 18 01:02:52 2011
+++ src/sys/arch/powerpc/booke/booke_autoconf.c Fri Jun 17 19:03:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_autoconf.c,v 1.2 2011/01/18 01:02:52 matt Exp $ */
+/* $NetBSD: booke_autoconf.c,v 1.3 2011/06/17 19:03:03 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: booke_autoconf.c,v 1.2 2011/01/18 01:02:52 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: booke_autoconf.c,v 1.3 2011/06/17 19:03:03 matt Exp $);
#include sys/param.h
#include sys/conf.h
@@ -73,7 +73,7 @@
if (prop_dictionary_set(device_properties(dev),
mac-address, pd) == false) {
printf(WARNING: unable to set mac-addr
-property for %s\n, dev-dv_xname);
+property for %s\n, device_xname(dev));
}
}
return;
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.4 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.5
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.4 Sun Jun 12 05:37:54 2011
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Fri Jun 17 19:03:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.4 2011/06/12 05:37:54 matt Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.5 2011/06/17 19:03:03 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -458,6 +458,7 @@
struct pq3etsec_softc * const sc = device_private(self);
struct cpunode_attach_args * const cna = aux;
struct cpunode_locators * const cnl = cna-cna_locs;
+ cfdata_t cf = device_cfdata(self);
int error;
psc-sc_children |= cna-cna_childmask;
@@ -468,15 +469,13 @@
/*
* If we have a common MDIO bus, if all off instance 1.
*/
- device_t miiself = (self-dv_cfdata-cf_flags 0x100)
- ? tsec_cd.cd_devs[0]
- : self;
+ device_t miiself = (cf-cf_flags 0x100) ? tsec_cd.cd_devs[0] : self;
/*
* See if the phy is in the config file...
*/
- if (self-dv_cfdata-cf_flags 0x3f) {
- sc-sc_phy_addr = (self-dv_cfdata-cf_flags 0x3f) - 1;
+ if (cf-cf_flags 0x3f)
CVS commit: src/sys/arch/powerpc/include
Module Name:src
Committed By: matt
Date: Fri Jun 17 19:04:00 UTC 2011
Modified Files:
src/sys/arch/powerpc/include: cpu.h
Log Message:
struct device * - device_t
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/powerpc/include/cpu.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/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.81 src/sys/arch/powerpc/include/cpu.h:1.82
--- src/sys/arch/powerpc/include/cpu.h:1.81 Wed Jun 15 15:18:20 2011
+++ src/sys/arch/powerpc/include/cpu.h Fri Jun 17 19:04:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.81 2011/06/15 15:18:20 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.82 2011/06/17 19:04:00 matt Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -157,7 +157,7 @@
#ifdef MULTIPROCESSOR
struct cpu_hatch_data {
- struct device *self;
+ device_t self;
struct cpu_info *ci;
int running;
int pir;
@@ -390,7 +390,7 @@
void md_start_timebase(volatile struct cpu_hatch_data *);
void md_sync_timebase(volatile struct cpu_hatch_data *);
void md_setup_interrupts(void);
-int cpu_spinup(struct device *, struct cpu_info *);
+int cpu_spinup(device_t, struct cpu_info *);
register_t cpu_hatch(void);
void cpu_spinup_trampoline(void);
#endif
CVS commit: src/sys/arch/powerpc/isa
Module Name:src
Committed By: matt
Date: Fri Jun 17 19:05:20 UTC 2011
Modified Files:
src/sys/arch/powerpc/isa: isa_machdep_common.c
Log Message:
struct device * - device_t
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/isa/isa_machdep_common.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/powerpc/isa/isa_machdep_common.c
diff -u src/sys/arch/powerpc/isa/isa_machdep_common.c:1.5 src/sys/arch/powerpc/isa/isa_machdep_common.c:1.6
--- src/sys/arch/powerpc/isa/isa_machdep_common.c:1.5 Wed Aug 19 15:02:47 2009
+++ src/sys/arch/powerpc/isa/isa_machdep_common.c Fri Jun 17 19:05:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep_common.c,v 1.5 2009/08/19 15:02:47 dyoung Exp $ */
+/* $NetBSD: isa_machdep_common.c,v 1.6 2011/06/17 19:05:20 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isa_machdep_common.c,v 1.5 2009/08/19 15:02:47 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: isa_machdep_common.c,v 1.6 2011/06/17 19:05:20 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -76,7 +76,7 @@
}
void
-genppc_isa_attach_hook(struct device *parent, struct device *self,
+genppc_isa_attach_hook(device_t parent, device_t self,
struct isabus_attach_args *iba)
{
CVS commit: src/sys/conf
Module Name:src
Committed By: matt
Date: Fri Jun 17 21:19:42 UTC 2011
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
If dbsym fails, not fail the command, remove the target too so that the
next invokation will try to remake it.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.138 src/sys/conf/Makefile.kern.inc:1.139
--- src/sys/conf/Makefile.kern.inc:1.138 Mon May 30 03:12:43 2011
+++ src/sys/conf/Makefile.kern.inc Fri Jun 17 21:19:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.138 2011/05/30 03:12:43 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.139 2011/06/17 21:19:42 matt Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -250,7 +250,7 @@
SYSTEM_LD_TAIL+=; \
if grep '^\#define.*SYMTAB_SPACE' opt_ddbparam.h /dev/null; then \
echo ${DBSYM} $@.gdb; \
- ${DBSYM} $@.gdb || exit 1; \
+ ${DBSYM} $@.gdb || (rm -f $@ ; exit 1) || exit 1; \
fi
.elifndef PROF
@@ -260,7 +260,7 @@
SYSTEM_LD_TAIL+=; \
if grep '^\#define.*SYMTAB_SPACE' opt_ddbparam.h /dev/null; then \
echo ${DBSYM} $@; \
- ${DBSYM} $@ || exit 1; \
+ ${DBSYM} $@ || (rm -f $@ ; exit 1) || exit 1; \
fi
SYSTEM_LD_HEAD+=${SYSTEM_LD_HEAD_EXTRA}
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Fri Jun 17 23:12:40 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: process_machdep.c
Log Message:
Fix curlwp check for fpreg/vecreg to acknowledge that the PCU is either
for the current lwp or that PCU is not owned on any cpu.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/powerpc/powerpc/process_machdep.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/powerpc/powerpc/process_machdep.c
diff -u src/sys/arch/powerpc/powerpc/process_machdep.c:1.32 src/sys/arch/powerpc/powerpc/process_machdep.c:1.33
--- src/sys/arch/powerpc/powerpc/process_machdep.c:1.32 Sun Jun 12 20:38:10 2011
+++ src/sys/arch/powerpc/powerpc/process_machdep.c Fri Jun 17 23:12:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.32 2011/06/12 20:38:10 matt Exp $ */
+/* $NetBSD: process_machdep.c,v 1.33 2011/06/17 23:12:40 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,13 +32,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: process_machdep.c,v 1.32 2011/06/12 20:38:10 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: process_machdep.c,v 1.33 2011/06/17 23:12:40 matt Exp $);
#include opt_altivec.h
#include sys/param.h
#include sys/proc.h
#include sys/systm.h
+#include sys/cpu.h
#include sys/ptrace.h
#include machine/fpu.h
@@ -88,10 +89,12 @@
if (!fpu_used_p(l)) {
memset(fpregs, 0, sizeof (*fpregs));
#ifdef PPC_HAVE_FPU
- } else {
- KASSERTMSG(l == curlwp,
- (%s: l (%p) != curlwp (%p), __func__, l, curlwp));
+ } else if (l == curlwp) {
fpu_save();
+ } else {
+ KASSERTMSG(l-l_pcu_cpu[PCU_FPU] == NULL,
+ (%s: FPU of l (%p) active on cpu%u,
+ __func__, l, cpu_index(l-l_pcu_cpu[PCU_FPU])));
#endif
}
*fpregs = pcb-pcb_fpu;
@@ -156,9 +159,13 @@
/* Is the process using AltiVEC? */
if (!vec_used_p(l)) {
memset(vregs, 0, sizeof (*vregs));
- } else {
+ } else if (l == curlwp) {
vec_save();
*vregs = pcb-pcb_vr;
+ } else {
+ KASSERTMSG(l-l_pcu_cpu[PCU_VEC] == NULL,
+ (%s: VEC of l (%p) active on cpu%u,
+ __func__, l, cpu_index(l-l_pcu_cpu[PCU_FPU])));
}
vec_mark_used(l);
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: matt Date: Fri Jun 17 23:14:41 UTC 2011 Modified Files: src/sys/arch/powerpc/powerpc: locore_subr.S Log Message: Call splraise(IPL_HIGH) instead splhigh. Easier to a nasty problem. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/powerpc/powerpc/locore_subr.S 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/powerpc/powerpc/locore_subr.S diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.43 src/sys/arch/powerpc/powerpc/locore_subr.S:1.44 --- src/sys/arch/powerpc/powerpc/locore_subr.S:1.43 Fri Jun 17 05:11:48 2011 +++ src/sys/arch/powerpc/powerpc/locore_subr.S Fri Jun 17 23:14:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_subr.S,v 1.43 2011/06/17 05:11:48 matt Exp $ */ +/* $NetBSD: locore_subr.S,v 1.44 2011/06/17 23:14:40 matt Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -314,7 +314,8 @@ ldreg %r0, CFRAME_LR(%r1) mtlr %r0 #if IPL_SCHED != IPL_HIGH - b _C_LABEL(splhigh) + li %r3, IPL_HIGH + b _C_LABEL(splraise) #else blr #endif /* IPL SCHED != IPL_HIGH */
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: matt Date: Fri Jun 17 23:15:09 UTC 2011 Modified Files: src/sys/arch/powerpc/oea: genassym.cf Log Message: Add IPL_HIGH and IPL_SCHED so locore.S can use them. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/oea/genassym.cf 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/powerpc/oea/genassym.cf diff -u src/sys/arch/powerpc/oea/genassym.cf:1.21 src/sys/arch/powerpc/oea/genassym.cf:1.22 --- src/sys/arch/powerpc/oea/genassym.cf:1.21 Thu Jun 16 04:38:21 2011 +++ src/sys/arch/powerpc/oea/genassym.cf Fri Jun 17 23:15:09 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.21 2011/06/16 04:38:21 matt Exp $ +# $NetBSD: genassym.cf,v 1.22 2011/06/17 23:15:09 matt Exp $ # # Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -51,6 +51,9 @@ include powerpc/cpu.h include powerpc/oea/cpufeat.h +define IPL_HIGH IPL_HIGH +define IPL_SCHED IPL_SCHED + define FRAMELEN FRAMELEN define FRAME_TF offsetof(struct ktrapframe, ktf_tf) define FRAME_R0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Fri Jun 17 23:36:18 UTC 2011 Modified Files: src/sys/arch/amigappc/include: intr.h src/sys/arch/bebox/include: intr.h src/sys/arch/evbppc/include: pmppc_intr.h src/sys/arch/ibmnws/include: intr.h src/sys/arch/macppc/include: intr.h src/sys/arch/mvmeppc/include: intr.h src/sys/arch/ofppc/include: intr.h src/sys/arch/powerpc/include: intr.h src/sys/arch/powerpc/pic: files.pic intr.c src/sys/arch/prep/include: intr.h src/sys/arch/prep/pnpbus: if_we_pnpbus.c src/sys/arch/rs6000/include: intr.h src/sys/arch/sandpoint/include: intr.h Removed Files: src/sys/arch/powerpc/pic: pic_subr.c Log Message: intr.h must not include cpu due to deadly embrace with SOFTINT_COUNT. Cleanup intr.h so MD definitions can overload common definitions. Rototill pic/intr.c. Virtual IRQs can now be reclaimed. separate virq from hwirq from picirq. Redo intr mask calculations. tested on pmppc and macppc (MP). To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amigappc/include/intr.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/bebox/include/intr.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/include/pmppc_intr.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ibmnws/include/intr.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/macppc/include/intr.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mvmeppc/include/intr.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ofppc/include/intr.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/include/intr.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/pic/files.pic cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/pic/intr.c cvs rdiff -u -r1.1 -r0 src/sys/arch/powerpc/pic/pic_subr.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/prep/include/intr.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/pnpbus/if_we_pnpbus.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/include/intr.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/include/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/amigappc/include/intr.h diff -u src/sys/arch/amigappc/include/intr.h:1.24 src/sys/arch/amigappc/include/intr.h:1.25 --- src/sys/arch/amigappc/include/intr.h:1.24 Sat Nov 13 13:34:00 2010 +++ src/sys/arch/amigappc/include/intr.h Fri Jun 17 23:36:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.24 2010/11/13 13:34:00 uebayasi Exp $ */ +/* $NetBSD: intr.h,v 1.25 2011/06/17 23:36:17 matt Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -44,8 +44,4 @@ #endif #include powerpc/intr.h -#ifndef _LOCORE -#include machine/cpu.h -#endif /* _LOCORE */ - #endif /* !_AMIGAPPC_INTR_H_ */ Index: src/sys/arch/bebox/include/intr.h diff -u src/sys/arch/bebox/include/intr.h:1.29 src/sys/arch/bebox/include/intr.h:1.30 --- src/sys/arch/bebox/include/intr.h:1.29 Sat Apr 24 09:39:56 2010 +++ src/sys/arch/bebox/include/intr.h Fri Jun 17 23:36:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.29 2010/04/24 09:39:56 kiyohara Exp $ */ +/* $NetBSD: intr.h,v 1.30 2011/06/17 23:36:17 matt Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,12 +42,12 @@ extern paddr_t bebox_mb_reg; -#define ICU_LEN 32 -#define IRQ_SLAVE 2 -#define LEGAL_IRQ(x) ((x) = 0 (x) ICU_LEN (x) != IRQ_SLAVE) +#define ICU_LEN 32 +#define IRQ_SLAVE 2 +#define LEGAL_HWIRQ_P(x) ((u_int)(x) ICU_LEN (x) != IRQ_SLAVE) -#define BEBOX_INTR_REG 0x7000 -#define INTR_VECTOR_REG 0xff0 +#define BEBOX_INTR_REG 0x7000 +#define INTR_VECTOR_REG 0xff0 #endif /* !_LOCORE */ Index: src/sys/arch/evbppc/include/pmppc_intr.h diff -u src/sys/arch/evbppc/include/pmppc_intr.h:1.3 src/sys/arch/evbppc/include/pmppc_intr.h:1.4 --- src/sys/arch/evbppc/include/pmppc_intr.h:1.3 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/include/pmppc_intr.h Fri Jun 17 23:36:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmppc_intr.h,v 1.3 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: pmppc_intr.h,v 1.4 2011/06/17 23:36:17 matt Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #define ICU_LEN 32 #define ICU_MASK 0x1f000fc0 -#define LEGAL_IRQ(x) ((x) = 0 (x) = 31 (ICU_MASK (0x8000 (x +#define LEGAL_HWIRQ_P(x) ((u_int)(x) ICU_LEN (ICU_MASK (0x8000 (x #endif /* !_LOCORE */ Index: src/sys/arch/ibmnws/include/intr.h diff -u src/sys/arch/ibmnws/include/intr.h:1.14 src/sys/arch/ibmnws/include/intr.h:1.15 --- src/sys/arch/ibmnws/include/intr.h:1.14 Sat Nov 13 14:07:07 2010 +++ src/sys/arch/ibmnws/include/intr.h Fri Jun 17 23:36:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.14 2010/11/13 14:07:07 uebayasi Exp $ */ +/* $NetBSD: intr.h,v 1.15 2011/06/17 23:36:17 matt Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -32,11 +32,7 @@ #ifndef _IBMNWS_INTR_H_ #define _IBMNWS_INTR_H_ -#include powerpc/intr.h - #ifndef
CVS commit: src/compat
Module Name:src
Committed By: mrg
Date: Sat Jun 18 01:22:34 UTC 2011
Modified Files:
src/compat: m32.mk
Log Message:
avoid adding -m32 to various variables multiple times aka, multiple inclusions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/compat/m32.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/m32.mk
diff -u src/compat/m32.mk:1.1 src/compat/m32.mk:1.2
--- src/compat/m32.mk:1.1 Sun Dec 13 09:27:34 2009
+++ src/compat/m32.mk Sat Jun 18 01:22:34 2011
@@ -1,9 +1,12 @@
-# $NetBSD: m32.mk,v 1.1 2009/12/13 09:27:34 mrg Exp $
+# $NetBSD: m32.mk,v 1.2 2011/06/18 01:22:34 mrg Exp $
#
# Makefile fragment to help implement a set of 'cc -m32' libraries.
#
+.ifndef _COMPAT_M32_MK_ # {
+_COMPAT_M32_MK_=1
+
COPTS+= -m32
CPUFLAGS+= -m32
LDADD+= -m32
@@ -11,3 +14,5 @@
MKDEPFLAGS+= -m32
.include Makefile.compat
+
+.endif # _COMPAT_M32_MK_ }
CVS commit: src/sys/arch/powerpc/ibm4xx/dev
Module Name:src Committed By: matt Date: Sat Jun 18 02:02:50 UTC 2011 Modified Files: src/sys/arch/powerpc/ibm4xx/dev: wdog.c Log Message: Use aprint_normal include sys/cpu.h To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/ibm4xx/dev/wdog.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/powerpc/ibm4xx/dev/wdog.c diff -u src/sys/arch/powerpc/ibm4xx/dev/wdog.c:1.11 src/sys/arch/powerpc/ibm4xx/dev/wdog.c:1.12 --- src/sys/arch/powerpc/ibm4xx/dev/wdog.c:1.11 Fri Jun 17 19:03:02 2011 +++ src/sys/arch/powerpc/ibm4xx/dev/wdog.c Sat Jun 18 02:02:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wdog.c,v 1.11 2011/06/17 19:03:02 matt Exp $ */ +/* $NetBSD: wdog.c,v 1.12 2011/06/18 02:02:50 matt Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -40,17 +40,19 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: wdog.c,v 1.11 2011/06/17 19:03:02 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: wdog.c,v 1.12 2011/06/18 02:02:50 matt Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h +#include sys/cpu.h #include sys/wdog.h #include prop/proplib.h #include powerpc/spr.h #include powerpc/ibm4xx/spr.h +#include powerpc/ibm4xx/cpu.h #include powerpc/ibm4xx/dev/opbvar.h #include dev/sysmon/sysmonvar.h @@ -94,7 +96,7 @@ processor_freq = (unsigned int) prop_number_integer_value(freq); sc-sc_wdog_period = (2LL 29) / processor_freq; - printf(: %d second period\n, sc-sc_wdog_period); + aprint_normal(: %d second period\n, sc-sc_wdog_period); sc-sc_dev = self; sc-sc_smw.smw_name = device_xname(self);
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Sat Jun 18 02:05:08 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: pmap.c
Log Message:
remove some debugging output no longer necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 src/sys/arch/sparc/sparc/pmap.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/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.342 src/sys/arch/sparc/sparc/pmap.c:1.343
--- src/sys/arch/sparc/sparc/pmap.c:1.342 Sun Jun 12 03:35:46 2011
+++ src/sys/arch/sparc/sparc/pmap.c Sat Jun 18 02:05:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.342 2011/06/12 03:35:46 rmind Exp $ */
+/* $NetBSD: pmap.c,v 1.343 2011/06/18 02:05:08 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -56,7 +56,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.342 2011/06/12 03:35:46 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.343 2011/06/18 02:05:08 mrg Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -3859,7 +3859,6 @@
/*
* Setup the cpus[] array and the ci_self links.
*/
- prom_printf(setting cpus self reference\n);
for (i = 0; i sparc_ncpus; i++) {
sva = (vaddr_t) (cpuinfo_data + (cpuinfo_len * i));
cpuinfo_va = sva +
@@ -3876,8 +3875,6 @@
paddr_t pa =
PMAP_BOOTSTRAP_VA2PA(CPUINFO_VA + off);
-prom_printf(going to pmap_kenter_pa
- (va=%p, pa=%p)\n, va, pa);
pmap_kremove(va, NBPG);
pmap_kenter_pa(va, pa,
VM_PROT_READ | VM_PROT_WRITE, 0);
@@ -3888,7 +3885,6 @@
cpus[i] = (struct cpu_info *)cpuinfo_va;
cpus[i]-ci_self = cpus[i];
- prom_printf(set cpu%d ci_self address: %p\n, i, cpus[i]);
/* Unmap and prepare to return unused pages */
if (cpuinfo_va != sva) {
@@ -3920,8 +3916,6 @@
panic(cpuinfo inconsistent);
}
#endif
-
- prom_printf(pmap_bootstrap4m done\n);
}
static u_long prom_ctxreg;
