CVS commit: src/etc/rc.d
Module Name:src
Committed By: isaki
Date: Tue Jun 12 02:25:30 UTC 2012
Modified Files:
src/etc/rc.d: makemandb
Log Message:
Allows you to disable it if makemandb=NO in rc.conf.
Thanks tsutsui@ and Yasushi Oshima.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/makemandb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/makemandb
diff -u src/etc/rc.d/makemandb:1.1 src/etc/rc.d/makemandb:1.2
--- src/etc/rc.d/makemandb:1.1 Tue Feb 7 19:13:30 2012
+++ src/etc/rc.d/makemandb Tue Jun 12 02:25:29 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makemandb,v 1.1 2012/02/07 19:13:30 joerg Exp $
+# $NetBSD: makemandb,v 1.2 2012/06/12 02:25:29 isaki Exp $
#
# PROVIDE: makemandb
@@ -10,14 +10,17 @@
$_rc_subr_loaded . /etc/rc.subr
name="makemandb"
+rcvar=$name
required_files="/etc/man.conf /usr/sbin/makemandb"
start_cmd="makemandb_start"
stop_cmd=":"
makemandb_start()
{
- # Initiate update build in the background
- nice -n 5 /usr/sbin/makemandb -q > /dev/null 2>&1 &
+ if checkyesno $rcvar; then
+ # Initiate update build in the background
+ nice -n 5 /usr/sbin/makemandb -q > /dev/null 2>&1 &
+ fi
}
load_rc_config $name
CVS commit: src/share/man/man5
Module Name:src Committed By: christos Date: Mon Jun 11 23:28:19 UTC 2012 Modified Files: src/share/man/man5: fstab.5 Log Message: cross reference getfsspecname(3) To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/share/man/man5/fstab.5 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/man5/fstab.5 diff -u src/share/man/man5/fstab.5:1.40 src/share/man/man5/fstab.5:1.41 --- src/share/man/man5/fstab.5:1.40 Fri Apr 6 23:14:06 2012 +++ src/share/man/man5/fstab.5 Mon Jun 11 19:28:19 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: fstab.5,v 1.40 2012/04/07 03:14:06 christos Exp $ +.\" $NetBSD: fstab.5,v 1.41 2012/06/11 23:28:19 christos Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)fstab.5 8.1 (Berkeley) 6/5/93 .\" -.Dd February 10, 2012 +.Dd June 11, 2012 .Dt FSTAB 5 .Os .Sh NAME @@ -338,6 +338,7 @@ Some useful configuration examples. .El .Sh SEE ALSO .Xr getfsent 3 , +.Xr getfsspecname 3 , .Xr mount 8 , .Xr swapctl 8 .Sh HISTORY
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Jun 11 23:22:42 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 302-304. To generate a diff of this commit: cvs rdiff -u -r1.1.2.119 -r1.1.2.120 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.119 src/doc/CHANGES-6.0:1.1.2.120 --- src/doc/CHANGES-6.0:1.1.2.119 Mon Jun 11 21:30:08 2012 +++ src/doc/CHANGES-6.0 Mon Jun 11 23:22:42 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.119 2012/06/11 21:30:08 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.120 2012/06/11 23:22:42 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5345,3 +5345,19 @@ tests/lib/libc/sys/t_mmap.c 1.3-1.6 Prevent a crash when mmap()ing a block device. PR#38889. [martin, ticket #301] +usr.sbin/postinstall/postinstall 1.137 + + Add _tss to postinstall uid and gid checks. + [jnemeth, ticket #302] + +external/public-domain/sqlite/Makefile.inc 1.5 + + Enable usleep(3) in sqlite. + [wiz, ticket #303] + +sys/kern/uipc_usrreq.c1.137 + + Disallow passing kqueue descriptors via SCM_RIGHT auxiliary + socket messages. PR#46463. + [martin, ticket #304] +
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: riz
Date: Mon Jun 11 23:20:38 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: uipc_usrreq.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #304):
sys/kern/uipc_usrreq.c: revision 1.137
Stopgap fix for PR kern/46463: disallow passing of kqueue descriptors
via SCM_RIGHT anxiliary socket messages.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.136.8.1 src/sys/kern/uipc_usrreq.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/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.136 src/sys/kern/uipc_usrreq.c:1.136.8.1
--- src/sys/kern/uipc_usrreq.c:1.136 Sun Jun 26 16:42:43 2011
+++ src/sys/kern/uipc_usrreq.c Mon Jun 11 23:20:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.136 2011/06/26 16:42:43 christos Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.136.8.1 2012/06/11 23:20:38 riz Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.136 2011/06/26 16:42:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.136.8.1 2012/06/11 23:20:38 riz Exp $");
#include
#include
@@ -1382,7 +1382,10 @@ unp_internalize(struct mbuf **controlp)
error = EAGAIN;
goto out;
}
- if ((fp = fd_getfile(fd)) == NULL) {
+ if ((fp = fd_getfile(fd)) == NULL
+ || fp->f_type == DTYPE_KQUEUE) {
+ if (fp)
+ fd_putfile(fd);
atomic_dec_uint(&unp_rights);
nfds = i;
error = EBADF;
CVS commit: [netbsd-6] src/external/public-domain/sqlite
Module Name:src
Committed By: riz
Date: Mon Jun 11 23:15:38 UTC 2012
Modified Files:
src/external/public-domain/sqlite [netbsd-6]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by wiz in ticket #303):
external/public-domain/sqlite/Makefile.inc: revision 1.5
Make HAVE_* define match what configure finds.
In particular, this enables usleep(3) (compared to using sleep(3) before).
ok joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 \
src/external/public-domain/sqlite/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/sqlite/Makefile.inc
diff -u src/external/public-domain/sqlite/Makefile.inc:1.3.2.1 src/external/public-domain/sqlite/Makefile.inc:1.3.2.2
--- src/external/public-domain/sqlite/Makefile.inc:1.3.2.1 Mon Jun 11 17:51:41 2012
+++ src/external/public-domain/sqlite/Makefile.inc Mon Jun 11 23:15:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3.2.1 2012/06/11 17:51:41 riz Exp $
+# $NetBSD: Makefile.inc,v 1.3.2.2 2012/06/11 23:15:38 riz Exp $
WARNS= 2
@@ -6,11 +6,19 @@ SRCDIR:= ${.PARSEDIR}/dist
.PATH: ${SRCDIR}
-CPPFLAGS+= -DHAVE_READLINE=1 -DHAVE_LOCALTIME_R \
- -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \
+CPPFLAGS+= \
+ -DHAVE_GMTIME_R=1 \
+ -DHAVE_INTTYPES_H=1 \
+ -DHAVE_LOCALTIME_R=1 \
+ -DHAVE_READLINE=1 \
+ -DHAVE_STDINT_H=1 \
+ -DHAVE_STRERROR_R=1 \
+ -DHAVE_USLEEP=1 \
+ -DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_ENABLE_FTS3_PARENTHESIS \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+ -DSQLITE_ENABLE_FTS4 \
-DSQLITE_ENABLE_LOAD_EXTENSION \
- -DSQLITE_ENABLE_COLUMN_METADATA
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+ -DSQLITE_HAVE_ISNAN
CWARNFLAGS+= -Wno-shadow -Wno-unused
CVS commit: [netbsd-6] src/usr.sbin/postinstall
Module Name:src
Committed By: riz
Date: Mon Jun 11 23:09:24 UTC 2012
Modified Files:
src/usr.sbin/postinstall [netbsd-6]: postinstall
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #302):
usr.sbin/postinstall/postinstall: revision 1.137
add _tss to uid and gid checks
To generate a diff of this commit:
cvs rdiff -u -r1.129.2.5 -r1.129.2.6 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.129.2.5 src/usr.sbin/postinstall/postinstall:1.129.2.6
--- src/usr.sbin/postinstall/postinstall:1.129.2.5 Mon Feb 27 20:28:19 2012
+++ src/usr.sbin/postinstall/postinstall Mon Jun 11 23:09:24 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.129.2.5 2012/02/27 20:28:19 riz Exp $
+# $NetBSD: postinstall,v 1.129.2.6 2012/06/11 23:09:24 riz Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -880,7 +880,7 @@ do_gid()
check_ids "$1" groups "${DEST_DIR}/etc/group" \
named ntpd sshd authpf _pflogd _rwhod _proxy _timedc \
- _sdpd _httpd _mdnsd _tests _tcpdump
+ _sdpd _httpd _mdnsd _tests _tcpdump _tss
}
#
@@ -1553,7 +1553,7 @@ do_uid()
check_ids "$1" users "${DEST_DIR}/etc/master.passwd" \
named ntpd postfix sshd _pflogd _rwhod _proxy _timedc \
- _sdpd _httpd _mdnsd _tests _tcpdump
+ _sdpd _httpd _mdnsd _tests _tcpdump _tss
}
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Mon Jun 11 21:39:49 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: sqlite3-3.7.13 out. To generate a diff of this commit: cvs rdiff -u -r1.940 -r1.941 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.940 src/doc/3RDPARTY:1.941 --- src/doc/3RDPARTY:1.940 Sat Jun 9 12:39:53 2012 +++ src/doc/3RDPARTY Mon Jun 11 21:39:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.940 2012/06/09 12:39:53 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.941 2012/06/11 21:39:49 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1081,7 +1081,7 @@ original. Package: sqlite Version: pre-3.6.9 snapshot -Current Vers: 3.7.12 +Current Vers: 3.7.13 Maintainer: Richard Hipp Home Page: http://www.sqlite.org Responsible: joerg
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Jun 11 21:30:08 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket 301. To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.118 src/doc/CHANGES-6.0:1.1.2.119 --- src/doc/CHANGES-6.0:1.1.2.118 Mon Jun 11 20:57:52 2012 +++ src/doc/CHANGES-6.0 Mon Jun 11 21:30:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.118 2012/06/11 20:57:52 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.119 2012/06/11 21:30:08 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5339,3 +5339,9 @@ xsrc/external/mit/xorg-server/dist/hw/xf Enable wsfb X server on vax. [abs, ticket #300] +sys/uvm/uvm_vnode.c1.98 +tests/lib/libc/sys/t_mmap.c 1.3-1.6 + + Prevent a crash when mmap()ing a block device. PR#38889. + [martin, ticket #301] +
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Mon Jun 11 21:25:02 UTC 2012
Modified Files:
src/sys/uvm [netbsd-6]: uvm_vnode.c
src/tests/lib/libc/sys [netbsd-6]: t_mmap.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #301):
sys/uvm/uvm_vnode.c: revision 1.98
tests/lib/libc/sys/t_mmap.c: revision 1.3
tests/lib/libc/sys/t_mmap.c: revision 1.4
tests/lib/libc/sys/t_mmap.c: revision 1.5
tests/lib/libc/sys/t_mmap.c: revision 1.6
Only use generic readahead on VREG vnodes, the space used to store the
context is not valid on other types.
Prevents the crash reported in PR kern/38889, but does not fix the
mmap of block devices, more work is needed (no size on VBLK vnodes).
Do not skip the block device mmap test, as it does not crash
the kernel any more. Mark it as expected failure instead.
mmap_block:
do not use a hardcoded block device list, but query the kernel for attached
disks instead, then try to mmap the raw partition.
Use atf_tc_skip().
A test case for serious PR kern/38889: crash on open/mmap/close of block
device. The test case is skipped for the time being as it replicates the
panic described in the PR (tested on NetBSD/amd64 6.0 BETA).
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.97.8.1 src/sys/uvm/uvm_vnode.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/tests/lib/libc/sys/t_mmap.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_vnode.c
diff -u src/sys/uvm/uvm_vnode.c:1.97 src/sys/uvm/uvm_vnode.c:1.97.8.1
--- src/sys/uvm/uvm_vnode.c:1.97 Tue Sep 6 16:41:55 2011
+++ src/sys/uvm/uvm_vnode.c Mon Jun 11 21:25:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_vnode.c,v 1.97 2011/09/06 16:41:55 matt Exp $ */
+/* $NetBSD: uvm_vnode.c,v 1.97.8.1 2012/06/11 21:25:02 riz Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.97 2011/09/06 16:41:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.97.8.1 2012/06/11 21:25:02 riz Exp $");
#include "opt_uvmhist.h"
@@ -170,7 +170,8 @@ uvn_get(struct uvm_object *uobj, voff_t
UVMHIST_LOG(ubchist, "vp %p off 0x%x", vp, (int)offset, 0,0);
- if ((access_type & VM_PROT_WRITE) == 0 && (flags & PGO_LOCKED) == 0) {
+ if (vp->v_type == VREG && (access_type & VM_PROT_WRITE) == 0
+ && (flags & PGO_LOCKED) == 0) {
vn_ra_allocctx(vp);
uvm_ra_request(vp->v_ractx, advice, uobj, offset,
*npagesp << PAGE_SHIFT);
Index: src/tests/lib/libc/sys/t_mmap.c
diff -u src/tests/lib/libc/sys/t_mmap.c:1.2 src/tests/lib/libc/sys/t_mmap.c:1.2.4.1
--- src/tests/lib/libc/sys/t_mmap.c:1.2 Thu Jul 14 11:08:45 2011
+++ src/tests/lib/libc/sys/t_mmap.c Mon Jun 11 21:25:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mmap.c,v 1.2 2011/07/14 11:08:45 jruoho Exp $ */
+/* $NetBSD: t_mmap.c,v 1.2.4.1 2012/06/11 21:25:02 riz Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
* SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_mmap.c,v 1.2 2011/07/14 11:08:45 jruoho Exp $");
+__RCSID("$NetBSD: t_mmap.c,v 1.2.4.1 2012/06/11 21:25:02 riz Exp $");
#include
#include
@@ -67,9 +67,12 @@ __RCSID("$NetBSD: t_mmap.c,v 1.2 2011/07
#include
#include
#include
+#include
#include
#include
#include
+#include
+#include
static long page = 0;
static char path[] = "mmap";
@@ -152,6 +155,52 @@ map_sighandler(int signo)
_exit(signo);
}
+ATF_TC(mmap_block);
+ATF_TC_HEAD(mmap_block, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test mmap(2) with a block device");
+ atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(mmap_block, tc)
+{
+ static const int mib[] = { CTL_HW, HW_DISKNAMES };
+ static const unsigned int miblen = __arraycount(mib);
+ char *map, *dk, *drives, dev[PATH_MAX];
+ size_t len;
+ int fd = -1;
+
+ atf_tc_expect_signal(SIGSEGV, "mmap of block devices does not work "
+ "(PR kern/38889)");
+
+ ATF_REQUIRE(sysctl(mib, miblen, NULL, &len, NULL, 0) == 0);
+ drives = malloc(len);
+ ATF_REQUIRE(drives != NULL);
+ ATF_REQUIRE(sysctl(mib, miblen, drives, &len, NULL, 0) == 0);
+ for (dk = strtok(drives, " "); dk != NULL; dk = strtok(NULL, " ")) {
+ sprintf(dev, _PATH_DEV "%s%c", dk, 'a'+RAW_PART);
+ fprintf(stderr, "trying: %s\n", dev);
+
+ if ((fd = open(dev, O_RDONLY)) >= 0) {
+ (void)fprintf(stderr, "using %s\n", dev);
+ break;
+ }
+ }
+ free(drives);
+
+ if (fd < 0)
+ atf_tc_skip("failed to find suitable block device");
+
+ map = mmap(NULL, 4096, PROT_READ, MAP_FILE, fd, 0);
+ ATF_REQUIRE(map != MAP_FAILED);
+
+ (void)fprintf(stderr, "first byte %x\n", *map);
+ ATF_REQUIRE(close(fd) == 0);
+ (void)fprintf(stderr, "first byte %x\n", *map);
+
+ ATF_REQUIRE(munmap(map, 4096) == 0);
+}
+
ATF_TC(mmap_err);
ATF_TC_HEAD(mmap_err, tc)
{
@@ -444,6 +493,7 @@ ATF_TP_ADD_TCS(tp)
page = sysconf(_SC_PAGESIZE);
ATF_REQU
CVS commit: src/sys/fs/sysvbfs
Module Name:src
Committed By: agc
Date: Mon Jun 11 21:11:41 UTC 2012
Modified Files:
src/sys/fs/sysvbfs: bfs.c sysvbfs_vnops.c
Log Message:
cosmetic change: fix two casts to be of the appropriate type
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/fs/sysvbfs/bfs.c
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/sysvbfs/sysvbfs_vnops.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/fs/sysvbfs/bfs.c
diff -u src/sys/fs/sysvbfs/bfs.c:1.15 src/sys/fs/sysvbfs/bfs.c:1.16
--- src/sys/fs/sysvbfs/bfs.c:1.15 Tue May 8 14:28:55 2012
+++ src/sys/fs/sysvbfs/bfs.c Mon Jun 11 21:11:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bfs.c,v 1.15 2012/05/08 14:28:55 tsutsui Exp $ */
+/* $NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.15 2012/05/08 14:28:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $");
#define BFS_DEBUG
#include
@@ -629,7 +629,7 @@ bfs_inode_set_attr(const struct bfs *bfs
if (from != NULL) {
if (from->uid != (uid_t)-1)
to->uid = from->uid;
- if (from->gid != (uid_t)-1)
+ if (from->gid != (gid_t)-1)
to->gid = from->gid;
if (from->mode != (mode_t)-1)
to->mode = from->mode;
Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.45 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.46
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.45 Tue May 8 14:28:55 2012
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Mon Jun 11 21:11:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vnops.c,v 1.45 2012/05/08 14:28:55 tsutsui Exp $ */
+/* $NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.45 2012/05/08 14:28:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $");
#include
#include
@@ -350,7 +350,7 @@ sysvbfs_setattr(void *arg)
if (vap->va_flags != VNOVAL)
return EOPNOTSUPP;
- if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (uid_t)VNOVAL) {
+ if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL) {
uid_t uid =
(vap->va_uid != (uid_t)VNOVAL) ? vap->va_uid : attr->uid;
gid_t gid =
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Jun 11 20:57:52 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 299, 300. To generate a diff of this commit: cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.117 src/doc/CHANGES-6.0:1.1.2.118 --- src/doc/CHANGES-6.0:1.1.2.117 Mon Jun 11 18:04:56 2012 +++ src/doc/CHANGES-6.0 Mon Jun 11 20:57:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.117 2012/06/11 18:04:56 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.118 2012/06/11 20:57:52 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5323,3 +5323,19 @@ sys/arch/vax/include/asm.h 1.26 Really fix polyf/polyd macros. Now returns expected results. [abs, ticket #298] +sys/arch/vax/vsa/spx.c1.6 + + Implement WSDISPLAYIO_LINEBYTES so xwsfb works. + [abs, ticket #299] + +distrib/sets/lists/xserver/md.vax1.8 +external/mit/xorg/server/drivers/Makefile 1.62 +external/mit/xorg/server/xorg-server/Makefile.common 1.25 +external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile 1.33 +x11/Xserver/Makefile.common 1.36 +x11/Xserver/Xserver/Makefile 1.19 +xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h 1.9 + + Enable wsfb X server on vax. + [abs, ticket #300] +
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Mon Jun 11 20:53:40 UTC 2012
Modified Files:
src/external/mit/xorg/server/drivers [netbsd-6]: Makefile
src/external/mit/xorg/server/xorg-server [netbsd-6]: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos [netbsd-6]:
Makefile
src/x11/Xserver [netbsd-6]: Makefile.common
src/x11/Xserver/Xserver [netbsd-6]: Makefile
Added Files:
src/distrib/sets/lists/xserver [netbsd-6]: md.vax
Log Message:
Pull up following revision(s) (requested by abs in ticket #300):
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:
revision 1.33
x11/Xserver/Xserver/Makefile: revision 1.19
x11/Xserver/Makefile.common: revision 1.36
external/mit/xorg/server/xorg-server/Makefile.common: revision 1.25
distrib/sets/lists/xserver/md.vax: revision 1.8
external/mit/xorg/server/drivers/Makefile: revision 1.62
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:
revision 1.9
Add vax to the list of non inb() users
Enable wsfb X server on vax. Likely to be keyboard and mouse issues, but
with three additional lines of an ioctl() case in the kernel 'startx' will
display the traditional three xterms
Missed defining XSERVER_XVAX
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.8.2.2 src/distrib/sets/lists/xserver/md.vax
cvs rdiff -u -r1.60 -r1.60.4.1 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.23 -r1.23.4.1 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.31 -r1.31.4.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.35 -r1.35.10.1 src/x11/Xserver/Makefile.common
cvs rdiff -u -r1.18 -r1.18.42.1 src/x11/Xserver/Xserver/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.60 src/external/mit/xorg/server/drivers/Makefile:1.60.4.1
--- src/external/mit/xorg/server/drivers/Makefile:1.60 Tue Aug 30 04:22:56 2011
+++ src/external/mit/xorg/server/drivers/Makefile Mon Jun 11 20:53:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2011/08/30 04:22:56 macallan Exp $
+# $NetBSD: Makefile,v 1.60.4.1 2012/06/11 20:53:40 riz Exp $
# xf86-input drivers
@@ -258,6 +258,11 @@ SUBDIR+= \
.endif # ${MACHINE} == "sparc"
.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
+.if ${MACHINE} == "vax"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "vax"
+
.if ${MACHINE} == "zaurus"
SUBDIR+= \
xf86-video-wsfb
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.23 src/external/mit/xorg/server/xorg-server/Makefile.common:1.23.4.1
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.23 Tue Aug 30 04:22:56 2011
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Mon Jun 11 20:53:40 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2011/08/30 04:22:56 macallan Exp $
+# $NetBSD: Makefile.common,v 1.23.4.1 2012/06/11 20:53:40 riz Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -29,6 +29,7 @@
${MACHINE} == "shark" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
+${MACHINE} == "vax" || \
${MACHINE} == "zaurus"
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31.4.1
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31 Tue Aug 30 04:22:56 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Jun 11 20:53:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2011/08/30 04:22:56 macallan Exp $
+# $NetBSD: Makefile,v 1.31.4.1 2012/06/11 20:53:39 riz Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -98,6 +98,13 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.endfor
.endif
+.if ${MACHINE} == "vax"
+SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
# some platforms will probably need ioperm_noop.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus
Index: src/x11/Xserver/Makefile.common
diff -u src/x11/Xserver/Makefile.common:1.35 src/x11/Xserver/Makefile.common:1.35.10.1
--- src/x11/Xserver/Makefile.common:1.35 Sun Feb 8 00:50:07 2009
+++ src/x11/Xserver/Makefile.common Mon Jun 11 20:53:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2009/02/08 00:50:07 abs Exp $
+# $NetBSD: Makefile.common,v 1.35.10.1 2012/
CVS commit: [netbsd-6] xsrc/external/mit/xorg-server/dist/hw/xfree86/common
Module Name:xsrc Committed By: riz Date: Mon Jun 11 20:53:14 UTC 2012 Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/common [netbsd-6]: compiler.h Log Message: Pull up following revision(s) (requested by abs in ticket #300): external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile: revision 1.33 x11/Xserver/Xserver/Makefile: revision 1.19 x11/Xserver/Makefile.common: revision 1.36 external/mit/xorg/server/xorg-server/Makefile.common: revision 1.25 distrib/sets/lists/xserver/md.vax: revision 1.8 external/mit/xorg/server/drivers/Makefile: revision 1.62 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h: revision 1.9 Add vax to the list of non inb() users Enable wsfb X server on vax. Likely to be keyboard and mouse issues, but with three additional lines of an ioctl() case in the kernel 'startx' will display the traditional three xterms Missed defining XSERVER_XVAX To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.2.1 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8.2.1 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.8 Tue Aug 2 07:15:03 2011 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Mon Jun 11 20:53:14 2012 @@ -1370,7 +1370,7 @@ static __inline__ void stl_u(unsigned lo # else /* ix86 */ #if !defined(__SUNPRO_C) -#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) +#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__vax__) # ifdef GCCUSESGAS /* @@ -1479,7 +1479,7 @@ inl(unsigned short port) # endif /* GCCUSESGAS */ -#else /* !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */ +#else /* !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) && !defined(__vax__) */ static __inline__ void outb(unsigned short port, unsigned char val)
CVS commit: [netbsd-6] src/sys/arch/vax/vsa
Module Name:src Committed By: riz Date: Mon Jun 11 20:44:43 UTC 2012 Modified Files: src/sys/arch/vax/vsa [netbsd-6]: spx.c Log Message: Pull up following revision(s) (requested by abs in ticket #299): sys/arch/vax/vsa/spx.c: revision 1.6 >From the "why was this not done before" box: Implement WSDISPLAYIO_LINEBYTES so xwsfb works To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/vax/vsa/spx.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/vax/vsa/spx.c diff -u src/sys/arch/vax/vsa/spx.c:1.5 src/sys/arch/vax/vsa/spx.c:1.5.2.1 --- src/sys/arch/vax/vsa/spx.c:1.5 Wed Jan 11 21:26:13 2012 +++ src/sys/arch/vax/vsa/spx.c Mon Jun 11 20:44:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $ */ +/* $NetBSD: spx.c,v 1.5.2.1 2012/06/11 20:44:43 riz Exp $ */ /* * SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX * Copyright (c) 2005 Blaz Antonic @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.5.2.1 2012/06/11 20:44:43 riz Exp $"); #include #include @@ -1023,6 +1023,10 @@ spx_ioctl(void *v, void *vs, u_long cmd, WSDISPLAYIO_VIDEO_ON : WSDISPLAYIO_VIDEO_OFF; break; + case WSDISPLAYIO_LINEBYTES: + *(u_int *)data = spx_xsize; + break; + default: return EPASSTHROUGH; }
CVS commit: src
Module Name:src
Committed By: njoly
Date: Mon Jun 11 18:32:59 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/bin/sh: Makefile
Added Files:
src/tests/bin/sh: t_ulimit.sh
Log Message:
New testcase to check limits flags for ulimit builtin.
To generate a diff of this commit:
cvs rdiff -u -r1.473 -r1.474 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/bin/sh/t_ulimit.sh
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.473 src/distrib/sets/lists/tests/mi:1.474
--- src/distrib/sets/lists/tests/mi:1.473 Wed Jun 6 21:23:10 2012
+++ src/distrib/sets/lists/tests/mi Mon Jun 11 18:32:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.473 2012/06/06 21:23:10 martin Exp $
+# $NetBSD: mi,v 1.474 2012/06/11 18:32:59 njoly Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1395,6 +1395,7 @@
./usr/tests/bin/sh/t_fsplit tests-bin-tests atf
./usr/tests/bin/sh/t_here tests-bin-tests atf
./usr/tests/bin/sh/t_set_e tests-bin-tests atf
+./usr/tests/bin/sh/t_ulimit tests-bin-tests atf
./usr/tests/bin/sh/t_varquote tests-bin-tests atf
./usr/tests/bin/sh/t_wait tests-bin-tests atf
./usr/tests/bin/tartests-bin-tests
Index: src/tests/bin/sh/Makefile
diff -u src/tests/bin/sh/Makefile:1.1 src/tests/bin/sh/Makefile:1.2
--- src/tests/bin/sh/Makefile:1.1 Sat Mar 17 16:33:11 2012
+++ src/tests/bin/sh/Makefile Mon Jun 11 18:32:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2012/06/11 18:32:59 njoly Exp $
.include
@@ -11,6 +11,7 @@ TESTS_SH+= t_evaltested
TESTS_SH+= t_fsplit
TESTS_SH+= t_here
TESTS_SH+= t_set_e
+TESTS_SH+= t_ulimit
TESTS_SH+= t_varquote
TESTS_SH+= t_wait
Added files:
Index: src/tests/bin/sh/t_ulimit.sh
diff -u /dev/null src/tests/bin/sh/t_ulimit.sh:1.1
--- /dev/null Mon Jun 11 18:32:59 2012
+++ src/tests/bin/sh/t_ulimit.sh Mon Jun 11 18:32:59 2012
@@ -0,0 +1,46 @@
+# $NetBSD: t_ulimit.sh,v 1.1 2012/06/11 18:32:59 njoly Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+# ulimit builtin test.
+
+atf_test_case limits
+limits_head() {
+ atf_set "descr" "Checks for limits flags"
+}
+limits_body() {
+ atf_check -s eq:0 -o ignore -e empty \
+ /bin/sh -c "ulimit -a"
+ for l in $(ulimit -a | sed 's,^.*(,,;s, .*$,,');
+ do
+ atf_check -s eq:0 -o ignore -e empty \
+ /bin/sh -c "ulimit $l"
+ done
+}
+
+atf_init_test_cases() {
+ atf_add_test_case limits
+}
CVS commit: src/bin/sh
Module Name:src
Committed By: njoly
Date: Mon Jun 11 18:28:10 UTC 2012
Modified Files:
src/bin/sh: miscbltin.c sh.1
Log Message:
Allow thread limit queries by adding the new -r flag to ulimit. Add
the corresponding documentation in the man page.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/sh/miscbltin.c
cvs rdiff -u -r1.106 -r1.107 src/bin/sh/sh.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/miscbltin.c
diff -u src/bin/sh/miscbltin.c:1.41 src/bin/sh/miscbltin.c:1.42
--- src/bin/sh/miscbltin.c:1.41 Sat Jun 9 02:49:48 2012
+++ src/bin/sh/miscbltin.c Mon Jun 11 18:28:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: miscbltin.c,v 1.41 2012/06/09 02:49:48 christos Exp $ */
+/* $NetBSD: miscbltin.c,v 1.42 2012/06/11 18:28:10 njoly Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: miscbltin.c,v 1.41 2012/06/09 02:49:48 christos Exp $");
+__RCSID("$NetBSD: miscbltin.c,v 1.42 2012/06/11 18:28:10 njoly Exp $");
#endif
#endif /* not lint */
@@ -364,7 +364,7 @@ ulimitcmd(int argc, char **argv)
struct rlimit limit;
what = 'f';
- while ((optc = nextopt("HSabtfdsmcnplv")) != '\0')
+ while ((optc = nextopt("HSabtfdscmlrpnv")) != '\0')
switch (optc) {
case 'H':
how = HARD;
Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.106 src/bin/sh/sh.1:1.107
--- src/bin/sh/sh.1:1.106 Wed Oct 5 13:15:30 2011
+++ src/bin/sh/sh.1 Mon Jun 11 18:28:10 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: sh.1,v 1.106 2011/10/05 13:15:30 christos Exp $
+.\" $NetBSD: sh.1,v 1.107 2012/06/11 18:28:10 njoly Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -31,7 +31,7 @@
.\"
.\" @(#)sh.1 8.6 (Berkeley) 5/4/95
.\"
-.Dd October 4, 2011
+.Dd June 11, 2012
.Dt SH 1
.Os
.Sh NAME
@@ -1731,7 +1731,7 @@ command, tracked alias and not found.
For aliases the alias expansion is
printed; for commands and tracked aliases the complete pathname of the
command is printed.
-.It ulimit Oo Fl H \*(Ba Fl S Oc Oo Fl a \*(Ba Fl tfdscmlpnv Oo Ar value Oc Oc
+.It ulimit Oo Fl H \*(Ba Fl S Oc Oo Fl a \*(Ba Fl btfdscmlrpnv Oo Ar value Oc Oc
Inquire about or set the hard or soft limits on processes or set new
limits.
The choice between hard limit (which no process is allowed to
@@ -1777,6 +1777,9 @@ in use by a process (in kilobytes)
show or set the limit on how much memory a process can lock with
.Xr mlock 2
(in kilobytes)
+.It Fl r
+show or set the limit on the number of threads this user can
+have at one time
.It Fl p
show or set the limit on the number of processes this user can
have at one time
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Jun 11 18:04:57 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket #298. To generate a diff of this commit: cvs rdiff -u -r1.1.2.116 -r1.1.2.117 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.116 src/doc/CHANGES-6.0:1.1.2.117 --- src/doc/CHANGES-6.0:1.1.2.116 Mon Jun 11 17:56:14 2012 +++ src/doc/CHANGES-6.0 Mon Jun 11 18:04:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.116 2012/06/11 17:56:14 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.117 2012/06/11 18:04:56 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5318,3 +5318,8 @@ tools/gcc/Makefile1.51 environment when bootstrapping on some Linux distros. [joerg, ticket #296] +sys/arch/vax/include/asm.h 1.26 + + Really fix polyf/polyd macros. Now returns expected results. + [abs, ticket #298] +
CVS commit: [netbsd-6] src/sys/arch/vax/include
Module Name:src Committed By: riz Date: Mon Jun 11 18:03:42 UTC 2012 Modified Files: src/sys/arch/vax/include [netbsd-6]: asm.h Log Message: Pull up following revision(s) (requested by abs in ticket #298): sys/arch/vax/include/asm.h: revision 1.26 Really fix polyf/polyd macros. Now returns expected results. To generate a diff of this commit: cvs rdiff -u -r1.24.8.1 -r1.24.8.2 src/sys/arch/vax/include/asm.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/vax/include/asm.h diff -u src/sys/arch/vax/include/asm.h:1.24.8.1 src/sys/arch/vax/include/asm.h:1.24.8.2 --- src/sys/arch/vax/include/asm.h:1.24.8.1 Mon Jun 11 17:50:10 2012 +++ src/sys/arch/vax/include/asm.h Mon Jun 11 18:03:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.24.8.1 2012/06/11 17:50:10 riz Exp $ */ +/* $NetBSD: asm.h,v 1.24.8.2 2012/06/11 18:03:42 riz Exp $ */ /* * Copyright (c) 1982, 1993 * The Regents of the University of California. All rights reserved. @@ -110,11 +110,9 @@ movzwl \degree, %r2 movab \tbladdr, %r3 - clrd %r0 - jr 2f + movf (%r3)+, %r0 1: mulf2 %r1, %r0 /* result *= arg */ -2: addf2 (%r3)+, %r0 /* result += c[n] */ sobgtr %r2, 1b clrf %r1 /* r1 is 0 on finish */ @@ -125,11 +123,9 @@ movzwl \degree, %r2 movab \tbladdr, %r3 - clrd %r0 - jr 2f + movd (%r3)+, %r0 1: muld2 %r4, %r0 /* result *= arg */ -2: addd2 (%r3)+, %r0 /* result += c[n] */ sobgtr %r2, 1b clrq %r4 /* r4, r5 are 0 on finish */
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Jun 11 17:56:14 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 254, 292-296. To generate a diff of this commit: cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.115 src/doc/CHANGES-6.0:1.1.2.116 --- src/doc/CHANGES-6.0:1.1.2.115 Wed Jun 6 18:20:51 2012 +++ src/doc/CHANGES-6.0 Mon Jun 11 17:56:14 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.115 2012/06/06 18:20:51 bouyer Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.116 2012/06/11 17:56:14 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5285,3 +5285,36 @@ external/bsd/bind/dist/win32utils/win32- CVE: CVE-2012-1667 [christos, ticket #308] +sys/arch/powerpc/booke/dev/pq3sdhc.c 1.4 +sys/dev/sdmmc/sdhc.c1.11,1.13 via patch + + Support 32-bit only access to SDHC registers. + [matt, ticket #254] + +lib/libterminfo/term.h1.12 + + Add cdefs.h, so term.h is buildable on its own. PR#46492. + [dholland, ticket #292] + +sys/arch/vax/include/asm.h 1.25 + + Remove an unneeded indirect access from polyd/polyf macros for VAX. + [martin, ticket #293] + +external/public-domain/sqlite/Makefile.inc 1.4 + + Build SQLite with SQLITE_ENABLE_COLUMN_METADATA. PR#46322. + [khorben, ticket #294] + +usr.bin/nbperf/nbperf.11.4 + + Correct nbperf(1) documentation regarding the output function, + and mention what the default algorithm is. + [joerg, ticket #295] + +tools/gcc/Makefile1.51 + + Always use system zlib, to avoid the need for 32bit build + environment when bootstrapping on some Linux distros. + [joerg, ticket #296] +
CVS commit: [netbsd-6] src/usr.bin/nbperf
Module Name:src Committed By: riz Date: Mon Jun 11 17:53:20 UTC 2012 Modified Files: src/usr.bin/nbperf [netbsd-6]: nbperf.1 Log Message: Pull up following revision(s) (requested by joerg in ticket #295): usr.bin/nbperf/nbperf.1: revision 1.4 The output function is only order preserving for chm and chm3, so correct that part of the documentation and also mention what the default algorithm is. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/usr.bin/nbperf/nbperf.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/nbperf/nbperf.1 diff -u src/usr.bin/nbperf/nbperf.1:1.3 src/usr.bin/nbperf/nbperf.1:1.3.4.1 --- src/usr.bin/nbperf/nbperf.1:1.3 Fri Oct 21 23:47:11 2011 +++ src/usr.bin/nbperf/nbperf.1 Mon Jun 11 17:53:20 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: nbperf.1,v 1.3 2011/10/21 23:47:11 joerg Exp $ +.\" $NetBSD: nbperf.1,v 1.3.4.1 2012/06/11 17:53:20 riz Exp $ .\" .\" Copyright (c) 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 20, 2011 +.Dd May 31, 2012 .Dt NBPERF 1 .Os .Sh NAME @@ -48,9 +48,10 @@ .Nm reads a number of keys one per line from standard input or .Ar input . -It computes an order-preserving minimal perfect hash function and writes -it to stdout or +It computes a minimal perfect hash function and writes it to stdout or .Ar output . +The default algorithm is +.Qq Sy chm . .Pp The .Fl m
CVS commit: [netbsd-6] src/external/public-domain/sqlite
Module Name:src Committed By: riz Date: Mon Jun 11 17:51:42 UTC 2012 Modified Files: src/external/public-domain/sqlite [netbsd-6]: Makefile.inc Log Message: Pull up following revision(s) (requested by khorben in ticket #294): external/public-domain/sqlite/Makefile.inc: revision 1.4 PR/46322: Pierre Pronchery: SQLite from base is compiled without SQLITE_ENABLE_COLUMN_METADATA XXX: Pullup for 6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.2.1 src/external/public-domain/sqlite/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/Makefile.inc diff -u src/external/public-domain/sqlite/Makefile.inc:1.3 src/external/public-domain/sqlite/Makefile.inc:1.3.2.1 --- src/external/public-domain/sqlite/Makefile.inc:1.3 Fri Nov 11 01:34:18 2011 +++ src/external/public-domain/sqlite/Makefile.inc Mon Jun 11 17:51:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2011/11/11 01:34:18 christos Exp $ +# $NetBSD: Makefile.inc,v 1.3.2.1 2012/06/11 17:51:41 riz Exp $ WARNS= 2 @@ -10,6 +10,7 @@ CPPFLAGS+= -DHAVE_READLINE=1 -DHAVE_LOCA -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ - -DSQLITE_ENABLE_LOAD_EXTENSION + -DSQLITE_ENABLE_LOAD_EXTENSION \ + -DSQLITE_ENABLE_COLUMN_METADATA CWARNFLAGS+= -Wno-shadow -Wno-unused
CVS commit: [netbsd-6] src/sys/arch/vax/include
Module Name:src Committed By: riz Date: Mon Jun 11 17:50:10 UTC 2012 Modified Files: src/sys/arch/vax/include [netbsd-6]: asm.h Log Message: Pull up following revision(s) (requested by martin in ticket #293): sys/arch/vax/include/asm.h: revision 1.25 Remove an unneeded indirect access from polyd/polyf macros To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/vax/include/asm.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/vax/include/asm.h diff -u src/sys/arch/vax/include/asm.h:1.24 src/sys/arch/vax/include/asm.h:1.24.8.1 --- src/sys/arch/vax/include/asm.h:1.24 Thu Jul 28 22:54:02 2011 +++ src/sys/arch/vax/include/asm.h Mon Jun 11 17:50:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.24 2011/07/28 22:54:02 matt Exp $ */ +/* $NetBSD: asm.h,v 1.24.8.1 2012/06/11 17:50:10 riz Exp $ */ /* * Copyright (c) 1982, 1993 * The Regents of the University of California. All rights reserved. @@ -115,7 +115,7 @@ 1: mulf2 %r1, %r0 /* result *= arg */ 2: - addf2 *(%r3)+, %r0 /* result += c[n] */ + addf2 (%r3)+, %r0 /* result += c[n] */ sobgtr %r2, 1b clrf %r1 /* r1 is 0 on finish */ .endm @@ -130,7 +130,7 @@ 1: muld2 %r4, %r0 /* result *= arg */ 2: - addd2 *(%r3)+, %r0 /* result += c[n] */ + addd2 (%r3)+, %r0 /* result += c[n] */ sobgtr %r2, 1b clrq %r4 /* r4, r5 are 0 on finish */ .endm
CVS commit: [netbsd-6] src/lib/libterminfo
Module Name:src
Committed By: riz
Date: Mon Jun 11 17:48:37 UTC 2012
Modified Files:
src/lib/libterminfo [netbsd-6]: term.h
Log Message:
Pull up following revision(s) (requested by dholland in ticket #292):
lib/libterminfo/term.h: revision 1.12
Add cdefs.h per PR 46492.
To generate a diff of this commit:
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/lib/libterminfo/term.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/term.h
diff -u src/lib/libterminfo/term.h:1.10.4.1 src/lib/libterminfo/term.h:1.10.4.2
--- src/lib/libterminfo/term.h:1.10.4.1 Fri Feb 24 16:29:33 2012
+++ src/lib/libterminfo/term.h Mon Jun 11 17:48:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.10.4.1 2012/02/24 16:29:33 riz Exp $ */
+/* $NetBSD: term.h,v 1.10.4.2 2012/06/11 17:48:37 riz Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
@@ -1460,6 +1460,8 @@ typedef struct {
} TERMINAL;
#endif
+#include
+
__BEGIN_DECLS
extern TERMINAL *cur_term;
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Mon Jun 11 17:45:32 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke/dev [netbsd-6]: pq3sdhc.c
src/sys/dev/sdmmc [netbsd-6]: sdhc.c
Log Message:
Pull up following revision(s) (requested by matt in ticket #254):
sys/arch/powerpc/booke/dev/pq3sdhc.c: revision 1.4
sys/dev/sdmmc/sdhc.c: revision 1.11
sys/dev/sdmmc/sdhc.c: revision 1.13
Use the new 32-bit and ESDHC support in sdhc.c
Support 32-bit only access to the SDHC registers.
Add support for FreeScale "Enhanced" SDHC port.
Add support for CGM mode (XLP and BCM2835 (Arason)).
Do not read past array end, found by gcc -O3.
This could cause to HWRITE4() a bad value, but maybe last 2 bytes are
probably ignored by hardware anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/powerpc/booke/dev/pq3sdhc.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/dev/sdmmc/sdhc.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/dev/pq3sdhc.c
diff -u src/sys/arch/powerpc/booke/dev/pq3sdhc.c:1.3 src/sys/arch/powerpc/booke/dev/pq3sdhc.c:1.3.8.1
--- src/sys/arch/powerpc/booke/dev/pq3sdhc.c:1.3 Wed Jun 29 06:12:10 2011
+++ src/sys/arch/powerpc/booke/dev/pq3sdhc.c Mon Jun 11 17:45:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3sdhc.c,v 1.3 2011/06/29 06:12:10 matt Exp $ */
+/* $NetBSD: pq3sdhc.c,v 1.3.8.1 2012/06/11 17:45:32 riz Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pq3sdhc.c,v 1.3 2011/06/29 06:12:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3sdhc.c,v 1.3.8.1 2012/06/11 17:45:32 riz Exp $");
#include
#include
@@ -53,7 +53,6 @@ static int pq3sdhc_match(device_t, cfdat
static void pq3sdhc_attach(device_t, device_t, void *);
struct pq3sdhc_softc {
- struct powerpc_bus_space sc_mybst;
struct sdhc_softc sc;
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh;
@@ -64,114 +63,6 @@ struct pq3sdhc_softc {
CFATTACH_DECL_NEW(pq3sdhc, sizeof(struct pq3sdhc_softc),
pq3sdhc_match, pq3sdhc_attach, NULL, NULL);
-static uint8_t
-pq3sdhc_read_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
-{
- const struct pq3sdhc_softc * const sc = (const void *) t;
-
- KASSERT((o & -4) != SDHC_DATA);
-
- const uint32_t v = bus_space_read_4(sc->sc_bst, h, o & -4);
-
- return v >> ((o & 3) * 8);
-}
-
-static uint16_t
-pq3sdhc_read_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
-{
- const struct pq3sdhc_softc * const sc = (const void *) t;
-
- KASSERT((o & 1) == 0);
- KASSERT((o & -4) != SDHC_DATA);
-
- uint32_t v = bus_space_read_4(sc->sc_bst, h, o & -4);
-
- if (__predict_false(o == SDHC_HOST_VER))
- return v;
- if (__predict_false(o == SDHC_NINTR_STATUS)) {
- v |= SDHC_ERROR_INTERRUPT * ((v > 0x) != 0);
- if (v != 0)
- printf("get(INTR_STATUS)=%#x\n", v);
- }
- if (__predict_false(o == SDHC_EINTR_STATUS)) {
- if (v != 0)
- printf("get(INTR_STATUS)=%#x\n", v);
- }
-
- return v >> ((o & 2) * 8);
-}
-
-static uint32_t
-pq3sdhc_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
-{
- const struct pq3sdhc_softc * const sc = (const void *) t;
-
- KASSERT((o & 3) == 0);
-
- uint32_t v = bus_space_read_4(sc->sc_bst, h, o & -4);
-
- if (__predict_false(o == SDHC_DATA))
- v = htole32(v);
-
- return v;
-}
-
-static void
-pq3sdhc_write_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, uint8_t nv)
-{
- const struct pq3sdhc_softc * const sc = (const void *) t;
- KASSERT((o & -4) != SDHC_DATA);
- uint32_t v = bus_space_read_4(sc->sc_bst, h, o & -4);
- const u_int shift = (o & 3) * 8;
-
- if (o == SDHC_HOST_CTL) {
- nv &= ~EDSHC_HOST_CTL_RES;
- }
-
- v &= ~(0xff << shift);
- v |= (nv << shift);
-
- bus_space_write_4(sc->sc_bst, h, o & -4, v);
-}
-
-static void
-pq3sdhc_write_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, uint16_t nv)
-{
- const struct pq3sdhc_softc * const sc = (const void *) t;
- KASSERT((o & 1) == 0);
- KASSERT((o & -4) != SDHC_DATA);
- const u_int shift = (o & 2) * 8;
- uint32_t v;
-
- /*
- * Since NINTR_STATUS and EINTR_STATUS are W1C, don't bother getting
- * the previous value since we'd clear them.
- */
- if (__predict_true((o & -4) != SDHC_NINTR_STATUS)) {
- v = bus_space_read_4(sc->sc_bst, h, o & -4);
- v &= ~(0x << shift);
- v |= nv << shift;
- } else {
- v = nv << shift;
- printf("put(INTR_STATUS,%#x)\n", v);
- }
-
- bus_space_write_4(sc->sc_bst, h, o & -4, v);
-}
-
-static void
-pq3sdhc_write_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, uint32_t v)
-{
- const struct pq3sdhc_softc * const sc = (const void *) t;
-
- KASSERT((o & 3) == 0);
-
- if (__predict_false(o == SDHC_DATA))
- v = le32toh(v);
-
- bus_space_write_4(sc->sc_bst, h, o & -4, v);
-}
-
static int
pq3sdhc_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -194,19 +85,12 @@ pq3sdh
CVS commit: src/sys/external/bsd/drm/dist
Module Name:src
Committed By: tsutsui
Date: Mon Jun 11 16:51:04 UTC 2012
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_pciids.h
src/sys/external/bsd/drm/dist/shared-core: drm_pciids.txt i915_drv.h
i915_reg.h
Log Message:
Make i915drm work on Atom N4xx/D410/D510 + GMA3150 integrated graphic devices.
Patch is taken from FreeBSD:
http://www.freebsd.org/cgi/query-pr.cgi?pr=143427
and tested on MSI U135DX running NetBSD/i386 6.0_BETA2 with this patch.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/i915_reg.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/external/bsd/drm/dist/bsd-core/drm_pciids.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.7 src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.8
--- src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.7 Mon Jul 25 14:21:52 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h Mon Jun 11 16:51:04 2012
@@ -581,7 +581,9 @@
{0x8086, 0x29B2, CHIP_I9XX|CHIP_I915, "Intel Q35"}, \
{0x8086, 0x29D2, CHIP_I9XX|CHIP_I915, "Intel Q33"}, \
{0x8086, 0x2A42, CHIP_I9XX|CHIP_I965, "Mobile Intel® GM45 Express Chipset"}, \
- {0x8086, 0x2E02, CHIP_I9XX|CHIP_I965, "Intel Integrated Graphics Device"}, \
+ {0x8086, 0x2E02, CHIP_I9XX|CHIP_I965, "Intel Eaglelake"}, \
+ {0x8086, 0xA001, CHIP_I9XX|CHIP_I965, "Intel Pineview"}, \
+ {0x8086, 0xA011, CHIP_I9XX|CHIP_I965, "Intel Pineview (M)"}, \
{0x8086, 0x2E12, CHIP_I9XX|CHIP_I965, "Intel Q45/Q43"}, \
{0x8086, 0x2E22, CHIP_I9XX|CHIP_I965, "Intel G45/G43"}, \
{0, 0, 0, NULL}
Index: src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt
diff -u src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt:1.2 src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt:1.3
--- src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt:1.2 Fri Jun 19 03:50:05 2009
+++ src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt Mon Jun 11 16:51:04 2012
@@ -514,7 +514,9 @@
0x8086 0x29B2 CHIP_I9XX|CHIP_I915 "Intel Q35"
0x8086 0x29D2 CHIP_I9XX|CHIP_I915 "Intel Q33"
0x8086 0x2A42 CHIP_I9XX|CHIP_I965 "Mobile Intel® GM45 Express Chipset"
-0x8086 0x2E02 CHIP_I9XX|CHIP_I965 "Intel Integrated Graphics Device"
+0x8086 0x2E02 CHIP_I9XX|CHIP_I965 "Intel Eaglelake"
+0x8086 0xA001 CHIP_I9XX|CHIP_I965 "Intel Pineview"
+0x8086 0xA011 CHIP_I9XX|CHIP_I965 "Intel Pineview (M)"
0x8086 0x2E12 CHIP_I9XX|CHIP_I965 "Intel Q45/Q43"
0x8086 0x2E22 CHIP_I9XX|CHIP_I965 "Intel G45/G43"
Index: src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.4 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.5
--- src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.4 Thu Feb 24 08:02:55 2011
+++ src/sys/external/bsd/drm/dist/shared-core/i915_drv.h Mon Jun 11 16:51:04 2012
@@ -633,15 +633,21 @@ extern int i915_wait_ring(struct drm_dev
(dev)->pci_device == 0x2E12 || \
(dev)->pci_device == 0x2E22)
+#define IS_IGDG(dev) ((dev)->pci_device == 0xA001)
+#define IS_IGDGM(dev) ((dev)->pci_device == 0xA011)
+#define IS_IGD(dev) (IS_IGDG(dev) || IS_IGDGM(dev))
+
#define IS_G33(dev)((dev)->pci_device == 0x29C2 || \
(dev)->pci_device == 0x29B2 || \
- (dev)->pci_device == 0x29D2)
+ (dev)->pci_device == 0x29D2 || \
+ IS_IGD(dev))
#define IS_I9XX(dev) (IS_I915G(dev) || IS_I915GM(dev) || IS_I945G(dev) || \
IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev))
#define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \
- IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))
+ IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev) || \
+ IS_IGD(dev))
#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))
Index: src/sys/external/bsd/drm/dist/shared-core/i915_reg.h
diff -u src/sys/external/bsd/drm/dist/shared-core/i915_reg.h:1.1.1.1 src/sys/external/bsd/drm/dist/shared-core/i915_reg.h:1.2
--- src/sys/external/bsd/drm/dist/shared-core/i915_reg.h:1.1.1.1 Fri Jun 19 03:22:24 2009
+++ src/sys/external/bsd/drm/dist/shared-core/i915_reg.h Mon Jun 11 16:51:04 2012
@@ -334,6 +334,7 @@
#define DPLLB_LVDS_P2_CLOCK_DIV_7 (1 << 24) /* i915 */
#define DPLL_P2_CLOCK_DIV_MASK 0x0300 /* i915 */
#define DPLL_FPA01_P1_POST_DIV_MASK 0x00ff /* i915 */
+#define DPLL_FPA01_P1_POST_DIV_MASK_IGD 0x00ff8000 /* IGD */
#define I915_FIFO_UNDERRUN_STATUS (1UL<<31)
#define I915_CRC_ERROR_ENABLE (1UL<<29)
@@ -410,6 +411,7 @@
*/
#define DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS 0x003f
#define DPLL_FPA01_P1_POST_DIV_SHIFT 16
+
CVS commit: src/sys/arch/hpcsh/hpcsh
Module Name:src
Committed By: tsutsui
Date: Mon Jun 11 16:41:26 UTC 2012
Modified Files:
src/sys/arch/hpcsh/hpcsh: machdep.c
Log Message:
- explicitly include for struct pcb
- consistently use
#if NKSYMS || defined(MODULAR) || defined(DDB) || defined(KGDB)
to check kernel symbols otherwise build fails if none of them are defined
Reported by Yasushi Oshima.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/hpcsh/hpcsh/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/hpcsh/hpcsh/machdep.c
diff -u src/sys/arch/hpcsh/hpcsh/machdep.c:1.75 src/sys/arch/hpcsh/hpcsh/machdep.c:1.76
--- src/sys/arch/hpcsh/hpcsh/machdep.c:1.75 Mon Dec 20 00:25:34 2010
+++ src/sys/arch/hpcsh/hpcsh/machdep.c Mon Jun 11 16:41:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.75 2010/12/20 00:25:34 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.76 2012/06/11 16:41:26 tsutsui Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.75 2010/12/20 00:25:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76 2012/06/11 16:41:26 tsutsui Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#endif
#define ELFSIZE DB_ELFSIZE
#include
-#endif /* DDB || KGDB */
+#endif /* NKSYMS || MODULAR || DDB || KGDB */
#include /* consdev */
#include
@@ -93,6 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#endif
#include /* makebootdev() */
#include
+#include
#include
#include
@@ -194,6 +195,7 @@ machine_startup(int argc, char *argv[],
/* Symbol table size */
symbolsize = 0;
+#if NKSYMS || defined(MODULAR) || defined(DDB) || defined(KGDB)
if (memcmp(&end, ELFMAG, SELFMAG) == 0) {
Elf_Ehdr *eh = (void *)end;
Elf_Shdr *sh = (void *)(end + eh->e_shoff);
@@ -202,6 +204,7 @@ machine_startup(int argc, char *argv[],
(sh->sh_offset + sh->sh_size) > symbolsize)
symbolsize = sh->sh_offset + sh->sh_size;
}
+#endif
/* Clear BSS */
memset(edata, 0, end - edata);
@@ -287,7 +290,7 @@ machine_startup(int argc, char *argv[],
/* Initialize pmap and start to address translation */
pmap_bootstrap();
-#if NKSYMS || defined(DDB) || defined(MODULAR)
+#if NKSYMS || defined(MODULAR) || defined(DDB) || defined(KGDB)
if (symbolsize) {
ksyms_addsyms_elf(symbolsize, &end, end + symbolsize);
_DPRINTF("symbol size = %d byte\n", symbolsize);
CVS commit: src/sys/arch/landisk/landisk
Module Name:src Committed By: tsutsui Date: Mon Jun 11 16:27:58 UTC 2012 Modified Files: src/sys/arch/landisk/landisk: machdep.c Log Message: Explicitly include for struct pcb. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/landisk/landisk/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/landisk/landisk/machdep.c diff -u src/sys/arch/landisk/landisk/machdep.c:1.15 src/sys/arch/landisk/landisk/machdep.c:1.16 --- src/sys/arch/landisk/landisk/machdep.c:1.15 Fri Jul 1 19:12:53 2011 +++ src/sys/arch/landisk/landisk/machdep.c Mon Jun 11 16:27:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.15 2011/07/01 19:12:53 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.16 2012/06/11 16:27:58 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2011/07/01 19:12:53 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2012/06/11 16:27:58 tsutsui Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -103,6 +103,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include +#include #include
CVS commit: src/sys/arch/dreamcast/dreamcast
Module Name:src Committed By: tsutsui Date: Mon Jun 11 16:27:08 UTC 2012 Modified Files: src/sys/arch/dreamcast/dreamcast: machdep.c Log Message: Explicitly include for struct pcb. Fixes build error on GENERIC + no options DDB, reported by Yasushi Oshima. Should be pulled up to netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/dreamcast/dreamcast/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/dreamcast/dreamcast/machdep.c diff -u src/sys/arch/dreamcast/dreamcast/machdep.c:1.42 src/sys/arch/dreamcast/dreamcast/machdep.c:1.43 --- src/sys/arch/dreamcast/dreamcast/machdep.c:1.42 Mon Dec 20 00:25:31 2010 +++ src/sys/arch/dreamcast/dreamcast/machdep.c Mon Jun 11 16:27:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.42 2010/12/20 00:25:31 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.43 2012/06/11 16:27:08 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.42 2010/12/20 00:25:31 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2012/06/11 16:27:08 tsutsui Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -98,6 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include #include +#include #include
CVS commit: src/usr.sbin/fssconfig
Module Name:src Committed By: hannken Date: Mon Jun 11 15:25:14 UTC 2012 Modified Files: src/usr.sbin/fssconfig: fssconfig.8 Log Message: File system snapshots are no longer experimental. Forgot to chang this man page in Nov 2011. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/fssconfig/fssconfig.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/fssconfig/fssconfig.8 diff -u src/usr.sbin/fssconfig/fssconfig.8:1.7 src/usr.sbin/fssconfig/fssconfig.8:1.8 --- src/usr.sbin/fssconfig/fssconfig.8:1.7 Wed Apr 30 13:11:02 2008 +++ src/usr.sbin/fssconfig/fssconfig.8 Mon Jun 11 15:25:14 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: fssconfig.8,v 1.7 2008/04/30 13:11:02 martin Exp $ */ +.\" $NetBSD: fssconfig.8,v 1.8 2012/06/11 15:25:14 hannken Exp $ */ .\" .\" .\" Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 31, 2005 +.Dd June 11, 2012 .Dt FSSCONFIG 8 .Os .Sh NAME @@ -161,9 +161,3 @@ The .Nm command appeared in .Nx 2.0 . -.Sh BUGS -The -.Xr fss 4 -driver is -.Em experimental . -Be sure you have a backup before you use it.
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: chs Date: Mon Jun 11 15:18:26 UTC 2012 Modified Files: src/sys/arch/amd64/include: pmap.h Log Message: allow more space for modules. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/include/pmap.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/amd64/include/pmap.h diff -u src/sys/arch/amd64/include/pmap.h:1.32 src/sys/arch/amd64/include/pmap.h:1.33 --- src/sys/arch/amd64/include/pmap.h:1.32 Sun Feb 19 10:39:06 2012 +++ src/sys/arch/amd64/include/pmap.h Mon Jun 11 15:18:26 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.32 2012/02/19 10:39:06 cherry Exp $ */ +/* $NetBSD: pmap.h,v 1.33 2012/06/11 15:18:26 chs Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -188,7 +188,7 @@ #define NKL4_KIMG_ENTRIES 1 #define NKL3_KIMG_ENTRIES 1 -#define NKL2_KIMG_ENTRIES 10 +#define NKL2_KIMG_ENTRIES 16 /* * Since kva space is below the kernel in its entirety, we start off
CVS commit: src
Module Name:src
Committed By: chs
Date: Mon Jun 11 15:18:05 UTC 2012
Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_asm.S dtrace_isa.c
dtrace_subr.c
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/amd64/include: Makefile.inc asm.h
Log Message:
make dtrace work on amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/include/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/include/asm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.3 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.4
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.3 Sat Mar 13 22:31:15 2010
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S Mon Jun 11 15:18:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_asm.S,v 1.3 2010/03/13 22:31:15 christos Exp $ */
+/* $NetBSD: dtrace_asm.S,v 1.4 2012/06/11 15:18:05 chs Exp $ */
/*
* CDDL HEADER START
@@ -32,7 +32,6 @@
#define _ASM
-
#include
#include
#include
@@ -65,8 +64,6 @@
1: addq $TF_RIP,%rsp;
- .globl calltrap
- .type calltrap,@function
ENTRY(dtrace_invop_start)
/*
@@ -81,7 +78,7 @@
pushq (%rsi)
movq %rsp, %rsi
call dtrace_invop
-// ALTENTRY(dtrace_invop_callsite)
+ ALTENTRY(dtrace_invop_callsite)
addq $8, %rsp
cmpl $DTRACE_INVOP_PUSHL_EBP, %eax
je bp_push
@@ -147,7 +144,7 @@ bp_nop:
/*NOTREACHED*/
bp_ret:
-// INTR_POP
+ INTR_POP
pushq %rax /* push temp */
movq 32(%rsp), %rax /* load %rsp */
movq (%rax), %rax /* load calling RIP */
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.3 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.4
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.3 Sat Mar 13 22:31:15 2010
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c Mon Jun 11 15:18:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_isa.c,v 1.3 2010/03/13 22:31:15 christos Exp $ */
+/* $NetBSD: dtrace_isa.c,v 1.4 2012/06/11 15:18:05 chs Exp $ */
/*
* CDDL HEADER START
@@ -52,15 +52,14 @@ uint16_t dtrace_fuword16_nocheck(void *)
uint32_t dtrace_fuword32_nocheck(void *);
uint64_t dtrace_fuword64_nocheck(void *);
-uintptr_t kernelbase = (uintptr_t)KERNBASE;
-
-#define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK && \
- ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
+uintptr_t kernelbase = (uintptr_t)KERN_BASE;
+
+#define INKERNEL(va) ((intptr_t)(va) < 0)
struct amd64_frame {
struct amd64_frame *f_frame;
- int f_retaddr;
- int f_arg0;
+ uintptr_t f_retaddr;
+ uintptr_t f_arg0;
};
typedef unsigned long vm_offset_t;
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.5 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.6
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.5 Wed Aug 31 21:57:16 2011
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Mon Jun 11 15:18:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_subr.c,v 1.5 2011/08/31 21:57:16 christos Exp $ */
+/* $NetBSD: dtrace_subr.c,v 1.6 2012/06/11 15:18:05 chs Exp $ */
/*
* CDDL HEADER START
@@ -374,6 +374,18 @@ dtrace_safe_defer_signal(void)
}
#endif
+#ifdef __NetBSD__
+static __inline uint64_t
+dtrace_rdtsc(void)
+{
+ uint32_t hi, lo;
+
+ __asm volatile("rdtsc" : "=d" (hi), "=a" (lo));
+ return (((uint64_t)hi << 32) | (uint64_t) lo);
+}
+#define rdtsc dtrace_rdtsc
+#endif
+
#ifdef notyet
static int64_t tgt_cpu_tsc;
static int64_t hst_cpu_tsc;
Index: src/sys/arch/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.50 src/sys/arch/amd64/amd64/genassym.cf:1.51
--- src/sys/arch/amd64/amd64/genassym.cf:1.50 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/amd64/amd64/genassym.cf Mon Jun 11 15:18:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.50 2012/04/20 22:23:24 rmind Exp $
+# $NetBSD: genassym.cf,v 1.51 2012/06/11 15:18:05 chs Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -372,3 +372,5 @@ define PGSHIFT PGSHIFT
define VM_MIN_KERNEL_ADDRESS_HIGH32 (VM_MIN_KERNEL_ADDRESS >> 32)
define RESCHED_KPREEMPT RESCHED_KPREEMPT
+
+define SEL_RPL_MASK SEL_RPL
Index: src/sys/arch/amd64/include/Makefile.inc
diff -u src/sys/arch/amd64/include/Makefile.inc:1.3 src/sys/arch/amd64/include/Makefile.inc:1.4
--- src/sys/arch/amd64/include/Makefile.inc:1.3 Fri Nov 27 13:50:29 2009
+++ sr
