CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: njoly
Date: Mon Nov 8 09:01:44 UTC 2010
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Add _atf to uid/gid checks.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 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.108 src/usr.sbin/postinstall/postinstall:1.109
--- src/usr.sbin/postinstall/postinstall:1.108 Fri Apr 23 19:21:08 2010
+++ src/usr.sbin/postinstall/postinstall Mon Nov 8 09:01:44 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.108 2010/04/23 19:21:08 dyoung Exp $
+# $NetBSD: postinstall,v 1.109 2010/11/08 09:01:44 njoly Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -807,7 +807,7 @@
check_ids $1 groups ${DEST_DIR}/etc/group \
named ntpd sshd authpf _pflogd _rwhod _proxy _timedc \
- _sdpd _httpd _mdnsd
+ _sdpd _httpd _mdnsd _atf
}
#
@@ -1419,7 +1419,7 @@
check_ids $1 users ${DEST_DIR}/etc/master.passwd \
named ntpd postfix sshd _pflogd _rwhod _proxy _timedc \
- _sdpd _httpd _mdnsd
+ _sdpd _httpd _mdnsd _atf
}
CVS commit: src/share/man/man3
Module Name:src Committed By: enami Date: Mon Nov 8 09:43:27 UTC 2010 Modified Files: src/share/man/man3: rbtree.3 Log Message: Fix typo in previous commit. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man3/rbtree.3 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/man3/rbtree.3 diff -u src/share/man/man3/rbtree.3:1.2 src/share/man/man3/rbtree.3:1.3 --- src/share/man/man3/rbtree.3:1.2 Mon Nov 8 03:20:59 2010 +++ src/share/man/man3/rbtree.3 Mon Nov 8 09:43:27 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rbtree.3,v 1.2 2010/11/08 03:20:59 enami Exp $ +.\ $NetBSD: rbtree.3,v 1.3 2010/11/08 09:43:27 enami Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -127,7 +127,7 @@ already existing node on failure. .It Fn rb_tree_remove_node rbt rb Remove the node -.Fa node +.Fa rb from the tree .Fa rbt . .It Fn rb_tree_find_node rbt key
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Mon Nov 8 11:01:46 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
print some dmesg blub for etfs files attaching as block devices
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.65 src/sys/rump/librump/rumpvfs/rumpfs.c:1.66
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.65 Mon Sep 6 15:07:33 2010
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Nov 8 11:01:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.65 2010/09/06 15:07:33 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.66 2010/11/08 11:01:45 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.65 2010/09/06 15:07:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.66 2010/11/08 11:01:45 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -283,6 +283,7 @@
doregister(const char *key, const char *hostpath,
enum rump_etfs_type ftype, uint64_t begin, uint64_t size)
{
+ char buf[9];
struct etfs *et;
struct rumpfs_node *rn;
uint64_t fsize;
@@ -358,6 +359,11 @@
LIST_INSERT_HEAD(etfs_list, et, et_entries);
mutex_exit(etfs_lock);
+ if (ftype == RUMP_ETFS_BLK) {
+ format_bytes(buf, sizeof(buf), size);
+ aprint_verbose(%s: hostpath %s (%s)\n, key, hostpath, buf);
+ }
+
return 0;
}
#undef REGDIR
CVS commit: src/sys/arch/macppc/dev
Module Name:src Committed By: pooka Date: Mon Nov 8 12:06:47 UTC 2010 Modified Files: src/sys/arch/macppc/dev: pbms.c Log Message: usb port stuff is a goner To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/dev/pbms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/macppc/dev/pbms.c diff -u src/sys/arch/macppc/dev/pbms.c:1.9 src/sys/arch/macppc/dev/pbms.c:1.10 --- src/sys/arch/macppc/dev/pbms.c:1.9 Thu Nov 5 05:37:30 2009 +++ src/sys/arch/macppc/dev/pbms.c Mon Nov 8 12:06:47 2010 @@ -1,4 +1,4 @@ -/* $Id: pbms.c,v 1.9 2009/11/05 05:37:30 dyoung Exp $ */ +/* $Id: pbms.c,v 1.10 2010/11/08 12:06:47 pooka Exp $ */ /* * Copyright (c) 2005, Johan Wall�n @@ -367,7 +367,7 @@ sc-sc_wsmousedev = config_found(self, a, wsmousedevprint); - USB_ATTACH_SUCCESS_RETURN; + return; }
CVS commit: src/sbin/raidctl
Module Name:src
Committed By: pooka
Date: Mon Nov 8 12:42:35 UTC 2010
Modified Files:
src/sbin/raidctl: Makefile raidctl.c
Log Message:
Update RUMP_ACTION to use rumpclient.
The server must of course have some disks configured. Let's say
we have this simple server with disks as a few sparse host files:
main()
{
rump_init();
rump_pub_etfs_register(/disk1, ./disk1.img, RUMP_ETFS_BLK);
rump_pub_etfs_register(/disk2, ./disk2.img, RUMP_ETFS_BLK);
rump_pub_etfs_register(/disk3, ./disk3.img, RUMP_ETFS_BLK);
rump_pub_etfs_register(/disk4, ./disk4.img, RUMP_ETFS_BLK);
pause();
}
And we run the server:
mainbus0 (root)
Kernelized RAIDframe activated
/disk1: hostpath ./disk1.img (97 GB)
/disk2: hostpath ./disk2.img (97 GB)
/disk3: hostpath ./disk3.img (97 GB)
/disk4: hostpath ./disk4.img (97 GB)
We can then configure the raid against the server:
./raidctl -c theraid.conf raid0
And lo, we have evidence of a level1 raid in the server dmesg:
raid0: RAID Level 1
raid0: Components: /disk1 /disk2 /disk3 /disk4
raid0: Total Sectors: 409599744 (19 MB)
yea, i initialized it already in a previous run:
./raidctl -S raid0
Reconstruction is 100% complete.
Parity Re-write is 100% complete.
Copyback is 100% complete.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/raidctl/Makefile
cvs rdiff -u -r1.48 -r1.49 src/sbin/raidctl/raidctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/raidctl/Makefile
diff -u src/sbin/raidctl/Makefile:1.14 src/sbin/raidctl/Makefile:1.15
--- src/sbin/raidctl/Makefile:1.14 Sun Oct 11 12:51:58 2009
+++ src/sbin/raidctl/Makefile Mon Nov 8 12:42:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/10/11 12:51:58 pooka Exp $
+# $NetBSD: Makefile,v 1.15 2010/11/08 12:42:35 pooka Exp $
PROG= raidctl
SRCS= rf_configure.c raidctl.c
@@ -9,8 +9,7 @@
.ifdef RUMP_ACTION
CPPFLAGS+= -DRUMP_ACTION -DRUMP_SYS_IOCTL -DRUMP_SYS_CLOSE
-LDADD+= -lrumpdev_disk -lrumpdev_raidframe -lrumpdev
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+= -lrumpclient
DBG= -g
.endif
Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.48 src/sbin/raidctl/raidctl.c:1.49
--- src/sbin/raidctl/raidctl.c:1.48 Tue Mar 16 03:23:47 2010
+++ src/sbin/raidctl/raidctl.c Mon Nov 8 12:42:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl.c,v 1.48 2010/03/16 03:23:47 jld Exp $ */
+/* $NetBSD: raidctl.c,v 1.49 2010/11/08 12:42:35 pooka Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: raidctl.c,v 1.48 2010/03/16 03:23:47 jld Exp $);
+__RCSID($NetBSD: raidctl.c,v 1.49 2010/11/08 12:42:35 pooka Exp $);
#endif
@@ -58,8 +58,11 @@
#include unistd.h
#include util.h
+#ifdef RUMP_ACTION
#include rump/rump.h
+#include rump/rumpclient.h
#include rump/rump_syscalls.h
+#endif
#include dev/raidframe/raidframevar.h
#include dev/raidframe/raidframeio.h
@@ -125,7 +128,8 @@
openmode = O_RDWR; /* default to read/write */
#ifdef RUMP_ACTION
- rump_init();
+ if (rumpclient_init() == -1)
+ err(1, rump client init failed);
#endif
while ((ch = getopt(argc, argv, a:A:Bc:C:f:F:g:GiI:l:mM:r:R:sSpPuv))
CVS commit: src/tests/lib/librt
Module Name:src Committed By: njoly Date: Mon Nov 8 13:05:49 UTC 2010 Modified Files: src/tests/lib/librt: t_sem.c Log Message: Do not fail but skip tests if POSIX semaphores are not supported. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librt/t_sem.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/librt/t_sem.c diff -u src/tests/lib/librt/t_sem.c:1.1 src/tests/lib/librt/t_sem.c:1.2 --- src/tests/lib/librt/t_sem.c:1.1 Fri Jul 16 13:56:32 2010 +++ src/tests/lib/librt/t_sem.c Mon Nov 8 13:05:49 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: t_sem.c,v 1.1 2010/07/16 13:56:32 jmmv Exp $ */ +/* $NetBSD: t_sem.c,v 1.2 2010/11/08 13:05:49 njoly Exp $ */ /* * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ #include sys/cdefs.h __COPYRIGHT(@(#) Copyright (c) 2008, 2010\ The NetBSD Foundation, inc. All rights reserved.); -__RCSID($NetBSD: t_sem.c,v 1.1 2010/07/16 13:56:32 jmmv Exp $); +__RCSID($NetBSD: t_sem.c,v 1.2 2010/11/08 13:05:49 njoly Exp $); #include sys/wait.h @@ -83,7 +83,8 @@ int val; sem_t *sem_b; - ATF_REQUIRE(sysconf(_SC_SEMAPHORES) != -1); + if (sysconf(_SC_SEMAPHORES) == -1) + atf_tc_skip(POSIX semaphores not supported); sem_b = sem_open(/sem_b, O_CREAT | O_EXCL, 0644, 0); ATF_REQUIRE(sem_b != SEM_FAILED); @@ -123,6 +124,9 @@ pid_t pid; + if (sysconf(_SC_SEMAPHORES) == -1) + atf_tc_skip(POSIX semaphores not supported); + sem_a = sem_open(/sem_a, O_CREAT | O_EXCL, 0644, 0); ATF_REQUIRE(sem_a != SEM_FAILED);
CVS commit: src/tests/fs/tmpfs
Module Name:src
Committed By: pooka
Date: Mon Nov 8 15:25:50 UTC 2010
Modified Files:
src/tests/fs/tmpfs: t_mkdir.sh
Log Message:
Use su -m since _atf has nologin as its shell.
XXX: this will still fail if root's shell is csh
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/tmpfs/t_mkdir.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/fs/tmpfs/t_mkdir.sh
diff -u src/tests/fs/tmpfs/t_mkdir.sh:1.6 src/tests/fs/tmpfs/t_mkdir.sh:1.7
--- src/tests/fs/tmpfs/t_mkdir.sh:1.6 Sun Nov 7 17:51:18 2010
+++ src/tests/fs/tmpfs/t_mkdir.sh Mon Nov 8 15:25:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_mkdir.sh,v 1.6 2010/11/07 17:51:18 jmmv Exp $
+# $NetBSD: t_mkdir.sh,v 1.7 2010/11/08 15:25:50 pooka Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -111,12 +111,12 @@
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
[ ${st_gid} -eq 100 ] || atf_fail Incorrect group
- atf_check -s eq:0 -o empty -e empty su ${user} -c 'mkdir b/a'
+ atf_check -s eq:0 -o empty -e empty su -m ${user} -c 'mkdir b/a'
eval $(stat -s b/a)
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
[ ${st_gid} -eq 0 ] || atf_fail Incorrect group
- atf_check -s eq:0 -o empty -e empty su ${user} -c 'mkdir c/a'
+ atf_check -s eq:0 -o empty -e empty su -m ${user} -c 'mkdir c/a'
eval $(stat -s c/a)
[ ${st_uid} -eq $(id -u ${user}) ] || atf_fail Incorrect owner
[ ${st_gid} -eq 100 ] || atf_fail Incorrect group
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: pooka Date: Mon Nov 8 18:09:38 UTC 2010 Modified Files: src/sys/arch/mips/mips: locore_mips1.S Log Message: In TLBRead, restore PID before doing the saves so that the caller's TLB entries are used instead of the PID given as the argument. from Alessandro Forin To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/mips/mips/locore_mips1.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/mips/mips/locore_mips1.S diff -u src/sys/arch/mips/mips/locore_mips1.S:1.67 src/sys/arch/mips/mips/locore_mips1.S:1.68 --- src/sys/arch/mips/mips/locore_mips1.S:1.67 Mon Dec 14 00:46:06 2009 +++ src/sys/arch/mips/mips/locore_mips1.S Mon Nov 8 18:09:38 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_mips1.S,v 1.67 2009/12/14 00:46:06 matt Exp $ */ +/* $NetBSD: locore_mips1.S,v 1.68 2010/11/08 18:09:38 pooka Exp $ */ /* * Copyright (c) 1992, 1993 @@ -925,12 +925,12 @@ tlbr # Read from the TLB mfc0 t2, MIPS_COP_0_TLB_HI # fetch the hi entry mfc0 t3, MIPS_COP_0_TLB_LOW # fetch the low entry - sw t2, 0(a1) - sw t3, 4(a1) mtc0 t0, MIPS_COP_0_TLB_HI # restore PID - j ra mtc0 v1, MIPS_COP_0_STATUS # Restore the status register + sw t2, 0(a1) + j ra + sw t3, 4(a1) END(mips1_TLBRead) /*
CVS commit: src/tests/crypto/libcrypto
Module Name:src
Committed By: pooka
Date: Mon Nov 8 19:06:12 UTC 2010
Modified Files:
src/tests/crypto/libcrypto: t_ciphers.sh t_libcrypto.sh t_pubkey.sh
Log Message:
increase timeouts of long-running tests
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/t_ciphers.sh \
src/tests/crypto/libcrypto/t_pubkey.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/t_libcrypto.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/crypto/libcrypto/t_ciphers.sh
diff -u src/tests/crypto/libcrypto/t_ciphers.sh:1.1 src/tests/crypto/libcrypto/t_ciphers.sh:1.2
--- src/tests/crypto/libcrypto/t_ciphers.sh:1.1 Sat Jul 10 16:43:25 2010
+++ src/tests/crypto/libcrypto/t_ciphers.sh Mon Nov 8 19:06:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_ciphers.sh,v 1.1 2010/07/10 16:43:25 jmmv Exp $
+# $NetBSD: t_ciphers.sh,v 1.2 2010/11/08 19:06:12 pooka Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,6 +39,7 @@
cast_head()
{
atf_set descr Checks CAST cipher
+ atf_set timeout 300
}
cast_body()
{
Index: src/tests/crypto/libcrypto/t_pubkey.sh
diff -u src/tests/crypto/libcrypto/t_pubkey.sh:1.1 src/tests/crypto/libcrypto/t_pubkey.sh:1.2
--- src/tests/crypto/libcrypto/t_pubkey.sh:1.1 Sat Jul 10 16:43:25 2010
+++ src/tests/crypto/libcrypto/t_pubkey.sh Mon Nov 8 19:06:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_pubkey.sh,v 1.1 2010/07/10 16:43:25 jmmv Exp $
+# $NetBSD: t_pubkey.sh,v 1.2 2010/11/08 19:06:12 pooka Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -49,6 +49,7 @@
rsa_head()
{
atf_set descr Checks RSA
+ atf_set timeout 300
}
rsa_body()
{
@@ -59,6 +60,7 @@
ec_head()
{
atf_set descr Checks EC cipher
+ atf_set timeout 300
}
ec_body()
{
@@ -79,6 +81,7 @@
ecdsa_head()
{
atf_set descr Checks ECDSA algorithm
+ atf_set timeout 300
}
ecdsa_body()
{
Index: src/tests/crypto/libcrypto/t_libcrypto.sh
diff -u src/tests/crypto/libcrypto/t_libcrypto.sh:1.2 src/tests/crypto/libcrypto/t_libcrypto.sh:1.3
--- src/tests/crypto/libcrypto/t_libcrypto.sh:1.2 Sun Nov 7 17:51:16 2010
+++ src/tests/crypto/libcrypto/t_libcrypto.sh Mon Nov 8 19:06:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_libcrypto.sh,v 1.2 2010/11/07 17:51:16 jmmv Exp $
+# $NetBSD: t_libcrypto.sh,v 1.3 2010/11/08 19:06:12 pooka Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -49,6 +49,7 @@
bn_head()
{
atf_set descr Checks BIGNUM library
+ atf_set timeout 300
}
bn_body()
{
CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Mon Nov 8 19:59:20 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: machdep.c Log Message: Update cpu_model_cpuid to work for E[2345]5 machines. From Sergey Svishchev. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/hp700/hp700/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/hp700/hp700/machdep.c diff -u src/sys/arch/hp700/hp700/machdep.c:1.88 src/sys/arch/hp700/hp700/machdep.c:1.89 --- src/sys/arch/hp700/hp700/machdep.c:1.88 Sun Jun 6 12:13:35 2010 +++ src/sys/arch/hp700/hp700/machdep.c Mon Nov 8 19:59:20 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.88 2010/06/06 12:13:35 skrll Exp $ */ +/* $NetBSD: machdep.c,v 1.89 2010/11/08 19:59:20 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.88 2010/06/06 12:13:35 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.89 2010/11/08 19:59:20 skrll Exp $); #include opt_cputype.h #include opt_ddb.h @@ -843,6 +843,12 @@ case HPPA_BOARD_HP705: return hpcxs; + case HPPA_BOARD_HPE23: + case HPPA_BOARD_HPE25: + case HPPA_BOARD_HPE35: + case HPPA_BOARD_HPE45: + return hpcxl; + case HPPA_BOARD_HP735_99: case HPPA_BOARD_HP755_99: case HPPA_BOARD_HP755_125:
CVS commit: src/tests/kernel
Module Name:src
Committed By: pooka
Date: Mon Nov 8 21:38:13 UTC 2010
Modified Files:
src/tests/kernel: t_time.c
Log Message:
another long-running test, so give it some buffer
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_time.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/kernel/t_time.c
diff -u src/tests/kernel/t_time.c:1.1 src/tests/kernel/t_time.c:1.2
--- src/tests/kernel/t_time.c:1.1 Fri Feb 20 21:39:57 2009
+++ src/tests/kernel/t_time.c Mon Nov 8 21:38:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_time.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+/* $NetBSD: t_time.c,v 1.2 2010/11/08 21:38:13 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.);
-__RCSID($NetBSD: t_time.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $);
+__RCSID($NetBSD: t_time.c,v 1.2 2010/11/08 21:38:13 pooka Exp $);
#include sys/param.h
#include sys/sysctl.h
@@ -154,6 +154,7 @@
atf_tc_set_md_var(tc, require.user, root);
atf_tc_set_md_var(tc, descr,
Checks the monotonicity of the CLOCK_REALTIME implementation);
+ atf_tc_set_md_var(tc, timeout, 300);
}
ATF_TC_BODY(time, tc)
{
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Mon Nov 8 23:10:24 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: dino.c elroy.c
Log Message:
Fix the count usage of various bus_space methods that take a count.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp700/dev/elroy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.25 src/sys/arch/hp700/dev/dino.c:1.26
--- src/sys/arch/hp700/dev/dino.c:1.25 Sat Mar 6 16:57:00 2010
+++ src/sys/arch/hp700/dev/dino.c Mon Nov 8 23:10:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.25 2010/03/06 16:57:00 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.26 2010/11/08 23:10:24 skrll Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.25 2010/03/06 16:57:00 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.26 2010/11/08 23:10:24 skrll Exp $);
/* #include cardbus.h */
@@ -955,7 +955,6 @@
p++;
}
- c /= 2;
while (c--)
*a++ = *p;
}
@@ -977,7 +976,6 @@
p = (volatile uint32_t *)r-pci_io_data;
}
- c /= 4;
while (c--)
*a++ = *p;
}
@@ -1008,7 +1006,6 @@
p++;
}
- c /= 2;
while (c--)
*p = *a++;
}
@@ -1030,7 +1027,6 @@
p = (volatile uint32_t *)r-pci_io_data;
}
- c /= 4;
while (c--)
*p = *a++;
}
@@ -1206,7 +1202,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
@@ -1232,7 +1227,6 @@
{
volatile uint32_t *p;
- c /= 4;
h += o;
if (h HPPA_IOSPACE) {
p = (volatile uint32_t *)h;
@@ -1262,7 +1256,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
Index: src/sys/arch/hp700/dev/elroy.c
diff -u src/sys/arch/hp700/dev/elroy.c:1.9 src/sys/arch/hp700/dev/elroy.c:1.10
--- src/sys/arch/hp700/dev/elroy.c:1.9 Sat Apr 3 08:01:42 2010
+++ src/sys/arch/hp700/dev/elroy.c Mon Nov 8 23:10:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.9 2010/04/03 08:01:42 skrll Exp $ */
+/* $NetBSD: elroy.c,v 1.10 2010/11/08 23:10:24 skrll Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -706,7 +706,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*q++ = *p;
}
@@ -719,7 +718,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*q++ = *p;
}
@@ -732,7 +730,6 @@
h += o;
p = (volatile uint64_t *)h;
- c /= 8;
while (c--)
*q++ = *p;
}
@@ -746,7 +743,6 @@
h += o;
p = (volatile uint16_t *)h;
- c /= 2;
while (c--)
*p = *q++;
}
@@ -760,7 +756,6 @@
h += o;
p = (volatile uint32_t *)h;
- c /= 4;
while (c--)
*p = *q++;
}
@@ -774,7 +769,6 @@
h += o;
p = (volatile uint64_t *)h;
- c /= 8;
while (c--)
*p = *q++;
}
@@ -885,7 +879,6 @@
{
volatile uint16_t *p, *q = a;
- c /= 2;
h += o;
p = (volatile uint16_t *)h;
while (c--)
@@ -898,7 +891,6 @@
{
volatile uint32_t *p, *q = a;
- c /= 4;
h += o;
p = (volatile uint32_t *)h;
while (c--)
@@ -911,7 +903,6 @@
{
volatile uint64_t *p, *q = a;
- c /= 8;
h += o;
p = (volatile uint64_t *)h;
while (c--)
@@ -925,7 +916,6 @@
volatile uint16_t *p;
const uint16_t *q = a;
- c /= 2;
h += o;
p = (volatile uint16_t *)h;
while (c--)
@@ -939,7 +929,6 @@
volatile uint32_t *p;
const uint32_t *q = a;
- c /= 4;
h += o;
p = (volatile uint32_t *)h;
while (c--)
@@ -953,7 +942,6 @@
volatile uint64_t *p;
const uint64_t *q = a;
- c /= 8;
h += o;
p = (volatile uint64_t *)h;
while (c--)
CVS commit: src/tests/lib/libc/stdlib
Module Name:src
Committed By: pooka
Date: Mon Nov 8 23:28:41 UTC 2010
Modified Files:
src/tests/lib/libc/stdlib: t_environment.c
Log Message:
Increase timeout from 30 to 300 since this test runs for a long time.
XXX1: should 2x10240 loops really be *that* slow?
XXX2: is 10240 a sensible number to begin with?
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/stdlib/t_environment.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/libc/stdlib/t_environment.c
diff -u src/tests/lib/libc/stdlib/t_environment.c:1.5 src/tests/lib/libc/stdlib/t_environment.c:1.6
--- src/tests/lib/libc/stdlib/t_environment.c:1.5 Wed Nov 3 16:09:43 2010
+++ src/tests/lib/libc/stdlib/t_environment.c Mon Nov 8 23:28:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_environment.c,v 1.5 2010/11/03 16:09:43 christos Exp $ */
+/* $NetBSD: t_environment.c,v 1.6 2010/11/08 23:28:41 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_environment.c,v 1.5 2010/11/03 16:09:43 christos Exp $);
+__RCSID($NetBSD: t_environment.c,v 1.6 2010/11/08 23:28:41 pooka Exp $);
#include atf-c.h
#include errno.h
@@ -54,6 +54,7 @@
{
atf_tc_set_md_var(tc, descr,
Test putenv(3), getenv(3), unsetenv(3));
+ atf_tc_set_md_var(tc, timeout, 300);
}
ATF_TC_HEAD(t_clearenv, tc)
CVS commit: src/external/zlib/pigz/bin/pigz
Module Name:src
Committed By: lukem
Date: Tue Nov 9 00:11:37 UTC 2010
Modified Files:
src/external/zlib/pigz/bin/pigz: Makefile
Log Message:
Don't set DPADD for HOSTPROGs
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/zlib/pigz/bin/pigz/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/zlib/pigz/bin/pigz/Makefile
diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.5 src/external/zlib/pigz/bin/pigz/Makefile:1.6
--- src/external/zlib/pigz/bin/pigz/Makefile:1.5 Sat Jun 19 07:33:58 2010
+++ src/external/zlib/pigz/bin/pigz/Makefile Tue Nov 9 00:11:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/06/19 07:33:58 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/09 00:11:37 lukem Exp $
.include bsd.own.mk
@@ -10,7 +10,9 @@
SRCS= pigz.c yarn.c
MAN= pigz.1
+.if !defined(HOSTPROG)
DPADD= ${LIBM} ${LIBPTHREAD}
+.endif
LDADD= -lz -lpthread
.if ${MKPIGZGZIP} != no
CVS commit: [uebayasi-xip] src/sys/dev/tc
Module Name:src Committed By: uebayasi Date: Tue Nov 9 04:50:50 UTC 2010 Modified Files: src/sys/dev/tc [uebayasi-xip]: px.c Log Message: Reduce diff from trunk. To generate a diff of this commit: cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/dev/tc/px.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/dev/tc/px.c diff -u src/sys/dev/tc/px.c:1.37.2.1 src/sys/dev/tc/px.c:1.37.2.2 --- src/sys/dev/tc/px.c:1.37.2.1 Fri May 28 07:50:44 2010 +++ src/sys/dev/tc/px.c Tue Nov 9 04:50:50 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: px.c,v 1.37.2.1 2010/05/28 07:50:44 uebayasi Exp $ */ +/* $NetBSD: px.c,v 1.37.2.2 2010/11/09 04:50:50 uebayasi Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: px.c,v 1.37.2.1 2010/05/28 07:50:44 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: px.c,v 1.37.2.2 2010/11/09 04:50:50 uebayasi Exp $); #include sys/param.h #include sys/systm.h @@ -42,7 +42,7 @@ #include sys/malloc.h #include sys/callout.h -#include uvm/uvm.h +#include uvm/uvm.h /* XXX uvm_pageboot_alloc */ #if defined(pmax) #include mips/cpuregs.h
CVS commit: [uebayasi-xip] src/share/man/man4
Module Name:src Committed By: uebayasi Date: Tue Nov 9 06:03:26 UTC 2010 Modified Files: src/share/man/man4 [uebayasi-xip]: Makefile acpi.4 pciide.4 Added Files: src/share/man/man4 [uebayasi-xip]: schide.4 Log Message: Sync with HEAD. To generate a diff of this commit: cvs rdiff -u -r1.516.2.3 -r1.516.2.4 src/share/man/man4/Makefile cvs rdiff -u -r1.50.2.3 -r1.50.2.4 src/share/man/man4/acpi.4 cvs rdiff -u -r1.63 -r1.63.2.1 src/share/man/man4/pciide.4 cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/schide.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/Makefile diff -u src/share/man/man4/Makefile:1.516.2.3 src/share/man/man4/Makefile:1.516.2.4 --- src/share/man/man4/Makefile:1.516.2.3 Sat Nov 6 08:05:44 2010 +++ src/share/man/man4/Makefile Tue Nov 9 06:03:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.516.2.3 2010/11/06 08:05:44 uebayasi Exp $ +# $NetBSD: Makefile,v 1.516.2.4 2010/11/09 06:03:26 uebayasi Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -49,7 +49,7 @@ qe.4 qec.4 qsphy.4 \ raid.4 ral.4 ray.4 rcons.4 re.4 rgephy.4 rlphy.4 rnd.4 route.4 \ rs5c372rtc.4 rtk.4 rtw.4 rum.4 \ - satalink.4 sbus.4 scc.4 scsi.4 sd.4 se.4 seeprom.4 sem.4 \ + satalink.4 sbus.4 scc.4 schide.4 scsi.4 sd.4 se.4 seeprom.4 sem.4 \ ses.4 sf.4 sfb.4 sgsmix.4 shb.4 \ shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \ sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \ Index: src/share/man/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.50.2.3 src/share/man/man4/acpi.4:1.50.2.4 --- src/share/man/man4/acpi.4:1.50.2.3 Sat Nov 6 08:05:44 2010 +++ src/share/man/man4/acpi.4 Tue Nov 9 06:03:26 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpi.4,v 1.50.2.3 2010/11/06 08:05:44 uebayasi Exp $ +.\ $NetBSD: acpi.4,v 1.50.2.4 2010/11/09 06:03:26 uebayasi Exp $ .\ .\ Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 24, 2010 +.Dd November 7, 2010 .Dt ACPI 4 .Os .Sh NAME @@ -241,6 +241,8 @@ NS8250-, NS16450-, and NS16550-based serial ports. .It Xr fdc 4 Floppy disk controllers. +.It Xr fujitsu 4 +Fujitsu brightness, pointer, and hotkeys. .It Xr hpet 4 High Precision Event Timer .Pq Tn HPET . Index: src/share/man/man4/pciide.4 diff -u src/share/man/man4/pciide.4:1.63 src/share/man/man4/pciide.4:1.63.2.1 --- src/share/man/man4/pciide.4:1.63 Mon Oct 19 18:41:09 2009 +++ src/share/man/man4/pciide.4 Tue Nov 9 06:03:26 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pciide.4,v 1.63 2009/10/19 18:41:09 bouyer Exp $ +.\ $NetBSD: pciide.4,v 1.63.2.1 2010/11/09 06:03:26 uebayasi Exp $ .\ .\ Copyright (c) 1998,2003 Manuel Bouyer. .\ @@ -22,7 +22,7 @@ .\ INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 29, 2008 +.Dd November 7, 2010 .Dt PCIIDE 4 .Os .Sh NAME @@ -74,6 +74,9 @@ Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6) IDE Controllers: .Xr piixide 4 .It +Intel SCH IDE Controllers: +.Xr schide 4 +.It NVIDIA nForce/nForce2 IDE Controllers: .Xr viaide 4 .It @@ -138,6 +141,7 @@ .Xr piixide 4 , .Xr pnpbios 4 , .Xr satalink 4 , +.Xr schide 4 , .Xr siisata 4 , .Xr siside 4 , .Xr slide 4 , Added files: Index: src/share/man/man4/schide.4 diff -u /dev/null src/share/man/man4/schide.4:1.2.2.2 --- /dev/null Tue Nov 9 06:03:26 2010 +++ src/share/man/man4/schide.4 Tue Nov 9 06:03:26 2010 @@ -0,0 +1,47 @@ +.\ $NetBSD: schide.4,v 1.2.2.2 2010/11/09 06:03:26 uebayasi Exp $ +.\ +.\ Copyright (c) 2003 Manuel Bouyer. +.\ +.\ 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 AUTHOR ``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 AUTHOR 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
CVS commit: [uebayasi-xip] src/share/man/man9
Module Name:src Committed By: uebayasi Date: Tue Nov 9 06:03:30 UTC 2010 Modified Files: src/share/man/man9 [uebayasi-xip]: uvm.9 Log Message: Sync with HEAD. To generate a diff of this commit: cvs rdiff -u -r1.102.2.2 -r1.102.2.3 src/share/man/man9/uvm.9 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/man9/uvm.9 diff -u src/share/man/man9/uvm.9:1.102.2.2 src/share/man/man9/uvm.9:1.102.2.3 --- src/share/man/man9/uvm.9:1.102.2.2 Tue Nov 2 14:05:27 2010 +++ src/share/man/man9/uvm.9 Tue Nov 9 06:03:29 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: uvm.9,v 1.102.2.2 2010/11/02 14:05:27 uebayasi Exp $ +.\ $NetBSD: uvm.9,v 1.102.2.3 2010/11/09 06:03:29 uebayasi Exp $ .\ .\ Copyright (c) 2010 The NetBSD Froundation, Inc. .\ Copyright (c) 1998 Matthew R. Green @@ -25,7 +25,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd November 2, 2010 +.Dd November 7, 2010 .Dt UVM 9 .Os .Sh NAME @@ -1008,8 +1008,6 @@ /* vm_page counters */ int npages; /* number of pages we manage */ int free; /* number of free pages */ -int active; /* number of active pages */ -int inactive; /* number of pages that we free'd but may want back */ int paging; /* number of pages in the process of being paged out */ int wired; /* number of wired pages */ int reserve_pagedaemon; /* number of pages reserved for pagedaemon */
CVS commit: [uebayasi-xip] src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Tue Nov 9 06:03:41 UTC 2010
Modified Files:
src/sys/arch/amd64/conf [uebayasi-xip]: XEN3_DOM0
src/sys/arch/hp700/dev [uebayasi-xip]: dino.c elroy.c
src/sys/arch/hp700/hp700 [uebayasi-xip]: machdep.c
src/sys/arch/i386/conf [uebayasi-xip]: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/stand/boot [uebayasi-xip]: boot2.c
src/sys/arch/i386/stand/pxeboot [uebayasi-xip]: main.c
src/sys/arch/macppc/dev [uebayasi-xip]: pbms.c
src/sys/arch/mips/mips [uebayasi-xip]: locore_mips1.S
src/sys/arch/powerpc/conf [uebayasi-xip]: files.ibm4xx
src/sys/arch/powerpc/ibm4xx/dev [uebayasi-xip]: plb.c
src/sys/arch/powerpc/powerpc [uebayasi-xip]: bus_space.c
src/sys/arch/sparc/stand/ofwboot [uebayasi-xip]: boot.c
src/sys/arch/sparc64/sparc64 [uebayasi-xip]: vm_machdep.c
src/sys/arch/x86/include [uebayasi-xip]: pci_machdep_common.h
src/sys/arch/x86/pci [uebayasi-xip]: pciide_machdep.c
src/sys/arch/x86/x86 [uebayasi-xip]: bus_dma.c cpu.c
src/sys/arch/xen/x86 [uebayasi-xip]: cpu.c
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.2 -r1.48.2.3 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/arch/hp700/dev/elroy.c
cvs rdiff -u -r1.77.2.2 -r1.77.2.3 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.233.2.4 -r1.233.2.5 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.963.2.4 -r1.963.2.5 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.27.2.2 -r1.27.2.3 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.47.2.1 -r1.47.2.2 src/sys/arch/i386/stand/boot/boot2.c
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/arch/i386/stand/pxeboot/main.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/macppc/dev/pbms.c
cvs rdiff -u -r1.67 -r1.67.2.1 src/sys/arch/mips/mips/locore_mips1.S
cvs rdiff -u -r1.10.88.4 -r1.10.88.5 src/sys/arch/powerpc/conf/files.ibm4xx
cvs rdiff -u -r1.14.98.2 -r1.14.98.3 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.20.20.3 -r1.20.20.4 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.21.2.2 -r1.21.2.3 src/sys/arch/sparc/stand/ofwboot/boot.c
cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/arch/sparc64/sparc64/vm_machdep.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 \
src/sys/arch/x86/include/pci_machdep_common.h
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/x86/pci/pciide_machdep.c
cvs rdiff -u -r1.52.2.3 -r1.52.2.4 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.66.2.4 -r1.66.2.5 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.40.2.5 -r1.40.2.6 src/sys/arch/xen/x86/cpu.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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.48.2.2 src/sys/arch/amd64/conf/XEN3_DOM0:1.48.2.3
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.48.2.2 Tue Aug 17 06:43:53 2010
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.48.2.2 2010/08/17 06:43:53 uebayasi Exp $
+# $NetBSD: XEN3_DOM0,v 1.48.2.3 2010/11/09 06:03:37 uebayasi Exp $
include arch/amd64/conf/std.xen
@@ -432,6 +432,7 @@
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
+siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
Index: src/sys/arch/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.22.2.1 src/sys/arch/hp700/dev/dino.c:1.22.2.2
--- src/sys/arch/hp700/dev/dino.c:1.22.2.1 Fri Apr 30 14:39:23 2010
+++ src/sys/arch/hp700/dev/dino.c Tue Nov 9 06:03:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.22.2.1 2010/04/30 14:39:23 uebayasi Exp $ */
+/* $NetBSD: dino.c,v 1.22.2.2 2010/11/09 06:03:37 uebayasi Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.22.2.1 2010/04/30 14:39:23 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.22.2.2 2010/11/09 06:03:37 uebayasi Exp $);
/* #include cardbus.h */
@@ -955,7 +955,6 @@
p++;
}
- c /= 2;
while (c--)
*a++ = *p;
}
@@ -977,7 +976,6 @@
p = (volatile uint32_t *)r-pci_io_data;
}
- c /= 4;
while (c--)
*a++ = *p;
}
@@ -1008,7 +1006,6 @@
p++;
}
- c /= 2;
while (c--)
*p = *a++;
}
@@ -1030,7 +1027,6 @@
p = (volatile uint32_t *)r-pci_io_data;
}
- c /= 4;
while (c--)
*p = *a++;
}
@@ -1206,7 +1202,6 @@
{
volatile uint16_t *p;
- c /= 2;
h += o;
if (h HPPA_IOSPACE) {
p = (volatile uint16_t *)h;
@@ -1232,7 +1227,6 @@
{
CVS commit: [uebayasi-xip] src/sys/uvm
Module Name:src Committed By: uebayasi Date: Tue Nov 9 06:03:45 UTC 2010 Modified Files: src/sys/uvm [uebayasi-xip]: uvm_meter.c Log Message: Sync with HEAD. To generate a diff of this commit: cvs rdiff -u -r1.50.2.2 -r1.50.2.3 src/sys/uvm/uvm_meter.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_meter.c diff -u src/sys/uvm/uvm_meter.c:1.50.2.2 src/sys/uvm/uvm_meter.c:1.50.2.3 --- src/sys/uvm/uvm_meter.c:1.50.2.2 Fri Apr 30 14:44:38 2010 +++ src/sys/uvm/uvm_meter.c Tue Nov 9 06:03:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_meter.c,v 1.50.2.2 2010/04/30 14:44:38 uebayasi Exp $ */ +/* $NetBSD: uvm_meter.c,v 1.50.2.3 2010/11/09 06:03:44 uebayasi Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.50.2.2 2010/04/30 14:44:38 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_meter.c,v 1.50.2.3 2010/11/09 06:03:44 uebayasi Exp $); #include sys/param.h #include sys/proc.h @@ -49,8 +49,7 @@ #include sys/kernel.h #include sys/sysctl.h -#include uvm/uvm_extern.h -#include uvm/uvm_page.h +#include uvm/uvm.h #include uvm/uvm_pdpolicy.h /*
CVS commit: [uebayasi-xip] src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Tue Nov 9 06:06:31 UTC 2010
Modified Files:
src/sys/arch/powerpc/conf [uebayasi-xip]: files.ibm4xx
src/sys/arch/powerpc/ibm4xx/dev [uebayasi-xip]: plb.c
src/sys/arch/powerpc/powerpc [uebayasi-xip]: bus_space.c
src/sys/arch/x86/x86 [uebayasi-xip]: bus_dma.c cpu.c
src/sys/arch/xen/x86 [uebayasi-xip]: cpu.c
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.10.88.5 -r1.10.88.6 src/sys/arch/powerpc/conf/files.ibm4xx
cvs rdiff -u -r1.14.98.3 -r1.14.98.4 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.20.20.4 -r1.20.20.5 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.52.2.4 -r1.52.2.5 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.66.2.5 -r1.66.2.6 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.40.2.6 -r1.40.2.7 src/sys/arch/xen/x86/cpu.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/conf/files.ibm4xx
diff -u src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.5 src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.6
--- src/sys/arch/powerpc/conf/files.ibm4xx:1.10.88.5 Tue Nov 9 06:03:39 2010
+++ src/sys/arch/powerpc/conf/files.ibm4xx Tue Nov 9 06:06:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.ibm4xx,v 1.10.88.5 2010/11/09 06:03:39 uebayasi Exp $
+# $NetBSD: files.ibm4xx,v 1.10.88.6 2010/11/09 06:06:30 uebayasi Exp $
#
# IBM 4xx specific configuration info
@@ -69,7 +69,6 @@
device gpiic: i2cbus, i2c_bitbang
attach gpiic at opb
file arch/powerpc/ibm4xx/dev/gpiic_opb.c gpiic
- files.ibm4xx
# External bus
device exb {[addr = -1]}
@@ -79,10 +78,3 @@
# FlashROM on external bus
attach flash at exb with flash_exb
file arch/powerpc/ibm4xx/dev/flash_exb.c flash_exb needs-flag
-===
-
-# External bus
-#device exb {[addr = -1]}
-#attach exb at plb
-#file arch/powerpc/ibm4xx/dev/exb.c exb
- 1.12
Index: src/sys/arch/powerpc/ibm4xx/dev/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.3 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.4
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.14.98.3 Tue Nov 9 06:03:39 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Nov 9 06:06:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.14.98.3 2010/11/09 06:03:39 uebayasi Exp $ */
+/* $NetBSD: plb.c,v 1.14.98.4 2010/11/09 06:06:30 uebayasi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: plb.c,v 1.14.98.3 2010/11/09 06:03:39 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: plb.c,v 1.14.98.4 2010/11/09 06:06:30 uebayasi Exp $);
#include locators.h
#include emac.h
@@ -100,11 +100,7 @@
{ IBM405GPR, ecc, },
{ IBM405GPR, opb, },
{ IBM405GPR, pchb, },
- plb.c
{ IBM405GPR, exb, },
-===
- { IBM405GPR,exb, },
- 1.16
/* AMCC 405EX / EXR */
{ AMCC405EX, cpu, },
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.4 src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.5
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.4 Tue Nov 9 06:03:39 2010
+++ src/sys/arch/powerpc/powerpc/bus_space.c Tue Nov 9 06:06:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.20.20.4 2010/11/09 06:03:39 uebayasi Exp $ */
+/* $NetBSD: bus_space.c,v 1.20.20.5 2010/11/09 06:06:31 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.20.4 2010/11/09 06:03:39 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.20.5 2010/11/09 06:06:31 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -41,12 +41,7 @@
#include sys/extent.h
#include sys/malloc.h
- bus_space.c
-#include uvm/uvm_extern.h
-#include uvm/uvm_prot.h
-===
#include uvm/uvm.h
- 1.23
#define _POWERPC_BUS_SPACE_PRIVATE
#include machine/bus.h
Index: src/sys/arch/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.52.2.4 src/sys/arch/x86/x86/bus_dma.c:1.52.2.5
--- src/sys/arch/x86/x86/bus_dma.c:1.52.2.4 Tue Nov 9 06:03:40 2010
+++ src/sys/arch/x86/x86/bus_dma.c Tue Nov 9 06:06:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.52.2.4 2010/11/09 06:03:40 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.52.2.5 2010/11/09 06:06:31 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.52.2.4 2010/11/09 06:03:40 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.52.2.5 2010/11/09 06:06:31 uebayasi Exp $);
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -101,12 +101,7 @@
#include dev/isa/isareg.h
#include dev/isa/isavar.h
- bus_dma.c
-#include uvm/uvm_extern.h
-#include uvm/uvm_page.h
-===
#include uvm/uvm.h
- 1.56
extern paddr_t avail_end;
Index:
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: skrll
Date: Tue Nov 9 06:41:04 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa: trap.c
Log Message:
#if 0 out the trap checks around tf_iioq_{head,tail}. The sti(4) code
can/will trigger them.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.93 src/sys/arch/hppa/hppa/trap.c:1.94
--- src/sys/arch/hppa/hppa/trap.c:1.93 Wed Jul 7 01:18:39 2010
+++ src/sys/arch/hppa/hppa/trap.c Tue Nov 9 06:41:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.93 2010/07/07 01:18:39 chs Exp $ */
+/* $NetBSD: trap.c,v 1.94 2010/11/09 06:41:03 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.93 2010/07/07 01:18:39 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.94 2010/11/09 06:41:03 skrll Exp $);
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@@ -407,8 +407,10 @@
frame_sanity_check(const char *func, int line, int type, struct trapframe *tf,
struct lwp *l)
{
+#if 0
extern int kernel_text;
extern int etext;
+#endif
extern register_t kpsw;
#define SANITY(e) \
@@ -445,11 +447,12 @@
*/
if ((type ~T_USER) == T_INTERRUPT)
goto out;
-
+#if 0
SANITY(tf-tf_iioq_head = (u_int) kernel_text);
SANITY(tf-tf_iioq_head (u_int) etext);
SANITY(tf-tf_iioq_tail = (u_int) kernel_text);
SANITY(tf-tf_iioq_tail (u_int) etext);
+#endif
maxsp = uv + USPACE + PAGE_SIZE;
minsp = uv + PAGE_SIZE;
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: uebayasi Date: Tue Nov 9 06:47:24 UTC 2010 Modified Files: src/sys/arch/powerpc/powerpc: rtas.c Log Message: Use VM_PAGE_TO_PHYS(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 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/powerpc/rtas.c diff -u src/sys/arch/powerpc/powerpc/rtas.c:1.8 src/sys/arch/powerpc/powerpc/rtas.c:1.9 --- src/sys/arch/powerpc/powerpc/rtas.c:1.8 Tue Apr 8 02:33:03 2008 +++ src/sys/arch/powerpc/powerpc/rtas.c Tue Nov 9 06:47:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rtas.c,v 1.8 2008/04/08 02:33:03 garbled Exp $ */ +/* $NetBSD: rtas.c,v 1.9 2010/11/09 06:47:24 uebayasi Exp $ */ /* * CHRP RTAS support routines @@ -9,7 +9,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtas.c,v 1.8 2008/04/08 02:33:03 garbled Exp $); +__KERNEL_RCSID(0, $NetBSD: rtas.c,v 1.9 2010/11/09 06:47:24 uebayasi Exp $); #include sys/param.h #include sys/systm.h @@ -123,7 +123,7 @@ pglist, 1, 0)) goto fail; - sc-ra_base_pa = TAILQ_FIRST(pglist)-phys_addr; + sc-ra_base_pa = VM_PAGE_TO_PHYS(TAILQ_FIRST(pglist)); ih = OF_open(/rtas); if (ih == -1)
CVS commit: src/sys/arch/powerpc/ibm4xx/dev
Module Name:src
Committed By: uebayasi
Date: Tue Nov 9 06:48:19 UTC 2010
Modified Files:
src/sys/arch/powerpc/ibm4xx/dev: plb.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/ibm4xx/dev/plb.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/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.16 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.17
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.16 Sat Nov 6 16:30:15 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Nov 9 06:48:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.16 2010/11/06 16:30:15 uebayasi Exp $ */
+/* $NetBSD: plb.c,v 1.17 2010/11/09 06:48:19 uebayasi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: plb.c,v 1.16 2010/11/06 16:30:15 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: plb.c,v 1.17 2010/11/09 06:48:19 uebayasi Exp $);
#include locators.h
#include emac.h
@@ -100,7 +100,7 @@
{ IBM405GPR, ecc, },
{ IBM405GPR, opb, },
{ IBM405GPR, pchb, },
- { IBM405GPR,exb, },
+ { IBM405GPR, exb, },
/* AMCC 405EX / EXR */
{ AMCC405EX, cpu, },
