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
-__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
@@ -117,6 +118,11 @@
#include
#endif
+#ifdef MPLS
+#include
+#include
+#endif
+
#ifdef NETATALK
#include
#include
@@ -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
-__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
-__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
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
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#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
@@ -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/lib/libc/sys
Module Name:src Committed By: wiz Date: Fri Jun 17 18:12:32 UTC 2011 Modified Files: src/lib/libc/sys: mount.2 Log Message: Fix wording (if I understand the sentence correctly). To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 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.47 src/lib/libc/sys/mount.2:1.48 --- src/lib/libc/sys/mount.2:1.47 Fri Jun 17 18:08:53 2011 +++ src/lib/libc/sys/mount.2 Fri Jun 17 18:12:32 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount.2,v 1.47 2011/06/17 18:08:53 wiz Exp $ +.\" $NetBSD: mount.2,v 1.48 2011/06/17 18:12:32 wiz Exp $ .\" .\" Copyright (c) 1980, 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -120,8 +120,8 @@ 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. +Enable extended attributes, if the filesystem supports them and +does not enable them by default. Currently this is only the case for UFS1. .El .Pp
CVS commit: src/sbin/mount
Module Name:src Committed By: wiz Date: Fri Jun 17 18:13:14 UTC 2011 Modified Files: src/sbin/mount: mount.8 Log Message: New sentence, new line; fix wording; bump date. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.71 src/sbin/mount/mount.8:1.72 --- src/sbin/mount/mount.8:1.71 Fri Jun 17 14:23:51 2011 +++ src/sbin/mount/mount.8 Fri Jun 17 18:13:14 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount.8,v 1.71 2011/06/17 14:23:51 manu Exp $ +.\" $NetBSD: mount.8,v 1.72 2011/06/17 18:13:14 wiz Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" -.Dd October 2, 2009 +.Dd June 17, 2011 .Dt MOUNT 8 .Os .Sh NAME @@ -191,8 +191,9 @@ .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. +Enable extended attributes, if the filesystem supports them and +does not enable them by default. +Currently this is only the case for UFS1. .It Cm force The same as .Fl f ;
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.bin/extattr
Module Name:src Committed By: wiz Date: Fri Jun 17 18:19:58 UTC 2011 Modified Files: src/usr.bin/extattr: getextattr.1 Log Message: This is installed in section 1, so make internal section the same. Also use name under which it is installed as main internal name. Comment out reference to extattr(2) which doesn't exist on NetBSD (a reference to extattr(3) still remains). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/extattr/getextattr.1 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/extattr/getextattr.1 diff -u src/usr.bin/extattr/getextattr.1:1.2 src/usr.bin/extattr/getextattr.1:1.3 --- src/usr.bin/extattr/getextattr.1:1.2 Sun Jan 2 18:41:23 2005 +++ src/usr.bin/extattr/getextattr.1 Fri Jun 17 18:19:58 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: getextattr.1,v 1.2 2005/01/02 18:41:23 wiz Exp $ +.\" $NetBSD: getextattr.1,v 1.3 2011/06/17 18:19:58 wiz Exp $ .\" .\"- .\" Copyright (c) 2000, 2001 Robert N. M. Watson @@ -34,7 +34,7 @@ .\" $FreeBSD: src/usr.sbin/extattr/rmextattr.8,v 1.4 2003/02/24 22:53:25 ru Exp $ .\" .Dd January 2, 2005 -.Dt RMEXTATTR 8 +.Dt GETEXTATTR 1 .Os .Sh NAME .Nm getextattr , @@ -114,7 +114,7 @@ rmextattr system md5 /boot/kernel/kernel .Ed .Sh SEE ALSO -.Xr extattr 2 , +.\" .Xr extattr 2 , .Xr extattr 3 , .Xr extattrctl 8 , .Xr extattr 9
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/emips/emips
Module Name:src Committed By: tsutsui Date: Fri Jun 17 18:40:46 UTC 2011 Modified Files: src/sys/arch/emips/emips: cons.h Log Message: Sync with pmax/cons.h (i.e. remove clause 3 and 4). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/emips/cons.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/emips/emips/cons.h diff -u src/sys/arch/emips/emips/cons.h:1.1 src/sys/arch/emips/emips/cons.h:1.2 --- src/sys/arch/emips/emips/cons.h:1.1 Wed Jan 26 01:18:50 2011 +++ src/sys/arch/emips/emips/cons.h Fri Jun 17 18:40:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cons.h,v 1.1 2011/01/26 01:18:50 pooka Exp $ */ +/* $NetBSD: cons.h,v 1.2 2011/06/17 18:40:46 tsutsui Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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 NetBSD - *Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - *contributors may be used to endorse or promote products derived - *from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
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
-__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
-__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
#include
@@ -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
-__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
#include
@@ -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/arch/evbppc/conf
Module Name:src Committed By: matt Date: Fri Jun 17 21:18:57 UTC 2011 Modified Files: src/sys/arch/evbppc/conf: OPENBLOCKS266 Log Message: Bump up SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbppc/conf/OPENBLOCKS266 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/evbppc/conf/OPENBLOCKS266 diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266:1.53 src/sys/arch/evbppc/conf/OPENBLOCKS266:1.54 --- src/sys/arch/evbppc/conf/OPENBLOCKS266:1.53 Wed May 25 22:46:12 2011 +++ src/sys/arch/evbppc/conf/OPENBLOCKS266 Fri Jun 17 21:18:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS266,v 1.53 2011/05/25 22:46:12 dyoung Exp $ +# $NetBSD: OPENBLOCKS266,v 1.54 2011/06/17 21:18:57 matt Exp $ # # GENERIC -- everything that's currently supported # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "OPENBLOCKS266-$Revision: 1.53 $" +#ident "OPENBLOCKS266-$Revision: 1.54 $" maxusers 32 @@ -44,7 +44,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT -options SYMTAB_SPACE=657000 # size for embedded symbol table +options SYMTAB_SPACE=66 # size for embedded symbol table makeoptions DEBUG="-g" # compile full symbol table
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
-__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
#include
#include
+#include
#include
#include
@@ -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 include +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 -#ifndef _LOCORE -#include -#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 - #ifndef _LOCORE -#include -
CVS commit: src/sys/arch/powerpc/marvell
Module Name:src
Committed By: matt
Date: Fri Jun 17 23:37:38 UTC 2011
Modified Files:
src/sys/arch/powerpc/marvell: marvell_intr.h
Log Message:
Part of the interrupt rototill. Use and just override
a few things (like imask_t).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/marvell/marvell_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/powerpc/marvell/marvell_intr.h
diff -u src/sys/arch/powerpc/marvell/marvell_intr.h:1.17 src/sys/arch/powerpc/marvell/marvell_intr.h:1.18
--- src/sys/arch/powerpc/marvell/marvell_intr.h:1.17 Wed Apr 28 13:51:55 2010
+++ src/sys/arch/powerpc/marvell/marvell_intr.h Fri Jun 17 23:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_intr.h,v 1.17 2010/04/28 13:51:55 kiyohara Exp $ */
+/* $NetBSD: marvell_intr.h,v 1.18 2011/06/17 23:37:38 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -32,94 +32,17 @@
#ifndef _POWERPC_MARVELL_INTR_H_
#define _POWERPC_MARVELL_INTR_H_
-void *intr_establish(int, int, int, int (*)(void *), void *);
-void intr_disestablish(void *);
-const char *intr_typename(int);
-void genppc_cpu_configure(void);
-
-/* Interrupt priority `levels'. */
-#define IPL_NONE 0 /* nothing */
-#define IPL_SOFTCLOCK 1 /* timeouts */
-#define IPL_SOFTBIO 2 /* block I/O */
-#define IPL_SOFTNET 3 /* protocol stacks */
-#define IPL_SOFTSERIAL 4 /* serial */
-#define IPL_VM 5 /* memory allocation */
-#define IPL_SCHED 6
-#define IPL_HIGH 7 /* everything */
-#define NIPL 8
-
-/* Interrupt sharing types. */
-#define IST_NONE 0 /* none */
-#define IST_PULSE 1 /* pulsed */
-#define IST_EDGE 2 /* edge-triggered */
-#define IST_LEVEL 3 /* level-triggered */
#ifndef _LOCORE
-/*
- * Interrupt handler chains. intr_establish() inserts a handler into
- * the list. The handler is called with its (single) argument.
- */
-struct intrhand {
- int (*ih_fun)(void *);
- void *ih_arg;
- struct intrhand *ih_next;
- int ih_level;
- int ih_irq;
-};
-
-int splraise(int);
-int spllower(int);
-void splx(int);
-void softintr(int);
-
-typedef uint64_t imask_t;
-extern imask_t imask[];
-
-#define NVIRQ 64 /* 64 virtual IRQs */
-#define NIRQ 128 /* up to 128 HW IRQs */
-
-#define HWIRQ_MAX (NVIRQ - 4 - 1)
-#define HWIRQ_MASK 0x0ffeULL
-
-/* Soft interrupt masks. */
-#define SIR_CLOCK 60
-#define SIR_BIO 61
-#define SIR_NET 62
-#define SIR_SERIAL 63
-#define SPL_CLOCK 0
-
-#define MS_PENDING(p) (((p) & (1 << SPL_CLOCK)) ? SPL_CLOCK : \
- (((p) & (0xULL << 32)) ? \
- 63 - cntlzw((p) >> 32) : \
- 32 - cntlzw((p) & 0x)))
-
-#define setsoftclock() softintr(SIR_CLOCK)
-#define setsoftbio() softintr(SIR_BIO)
-#define setsoftnet() softintr(SIR_NET)
-#define setsoftserial() softintr(SIR_SERIAL)
-
-#define spl0() spllower(0)
-
-typedef int ipl_t;
-typedef struct {
- ipl_t _ipl;
-} ipl_cookie_t;
-
-static inline ipl_cookie_t
-makeiplcookie(ipl_t ipl)
-{
-
- return (ipl_cookie_t){._ipl = ipl};
-}
-
-static inline int
-splraiseipl(ipl_cookie_t icookie)
-{
- return splraise(icookie._ipl);
-}
+#define __IMASK_T uint64_t
+
+#if 0
+#define PIC_VIRQ_MS_PENDING(p) (((p) != (uint32_t)(p)) \
+? __builtin_clz((uint32_t((p) >> 32)) \
+: 32 + __builtin_clz((uint32_t)(p)))
+#endif
-#include
#define ICU_LEN (64 + 32) /* Main Interrupt(64) + GPIO(32) */
@@ -127,7 +50,10 @@
extern struct pic_ops *discovery_gpp_pic[4];
struct pic_ops *setup_discovery_pic(void);
struct pic_ops *setup_discovery_gpp_pic(void *, int);
+void genppc_cpu_configure(void);
#endif /* !_LOCORE */
+#include
+
#endif /* _POWERPC_MARVELL_INTR_H_ */
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
-__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
#include
#include
+#include
#include
#include
#include
#include
+#include
#include
#include
@@ -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
-__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;
CVS commit: othersrc/external/bsd/mat
Module Name:othersrc Committed By: agc Date: Sat Jun 18 04:53:13 UTC 2011 Update of /cvsroot/othersrc/external/bsd/mat In directory ivanova.netbsd.org:/tmp/cvs-serv4946 Log Message: Initial import of mat into othersrc. mat is an archiver program (the "minimalist archiving tool" program), similar to tar or pax, but holding digests of the individual components in the archive (right now, these are sha256 digests). in addition, mat has been designed to have no arbitrary restrictions on sizes of meta-data fields, or of data itself. it holds linked files internally as efficiently as possible, and displays these linked files in a manner analogous to ls(1) for a symbolic link. mat is a tar-like frontend for libmat(3). a pax-like frontend is also under development. if i could work out cpio syntax, i might write a cpio-like frontend. there is a separate mat_verify() function exposed in the library, and it will perform sanity and integral validity checks on an archive that is presented to it. internally, every archive is validated before any listing or extraction can take place. no filenames which start with '/' are allowed, neither is any filename containing a "/../" string. because mat is intended to be used as part of a layered solution, mat does not include any compression, since it is usually much more efficient to construct the archive itself, and then to compress the whole archive, since there are "economies of scale" here. mat also includes no signing facility, but has been designed to be layered underneath such a signing program - by signing an inventory of a mat archive, with the sha256 digests in the inventory, it would be difficult to modify any part of the archive and still have a valid signature on the archive. the obligatory examples follow: % cp /etc/group group % ln -s Makefile m % mat cvf archive.mat group m /etc/group can't stat './etc/group' % mat tf archive.mat group m % mat tvf archive.mat -rw-r--r-- 1 agc agc510 Jun 16 18:27 group lrwxr-xr-x 1 agc agc 8 Jun 16 18:27 m -> Makefile % mat tvvf archive.mat -rw-r--r-- 1 agc agc510 Jun 16 18:27 d8008905d91a083115b2fb8bd469a36a94f07f9cafeb88c17a44add769d3c0a0 group lrwxr-xr-x 1 agc agc 8 Jun 16 18:27 7a6378e1ee1f9098b9fb5219e6bb2ae17df33230171ee5c2a56f0cc4335d5dfd m -> Makefile % an example of multiply-linked files in a mat archive: % mat tvf a.mat drwxr-xr-x 2 agc agc512 Jun 16 18:27 a -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 a/Makefile -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 a/m1 == a/Makefile -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 a/m2 == a/Makefile -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 a/m3 == a/Makefile % mat tvvf a.mat drwxr-xr-x 2 agc agc512 Jun 16 18:27 a -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 13bc52eeb726edc6298ac9a4d1ca2f4ccc79a8b62412c5c4ab210ffbfefe1e35 a/Makefile -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 13bc52eeb726edc6298ac9a4d1ca2f4ccc79a8b62412c5c4ab210ffbfefe1e35 a/m1 == a/Makefile -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 13bc52eeb726edc6298ac9a4d1ca2f4ccc79a8b62412c5c4ab210ffbfefe1e35 a/m2 == a/Makefile -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 13bc52eeb726edc6298ac9a4d1ca2f4ccc79a8b62412c5c4ab210ffbfefe1e35 a/m3 == a/Makefile % mat tvvf a.mat '*/*3' -rw-r--r-- 4 agc agc 1827 Jun 16 18:27 13bc52eeb726edc6298ac9a4d1ca2f4ccc79a8b62412c5c4ab210ffbfefe1e35 a/m3 == a/Makefile % archives can be read from stdin, and written to stdout, and there are checks to make sure we don't try to include the mat archive when generating a new archive: % mat tvvf - < archive2.mat -rw-r--r-- 1 agc agc510 Jun 16 18:27 d8008905d91a083115b2fb8bd469a36a94f07f9cafeb88c17a44add769d3c0a0 group lrwxr-xr-x 1 agc agc 8 Jun 16 18:27 7a6378e1ee1f9098b9fb5219e6bb2ae17df33230171ee5c2a56f0cc4335d5dfd m -> Makefile % mat cvf archive2.mat group m archive2.mat /etc/group dir ignoring attempt to add ourselves 'archive2.mat' can't stat './etc/group' can't stat 'dir' % mkdir d % cd d && mat xvf ../archive.mat group m % mat can also take its input from a template file, in the same format as NetBSD's build.sh METALOG file. The resulting mat archive uses the uid and gid provided in the template file. When extracting, using the -p switch, the "original" uid and gid are used: % cat dist/template ./d type=dir uname=root gname=wheel ./d/group type=file uname=root gname=wheel mode=0644 size=510 sha256=d8008905d91a083115b2fb8bd469a36a94f07f9cafeb88c17a44add769d3c0a0 ./d/m type=link uname=root gname=wheel mode=0755 link=Makefile % mat cvf matty -T dist/template % mat tvvf matty drwxr-xr-x 2 root wheel512 Jun 16 18:27 ./d -rw-r--r-- 1 root wheel510 Jun 16 18:27 d8008905d91a083115b2fb8bd469a36a94f07f9cafeb88c17a44add769d3c0a0 ./d/group lrwxr-xr-x 1 root wheel 8 Jun 16 18:27 7a6378e1ee1f9098b9fb5219e6bb2ae17df3
CVS commit: othersrc/external/bsd/mat/dist
Module Name:othersrc Committed By: wiz Date: Sat Jun 18 05:10:17 UTC 2011 Modified Files: othersrc/external/bsd/mat/dist: mat.1 Log Message: Sort options. Add description for -x. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/mat/dist/mat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/mat/dist/mat.1 diff -u othersrc/external/bsd/mat/dist/mat.1:1.1.1.1 othersrc/external/bsd/mat/dist/mat.1:1.2 --- othersrc/external/bsd/mat/dist/mat.1:1.1.1.1 Sat Jun 18 04:53:13 2011 +++ othersrc/external/bsd/mat/dist/mat.1 Sat Jun 18 05:10:17 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: mat.1,v 1.1.1.1 2011/06/18 04:53:13 agc Exp $ +.\" $NetBSD: mat.1,v 1.2 2011/06/18 05:10:17 wiz Exp $ .\" .\" Copyright (c) 2011 Alistair Crooks .\" All rights reserved. @@ -31,10 +31,10 @@ .Nd minimalist archive tool program .Sh SYNOPSIS .Nm -.Op Fl Vcptvx +.Op Fl cptVvx .Op Fl C Ar directory -.Op Fl T Ar template .Op Fl f Ar archive +.Op Fl T Ar template .Op Ar file ... .Sh DESCRIPTION The @@ -56,15 +56,8 @@ perform an initial .Xr chdir 2 into the specified directory before attempting to resolve any filenames. -.It Fl T Ar template -takes the names of the entries to be included in the archive -from the template file provided. -This template file is expected to be in the -.Dv METALOG -format, as generated during the -.Nx -.Dv build.sh -phase. +.It Fl c +create the archive .It Fl f Ar archive Use the .Xr libmat 3 @@ -76,12 +69,6 @@ or will be read from .Dv stdin depending on the action specified. -.It Fl V -verify the archive does not contain dangerous -entries which could compromise a machine if the archive -is extracted or listed. -.It Fl c -create the archive .It Fl p when extracting the components of the archive, preserve the file owner and group information, @@ -89,17 +76,32 @@ Setuid and setgid bits are only preserved if the program is run with an effective uid of 0. +.It Fl T Ar template +takes the names of the entries to be included in the archive +from the template file provided. +This template file is expected to be in the +.Dv METALOG +format, as generated during the +.Nx +.Dv build.sh +phase. .It Fl t list the contents of the archive on stdout. +.It Fl V +verify the archive does not contain dangerous +entries which could compromise a machine if the archive +is extracted or listed. .It Fl v perform operations in a verbose manner. -This option can be repeated to provide higher +This option can be repeated to provide higher levels of verbosity. For instance, when listing entries, a verbosity level of 2 will also show the .Xr SHA256 3 digests associated with the archive component. +.It Fl x +extract the contents of the archive. .El .Pp .Nm @@ -111,7 +113,7 @@ but without some of the constraints and limits inherent in those archivers. In addition, -digests are used to make sure that the +digests are used to make sure that the contents of the archive remain the same as when the archive was made. To protect against malicious archives, a sanity check,
CVS commit: src/distrib/evbsh3
Module Name:src
Committed By: nonaka
Date: Sat Jun 18 06:25:43 UTC 2011
Modified Files:
src/distrib/evbsh3: Makefile
Added Files:
src/distrib/evbsh3/cdroms: Makefile
src/distrib/evbsh3/cdroms/installcd: Makefile
Log Message:
Build evbsh3-${MACHINE_ARCH}cd.iso on build.sh iso-image target as other ports.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbsh3/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbsh3/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbsh3/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbsh3/Makefile
diff -u src/distrib/evbsh3/Makefile:1.1 src/distrib/evbsh3/Makefile:1.2
--- src/distrib/evbsh3/Makefile:1.1 Tue Apr 6 15:54:31 2010
+++ src/distrib/evbsh3/Makefile Sat Jun 18 06:25:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/04/06 15:54:31 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/18 06:25:43 nonaka Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,6 +6,10 @@
.if ${MACHINE_ARCH} == "sh3el"
SUBDIR= instkernel
.endif
+SUBDIR+= cdroms
TARGETS+= release
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
.include
Added files:
Index: src/distrib/evbsh3/cdroms/Makefile
diff -u /dev/null src/distrib/evbsh3/cdroms/Makefile:1.1
--- /dev/null Sat Jun 18 06:25:43 2011
+++ src/distrib/evbsh3/cdroms/Makefile Sat Jun 18 06:25:43 2011
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2011/06/18 06:25:43 nonaka Exp $
+
+SUBDIR= installcd
+TARGETS+= release iso_image
+
+.include
Index: src/distrib/evbsh3/cdroms/installcd/Makefile
diff -u /dev/null src/distrib/evbsh3/cdroms/installcd/Makefile:1.1
--- /dev/null Sat Jun 18 06:25:43 2011
+++ src/distrib/evbsh3/cdroms/installcd/Makefile Sat Jun 18 06:25:43 2011
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2011/06/18 06:25:43 nonaka Exp $
+
+CDBASE= evbsh3-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
+CDRELEASE= true# include $RELEASEDIR/$MACHINE
+
+.include "${.CURDIR}/../../../common/Makefile.bootcd"
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: matt Date: Sat Jun 18 06:36:25 UTC 2011 Modified Files: src/sys/arch/evbppc/mpc85xx: autoconf.c Log Message: Whitespace cleanup To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/mpc85xx/autoconf.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/evbppc/mpc85xx/autoconf.c diff -u src/sys/arch/evbppc/mpc85xx/autoconf.c:1.3 src/sys/arch/evbppc/mpc85xx/autoconf.c:1.4 --- src/sys/arch/evbppc/mpc85xx/autoconf.c:1.3 Thu Feb 17 13:57:12 2011 +++ src/sys/arch/evbppc/mpc85xx/autoconf.c Sat Jun 18 06:36:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.3 2011/02/17 13:57:12 matt Exp $ */ +/* $NetBSD: autoconf.c,v 1.4 2011/06/18 06:36:25 matt Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2011/02/17 13:57:12 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2011/06/18 06:36:25 matt Exp $"); #define __INTR_PRIVATE @@ -47,8 +47,8 @@ #include #include #include - #include + #include /*
CVS commit: src/sys/arch
Module Name:src
Committed By: matt
Date: Sat Jun 18 06:37:39 UTC 2011
Modified Files:
src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S
src/sys/arch/powerpc/booke: genassym.cf trap_subr.S
Log Message:
Use FRAME_Rn (like ibm4xx and oea) instead of FRAME_n.
Include psl.h to get PSL_* values instead of getting them from assym.h
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/genassym.cf \
src/sys/arch/powerpc/booke/trap_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/evbppc/mpc85xx/mpc85xx_start.S
diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.4 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.5
--- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.4 Wed Jun 8 05:09:21 2011
+++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S Sat Jun 18 06:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpc85xx_start.S,v 1.4 2011/06/08 05:09:21 matt Exp $ */
+/* $NetBSD: mpc85xx_start.S,v 1.5 2011/06/18 06:37:38 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
#include
#include
-RCSID("$NetBSD: mpc85xx_start.S,v 1.4 2011/06/08 05:09:21 matt Exp $")
+RCSID("$NetBSD: mpc85xx_start.S,v 1.5 2011/06/18 06:37:38 matt Exp $")
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -54,6 +54,7 @@
#include
#include
+#include
#include
#include
#define LBC_PRIVATE
Index: src/sys/arch/powerpc/booke/genassym.cf
diff -u src/sys/arch/powerpc/booke/genassym.cf:1.4 src/sys/arch/powerpc/booke/genassym.cf:1.5
--- src/sys/arch/powerpc/booke/genassym.cf:1.4 Wed Jun 15 17:47:45 2011
+++ src/sys/arch/powerpc/booke/genassym.cf Sat Jun 18 06:37:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.4 2011/06/15 17:47:45 matt Exp $
+# $NetBSD: genassym.cf,v 1.5 2011/06/18 06:37:38 matt Exp $
#-
# Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -66,38 +66,38 @@
define FRAMELEN FRAMELEN
define FRAME_TF offsetof(struct ktrapframe, ktf_tf)
-define FRAME_0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
-define FRAME_1 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[1])
-define FRAME_2 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[2])
-define FRAME_3 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[3])
-define FRAME_4 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[4])
-define FRAME_5 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[5])
-define FRAME_6 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[6])
-define FRAME_7 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[7])
-define FRAME_8 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[8])
-define FRAME_9 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[9])
-define FRAME_10 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[10])
-define FRAME_11 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[11])
-define FRAME_12 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[12])
-define FRAME_13 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[13])
-define FRAME_14 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[14])
-define FRAME_15 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[15])
-define FRAME_16 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[16])
-define FRAME_17 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[17])
-define FRAME_18 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[18])
-define FRAME_19 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[19])
-define FRAME_20 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[20])
-define FRAME_21 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[21])
-define FRAME_22 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[22])
-define FRAME_23 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[23])
-define FRAME_24 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[24])
-define FRAME_25 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[25])
-define FRAME_26 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[26])
-define FRAME_27 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[27])
-define FRAME_28 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[28])
-define FRAME_29 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[29])
-define FRAME_30 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[30])
-define FRAME_31 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[31])
+define FRAME_R0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
+define FRAME_R1 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[1])
+define FRAME_R2 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[2])
+define FRAME_R3 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[3])
+define FRAME_R4 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[4])
+define FRAME_R5 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[5])
+define FRAME_R6 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[6])
+define FRAME_R7 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[7])
+define FRAME_R8 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[8])
+define FRAME_R9 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[9])
+define FRAME_R10 offsetof(struct ktrapframe
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: matt Date: Sat Jun 18 06:41:44 UTC 2011 Modified Files: src/sys/arch/powerpc/ibm4xx: board_prop.c clock.c cpu.c ibm40x_machdep.c ibm4xx_autoconf.c ibm4xx_machdep.c intr.c pmap.c trap.c src/sys/arch/powerpc/ibm4xx/dev: com_opb.c ecc_plb.c gpiic_opb.c ibm405gp.c if_emac.c mal.c opb.c opbvar.h plb.c plbvar.h src/sys/arch/powerpc/ibm4xx/openbios: openbios.c src/sys/arch/powerpc/ibm4xx/pci: pci_machdep.c src/sys/arch/powerpc/isa: isa_machdep_common.c src/sys/arch/powerpc/marvell: pic_discovery.c src/sys/arch/powerpc/pci: pci_machdep_common.c pci_machdep_ofw.c pciconf_indirect.c pciconf_ofmethod.c src/sys/arch/powerpc/pic: i8259_common.c pic_i8259.c pic_prepivr.c picvar.h src/sys/arch/powerpc/powerpc: bus_dma.c db_interface.c Removed Files: src/sys/arch/powerpc/pic: pic_soft.c Log Message: Use instead of if such a file exists. Don't assume includes . Include it explicitly. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/ibm4xx/board_prop.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/ibm4xx/clock.c \ src/sys/arch/powerpc/ibm4xx/intr.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/ibm4xx/cpu.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/ibm4xx/ibm40x_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c cvs rdiff -u -r1.66 -r1.67 src/sys/arch/powerpc/ibm4xx/pmap.c cvs rdiff -u -r1.60 -r1.61 src/sys/arch/powerpc/ibm4xx/trap.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/ibm4xx/dev/mal.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/ibm4xx/dev/opb.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/ibm4xx/dev/opbvar.h \ src/sys/arch/powerpc/ibm4xx/dev/plbvar.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/ibm4xx/dev/plb.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/ibm4xx/openbios/openbios.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/isa/isa_machdep_common.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/marvell/pic_discovery.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/pci/pci_machdep_common.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/pci/pci_machdep_ofw.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/pci/pciconf_indirect.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/pci/pciconf_ofmethod.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/pic/i8259_common.c \ src/sys/arch/powerpc/pic/pic_prepivr.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/pic/pic_i8259.c cvs rdiff -u -r1.4 -r0 src/sys/arch/powerpc/pic/pic_soft.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/picvar.h cvs rdiff -u -r1.40 -r1.41 src/sys/arch/powerpc/powerpc/bus_dma.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/powerpc/powerpc/db_interface.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/board_prop.c diff -u src/sys/arch/powerpc/ibm4xx/board_prop.c:1.3 src/sys/arch/powerpc/ibm4xx/board_prop.c:1.4 --- src/sys/arch/powerpc/ibm4xx/board_prop.c:1.3 Fri May 5 18:04:41 2006 +++ src/sys/arch/powerpc/ibm4xx/board_prop.c Sat Jun 18 06:41:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: board_prop.c,v 1.3 2006/05/05 18:04:41 thorpej Exp $ */ +/* $NetBSD: board_prop.c,v 1.4 2011/06/18 06:41:41 matt Exp $ */ /* * Copyright (c) 2004 Shigeyuki Fukushima. @@ -31,14 +31,15 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: board_prop.c,v 1.3 2006/05/05 18:04:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: board_prop.c,v 1.4 2011/06/18 06:41:41 matt Exp $"); #include #include +#include #include -#include +#include prop_dictionary_t board_properties; Index: src/sys/arch/powerpc/ibm4xx/clock.c diff -u src/sys/arch/powerpc/ibm4xx/clock.c:1.24 src/sys/arch/powerpc/ibm4xx/clock.c:1.25 --- src/sys/arch/powerpc/ibm4xx/clock.c:1.24 Tue Jan 18 01:02:53 2011 +++ src/sys/arch/powerpc/ibm4xx/clock.c Sat Jun 18 06:41:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.24 2011/01/18 01:02:53 matt Exp $ */ +/* $NetBSD: clock.c,v 1.25 2011/06/18 06:41:41 matt Exp $ */ /* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */ /* @@ -33,21 +33,21 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.24 2011/01/18 01:02:53 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.25 2011/06/18 06:41:41 matt Exp $"); #include #include #include #include +#include #
