CVS commit: src/tests/fs/zfs
Module Name:src
Committed By: jruoho
Date: Mon Sep 19 06:38:02 UTC 2011
Modified Files:
src/tests/fs/zfs: t_zpool.sh
Log Message:
Point to PR misc/44708 when failing. XXX: Remove once the test is fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/zfs/t_zpool.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/zfs/t_zpool.sh
diff -u src/tests/fs/zfs/t_zpool.sh:1.1 src/tests/fs/zfs/t_zpool.sh:1.2
--- src/tests/fs/zfs/t_zpool.sh:1.1 Thu Mar 10 20:02:27 2011
+++ src/tests/fs/zfs/t_zpool.sh Mon Sep 19 06:38:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_zpool.sh,v 1.1 2011/03/10 20:02:27 pooka Exp $
+# $NetBSD: t_zpool.sh,v 1.2 2011/09/19 06:38:02 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,6 +43,8 @@
create_body()
{
+ atf_expect_fail PR misc/44708
+
atf_check -s exit:0 -o ignore -e ignore ${server} ${RUMP_SERVER}
export LD_PRELOAD=/usr/lib/librumphijack.so
CVS commit: src/sys/dev/usb
Module Name:src Committed By: plunky Date: Mon Sep 19 08:20:21 UTC 2011 Modified Files: src/sys/dev/usb: usbdevs Log Message: add Kingston DataTraveler 102 G2 To generate a diff of this commit: cvs rdiff -u -r1.594 -r1.595 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.594 src/sys/dev/usb/usbdevs:1.595 --- src/sys/dev/usb/usbdevs:1.594 Sat Sep 3 16:19:47 2011 +++ src/sys/dev/usb/usbdevs Mon Sep 19 08:20:20 2011 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.594 2011/09/03 16:19:47 mlelstv Exp $ +$NetBSD: usbdevs,v 1.595 2011/09/19 08:20:20 plunky Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1672,6 +1672,7 @@ /* Kingston products */ product KINGSTON XX1 0x0008 Ethernet Adapter product KINGSTON KNU101TX 0x000a KNU101TX USB Ethernet +product KINGSTON DT102_G2 0x1624 DT 102 G2 product KINGSTON DT101_II 0x1625 DT 101 II product KINGSTON DTMINI10 0x162c DT Mini 10 product KINGSTON DT101_G2 0x1642 DT 101 G2
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: plunky
Date: Mon Sep 19 08:22:51 UTC 2011
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen for Kingston DataTraveler 102 G2
To generate a diff of this commit:
cvs rdiff -u -r1.587 -r1.588 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.588 -r1.589 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.587 src/sys/dev/usb/usbdevs.h:1.588
--- src/sys/dev/usb/usbdevs.h:1.587 Sat Sep 3 16:21:18 2011
+++ src/sys/dev/usb/usbdevs.h Mon Sep 19 08:22:51 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.587 2011/09/03 16:21:18 mlelstv Exp $ */
+/* $NetBSD: usbdevs.h,v 1.588 2011/09/19 08:22:51 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.594 2011/09/03 16:19:47 mlelstv Exp
+ * NetBSD: usbdevs,v 1.595 2011/09/19 08:20:20 plunky Exp
*/
/*
@@ -1679,6 +1679,7 @@
/* Kingston products */
#define USB_PRODUCT_KINGSTON_XX1 0x0008 /* Ethernet Adapter */
#define USB_PRODUCT_KINGSTON_KNU101TX 0x000a /* KNU101TX USB Ethernet */
+#define USB_PRODUCT_KINGSTON_DT102_G2 0x1624 /* DT 102 G2 */
#define USB_PRODUCT_KINGSTON_DT101_II 0x1625 /* DT 101 II */
#define USB_PRODUCT_KINGSTON_DTMINI10 0x162c /* DT Mini 10 */
#define USB_PRODUCT_KINGSTON_DT101_G2 0x1642 /* DT 101 G2 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.588 src/sys/dev/usb/usbdevs_data.h:1.589
--- src/sys/dev/usb/usbdevs_data.h:1.588 Sat Sep 3 16:21:18 2011
+++ src/sys/dev/usb/usbdevs_data.h Mon Sep 19 08:22:51 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.588 2011/09/03 16:21:18 mlelstv Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.589 2011/09/19 08:22:51 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.594 2011/09/03 16:19:47 mlelstv Exp
+ * NetBSD: usbdevs,v 1.595 2011/09/19 08:20:20 plunky Exp
*/
/*
@@ -5087,6 +5087,10 @@
KNU101TX USB Ethernet,
},
{
+ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT102_G2,
+ DT 102 G2,
+ },
+ {
USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT101_II,
DT 101 II,
},
@@ -8543,4 +8547,4 @@
Prestige,
},
};
-const int usb_nproducts = 1629;
+const int usb_nproducts = 1630;
CVS commit: src/sys/conf
Module Name:src Committed By: jnemeth Date: Mon Sep 19 08:53:31 UTC 2011 Modified Files: src/sys/conf: files Log Message: dm(4) uses dk_lookup() from dksubr.c To generate a diff of this commit: cvs rdiff -u -r1.1026 -r1.1027 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1026 src/sys/conf/files:1.1027 --- src/sys/conf/files:1.1026 Sat Aug 27 17:05:57 2011 +++ src/sys/conf/files Mon Sep 19 08:53:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1026 2011/08/27 17:05:57 bouyer Exp $ +# $NetBSD: files,v 1.1027 2011/09/19 08:53:30 jnemeth Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -1420,7 +1420,7 @@ file dev/cgd_crypto.c cgd file dev/clock_subr.c file dev/clockctl.c clockctl needs-flag -file dev/dksubr.c cgd | xbd | ccd | raid +file dev/dksubr.c cgd | xbd | ccd | raid | dm file dev/dkwedge/dk.c file dev/dkwedge/dkwedge_bsdlabel.c dkwedge_method_bsdlabel file dev/dkwedge/dkwedge_gpt.c dkwedge_method_gpt
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: gsutre
Date: Mon Sep 19 10:03:32 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
PR/38356: Minoura Makoto: Use the device's unit (instead of autoconf's)
to match the bootinfo root device.
Fixes multiboot(8) root= option as well as GRUB knetbsd --root option.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x86/x86/x86_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.60 src/sys/arch/x86/x86/x86_autoconf.c:1.61
--- src/sys/arch/x86/x86/x86_autoconf.c:1.60 Sat Jul 2 13:09:31 2011
+++ src/sys/arch/x86/x86/x86_autoconf.c Mon Sep 19 10:03:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.61 2011/09/19 10:03:32 gsutre Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.61 2011/09/19 10:03:32 gsutre Exp $);
#include sys/param.h
#include sys/systm.h
@@ -442,7 +442,7 @@
len = strlen(cd-cf_name);
if (strncmp(cd-cf_name, biv-devname, len) == 0
- biv-devname[len] - '0' == cd-cf_unit) {
+ biv-devname[len] - '0' == device_unit(dv)) {
handle_wedges(dv, biv-devname[len + 1] - 'a');
break;
}
CVS commit: src/sbin/gpt
Module Name:src Committed By: wiz Date: Mon Sep 19 10:40:35 UTC 2011 Modified Files: src/sbin/gpt: gpt.8 Log Message: Minimally document gpt recover. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/gpt.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/gpt/gpt.8 diff -u src/sbin/gpt/gpt.8:1.7 src/sbin/gpt/gpt.8:1.8 --- src/sbin/gpt/gpt.8:1.7 Sun Mar 27 01:01:07 2011 +++ src/sbin/gpt/gpt.8 Mon Sep 19 10:40:35 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: gpt.8,v 1.7 2011/03/27 01:01:07 jym Exp $ +.\ $NetBSD: gpt.8,v 1.8 2011/09/19 10:40:35 wiz Exp $ .\ .\ Copyright (c) 2002 Marcel Moolenaar .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $ .\ -.Dd March 27, 2011 +.Dd September 19, 2011 .Dt GPT 8 .Os .Sh NAME @@ -259,6 +259,13 @@ .Bx disk labels into GPT partitions by creating the GPT equivalent of a slice. +.\ recover +.It Nm Ic recover Ar device ... +The +.Ic recover +command tries to restore the GPT partition label from the backup +near the end of the disk. +It is very useful in case the primary label was deleted. .\ remove .It Nm Ic remove Oo Fl a Oc Ar device ... .It Nm Ic remove Oo Fl b Ar number Oc Oo Fl i Ar index Oc \
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jruoho Date: Mon Sep 19 11:04:34 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add missing entries. To generate a diff of this commit: cvs rdiff -u -r1.391 -r1.392 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.391 src/distrib/sets/lists/tests/mi:1.392 --- src/distrib/sets/lists/tests/mi:1.391 Mon Sep 19 05:40:39 2011 +++ src/distrib/sets/lists/tests/mi Mon Sep 19 11:04:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.391 2011/09/19 05:40:39 jruoho Exp $ +# $NetBSD: mi,v 1.392 2011/09/19 11:04:33 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -359,11 +359,16 @@ ./usr/libdata/debug/usr/tests/lib/libc/gen/t_closefrom.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_dir.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_fmtcheck.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpclassify.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetmask.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetround.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_fmtcheck.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_getcwd.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_getgrent.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_glob.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_glob_star.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/gen/t_humanize_number.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_isnan.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_ldexp.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/gen/t_nice.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_pause.debug tests-lib-debug debug,atf @@ -1885,11 +1890,15 @@ ./usr/tests/lib/libc/gen/t_closefrom tests-lib-tests atf ./usr/tests/lib/libc/gen/t_dir tests-lib-tests atf ./usr/tests/lib/libc/gen/t_fmtcheck tests-lib-tests atf +./usr/tests/lib/libc/gen/t_fpsclassify tests-lib-tests atf +./usr/tests/lib/libc/gen/t_fpsetmask tests-lib-tests atf +./usr/tests/lib/libc/gen/t_fpsetround tests-lib-tests atf ./usr/tests/lib/libc/gen/t_getcwd tests-lib-tests atf ./usr/tests/lib/libc/gen/t_getgrent tests-lib-tests atf ./usr/tests/lib/libc/gen/t_glob tests-lib-tests atf ./usr/tests/lib/libc/gen/t_glob_star tests-obsolete obsolete ./usr/tests/lib/libc/gen/t_humanize_number tests-lib-tests atf +./usr/tests/lib/libc/gen/t_isnan tests-lib-tests atf ./usr/tests/lib/libc/gen/t_ldexp tests-obsolete obsolete ./usr/tests/lib/libc/gen/t_nice tests-lib-tests atf ./usr/tests/lib/libc/gen/t_pause tests-lib-tests atf
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: gdt Date: Mon Sep 19 11:18:02 UTC 2011 Modified Files: src/sys/ufs/ufs: ufs_wapbl.h Log Message: Remove prototype for the departed wapbl_ufs_rename. ok dholland@ To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/ufs/ufs_wapbl.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/ufs/ufs/ufs_wapbl.h diff -u src/sys/ufs/ufs/ufs_wapbl.h:1.6 src/sys/ufs/ufs/ufs_wapbl.h:1.7 --- src/sys/ufs/ufs/ufs_wapbl.h:1.6 Wed Nov 18 12:22:48 2009 +++ src/sys/ufs/ufs/ufs_wapbl.h Mon Sep 19 11:18:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_wapbl.h,v 1.6 2009/11/18 12:22:48 yamt Exp $ */ +/* $NetBSD: ufs_wapbl.h,v 1.7 2011/09/19 11:18:01 gdt Exp $ */ /*- * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc. @@ -90,8 +90,6 @@ #error Undefine WAPBL_DEBUG_INODES or update the code. Have a nice day. #endif -int wapbl_ufs_rename(void *v); - #ifdef WAPBL_DEBUG_INODES void ufs_wapbl_verify_inodes(struct mount *, const char *); #endif
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: njoly Date: Mon Sep 19 11:57:11 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Small typo (t_fpsclassify - t_fpclassify). To generate a diff of this commit: cvs rdiff -u -r1.392 -r1.393 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.392 src/distrib/sets/lists/tests/mi:1.393 --- src/distrib/sets/lists/tests/mi:1.392 Mon Sep 19 11:04:33 2011 +++ src/distrib/sets/lists/tests/mi Mon Sep 19 11:57:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.392 2011/09/19 11:04:33 jruoho Exp $ +# $NetBSD: mi,v 1.393 2011/09/19 11:57:11 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1890,7 +1890,7 @@ ./usr/tests/lib/libc/gen/t_closefrom tests-lib-tests atf ./usr/tests/lib/libc/gen/t_dir tests-lib-tests atf ./usr/tests/lib/libc/gen/t_fmtcheck tests-lib-tests atf -./usr/tests/lib/libc/gen/t_fpsclassify tests-lib-tests atf +./usr/tests/lib/libc/gen/t_fpclassify tests-lib-tests atf ./usr/tests/lib/libc/gen/t_fpsetmask tests-lib-tests atf ./usr/tests/lib/libc/gen/t_fpsetround tests-lib-tests atf ./usr/tests/lib/libc/gen/t_getcwd tests-lib-tests atf
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Mon Sep 19 12:52:32 UTC 2011 Modified Files: src/sys/arch/usermode/usermode: pmap.c Log Message: Small cleanups on memory initialisation by using munmap() instead of mapping unaccessible anon memory that we're never going to use anyway! To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/usermode/usermode/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/usermode/usermode/pmap.c diff -u src/sys/arch/usermode/usermode/pmap.c:1.72 src/sys/arch/usermode/usermode/pmap.c:1.73 --- src/sys/arch/usermode/usermode/pmap.c:1.72 Fri Sep 16 16:27:39 2011 +++ src/sys/arch/usermode/usermode/pmap.c Mon Sep 19 12:52:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.72 2011/09/16 16:27:39 reinoud Exp $ */ +/* $NetBSD: pmap.c,v 1.73 2011/09/19 12:52:32 reinoud Exp $ */ /*- * Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.72 2011/09/16 16:27:39 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.73 2011/09/19 12:52:32 reinoud Exp $); #include opt_memsize.h #include opt_kmempages.h @@ -127,6 +127,7 @@ vaddr_t va; uintptr_t pg; void *addr; + int err; extern void _start(void); /* start of kernel */ extern int etext; /* end of the kernel */ @@ -157,7 +158,7 @@ /* calculate memory lengths */ barrier_len = 2 * 1024 * 1024; - user_len= kmem_k_start - barrier_len; + user_len= kmem_k_start - vm_min_addr - barrier_len; /* devide memory */ mem_uvm = (void *) vm_min_addr; @@ -188,27 +189,17 @@ aprint_verbose(\n\n); -#if 1 /* protect user memory UVM area (---) */ - addr = thunk_mmap((void*) mem_uvm, - kmem_user_end - vm_min_addr, - THUNK_PROT_NONE, - THUNK_MAP_ANON | THUNK_MAP_FIXED | THUNK_MAP_PRIVATE, - -1, 0); - if (addr != (void *) mem_uvm) + err = thunk_munmap(mem_uvm, kmem_user_end - vm_min_addr); + if (err) panic(pmap_bootstrap: userland uvm space protection - failed (%p)\n, (void *)addr); + failed (%d)\n, thunk_geterrno()); - /* protect user memory UVM area (---) */ - addr = thunk_mmap((void*) kmem_ext_start, - KVMSIZE, - THUNK_PROT_NONE, - THUNK_MAP_ANON | THUNK_MAP_FIXED | THUNK_MAP_PRIVATE, - -1, 0); - if (addr != (void *) kmem_ext_start) + /* protect kvm UVM area (---) */ + err = thunk_munmap((void *) kmem_ext_start, KVMSIZE); + if (err) panic(pmap_bootstrap: kvm uvm space protection - failed (%p)\n, (void *)addr); -#endif + failed (%d)\n, thunk_geterrno()); dprintf_debug(Creating memory mapped backend\n); @@ -1056,7 +1047,7 @@ panic(%s: couldn't get src mapping, __func__); dblob = thunk_mmap(NULL, PAGE_SIZE, - THUNK_PROT_WRITE, + THUNK_PROT_READ | THUNK_PROT_WRITE, THUNK_MAP_FILE | THUNK_MAP_SHARED, mem_fh, dst_pa); if (!dblob)
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pgoyette Date: Mon Sep 19 18:16:06 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Mark the tests/lib/libc/ieefp directory obsolete, as well as its former contents. To generate a diff of this commit: cvs rdiff -u -r1.393 -r1.394 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.393 src/distrib/sets/lists/tests/mi:1.394 --- src/distrib/sets/lists/tests/mi:1.393 Mon Sep 19 11:57:11 2011 +++ src/distrib/sets/lists/tests/mi Mon Sep 19 18:16:06 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.393 2011/09/19 11:57:11 njoly Exp $ +# $NetBSD: mi,v 1.394 2011/09/19 18:16:06 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1944,7 +1944,7 @@ ./usr/tests/lib/libc/hash/h_hash tests-lib-tests atf ./usr/tests/lib/libc/hash/t_hash tests-lib-tests atf ./usr/tests/lib/libc/hash/t_sha2 tests-lib-tests atf -./usr/tests/lib/libc/ieeefp tests-obsolete +./usr/tests/lib/libc/ieeefp tests-obsolete obsolete ./usr/tests/lib/libc/ieeefp/Atffile tests-obsolete obsolete ./usr/tests/lib/libc/ieeefp/t_except tests-obsolete obsolete ./usr/tests/lib/libc/ieeefp/t_nan_inf tests-obsolete obsolete
CVS commit: src/sys/arch/amiga
Module Name:src Committed By: rkujawa Date: Mon Sep 19 19:15:29 UTC 2011 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL files.amiga src/sys/arch/amiga/include: pci_machdep.h src/sys/arch/amiga/pci: mppb.c p5pb.c p5pbreg.h Added Files: src/sys/arch/amiga/pci: pci_machdep.c Log Message: Minor changes to Amiga PCI MD code: - Add bus enumeration and resource assignment (PCI_NETBSD_CONFIGURE) to mppb(4) - no more need to run AmigaOS to configure the bus. - Add PCI configuration address register to p5pb(4). - Add PCI I/O space support to p5pb(4). - Move common code from p5pb(4) and mppb(4) to new pci_machdep.c file. - Fix style. To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.271 -r1.272 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.93 -r1.94 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.147 -r1.148 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/include/pci_machdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/pci/mppb.c \ src/sys/arch/amiga/pci/p5pb.c src/sys/arch/amiga/pci/p5pbreg.h cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/pci/pci_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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.141 src/sys/arch/amiga/conf/DRACO:1.142 --- src/sys/arch/amiga/conf/DRACO:1.141 Sat Sep 17 16:55:34 2011 +++ src/sys/arch/amiga/conf/DRACO Mon Sep 19 19:15:28 2011 @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.141 2011/09/17 16:55:34 rkujawa Exp $ +# $NetBSD: DRACO,v 1.142 2011/09/19 19:15:28 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.82 2011/08/04 17:48:51 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.83 2011/09/17 16:55:34 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.141 $ +#ident GENERIC-$Revision: 1.142 $ maxusers 8 Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.271 src/sys/arch/amiga/conf/GENERIC:1.272 --- src/sys/arch/amiga/conf/GENERIC:1.271 Sat Sep 17 16:55:34 2011 +++ src/sys/arch/amiga/conf/GENERIC Mon Sep 19 19:15:28 2011 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.271 2011/09/17 16:55:34 rkujawa Exp $ +# $NetBSD: GENERIC,v 1.272 2011/09/19 19:15:28 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.82 2011/08/04 17:48:51 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.83 2011/09/17 16:55:34 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.271 $ +#ident GENERIC-$Revision: 1.272 $ maxusers 8 @@ -466,6 +466,8 @@ # PCI bus support options PCIVERBOSE # verbose PCI device autoconfig messages #options PCI_CONFIG_DUMP +options PCI_NETBSD_CONFIGURE + p5pb0 at zbus0# Phase5 PCI bridge (CVPPC/BVPPC) pci* at p5pb0 mppb* at zbus0# Matay Prometheus Zorro-PCI bridge Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.83 src/sys/arch/amiga/conf/GENERIC.in:1.84 --- src/sys/arch/amiga/conf/GENERIC.in:1.83 Sat Sep 17 16:55:34 2011 +++ src/sys/arch/amiga/conf/GENERIC.in Mon Sep 19 19:15:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.83 2011/09/17 16:55:34 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.84 2011/09/19 19:15:29 rkujawa Exp $ # ## # GENERIC machine description file @@ -57,7 +57,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.83 $ +#ident GENERIC-$Revision: 1.84 $ m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS=-Os @@ -573,6 +573,8 @@ # PCI bus support options PCIVERBOSE # verbose PCI device autoconfig messages #options PCI_CONFIG_DUMP +options PCI_NETBSD_CONFIGURE + p5pb0 at zbus0# Phase5 PCI bridge (CVPPC/BVPPC) pci* at p5pb0 mppb* at zbus0# Matay Prometheus Zorro-PCI bridge Index: src/sys/arch/amiga/conf/INSTALL diff -u src/sys/arch/amiga/conf/INSTALL:1.93 src/sys/arch/amiga/conf/INSTALL:1.94 --- src/sys/arch/amiga/conf/INSTALL:1.93 Sat Sep 17 16:55:34 2011 +++ src/sys/arch/amiga/conf/INSTALL Mon Sep 19 19:15:29 2011 @@ -1,9 +1,9 @@ -# $NetBSD: INSTALL,v 1.93 2011/09/17 16:55:34 rkujawa Exp $ +# $NetBSD: INSTALL,v 1.94 2011/09/19 19:15:29 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this
CVS commit: src/sys/arch/m68k
Module Name:src Committed By: rkujawa Date: Mon Sep 19 19:17:05 UTC 2011 Modified Files: src/sys/arch/m68k/include: cpu.h src/sys/arch/m68k/m68k: bus_dma.c Log Message: Move CACHELINE_* from bus_dma.c to cpu.h (needed for PCI configuration on amiga port). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/include/cpu.h cvs rdiff -u -r1.31 -r1.32 src/sys/arch/m68k/m68k/bus_dma.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/m68k/include/cpu.h diff -u src/sys/arch/m68k/include/cpu.h:1.14 src/sys/arch/m68k/include/cpu.h:1.15 --- src/sys/arch/m68k/include/cpu.h:1.14 Tue Feb 8 20:20:16 2011 +++ src/sys/arch/m68k/include/cpu.h Mon Sep 19 19:17:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.14 2011/02/08 20:20:16 rmind Exp $ */ +/* $NetBSD: cpu.h,v 1.15 2011/09/19 19:17:05 rkujawa Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -159,6 +159,9 @@ #define CACHE60_ON (CACHE40_ON|IC60_CABC|IC60_EBC|DC60_ESB) #define CACHE60_OFF (CACHE40_OFF|IC60_CABC) +#define CACHELINE_SIZE 16 +#define CACHELINE_MASK (CACHELINE_SIZE - 1) + #if defined(_KERNEL) || defined(_KMEMUSER) #include sys/cpu_data.h Index: src/sys/arch/m68k/m68k/bus_dma.c diff -u src/sys/arch/m68k/m68k/bus_dma.c:1.31 src/sys/arch/m68k/m68k/bus_dma.c:1.32 --- src/sys/arch/m68k/m68k/bus_dma.c:1.31 Fri Nov 12 13:18:58 2010 +++ src/sys/arch/m68k/m68k/bus_dma.c Mon Sep 19 19:17:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:58 uebayasi Exp $ */ +/* $NetBSD: bus_dma.c,v 1.32 2011/09/19 19:17:05 rkujawa Exp $ */ /* * This file was taken from from alpha/common/bus_dma.c @@ -41,7 +41,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:58 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.32 2011/09/19 19:17:05 rkujawa Exp $); #include sys/param.h #include sys/systm.h @@ -424,11 +424,6 @@ * Common function for DMA map synchronization. May be called * by chipset-specific DMA map synchronization functions. */ - -/* XXX these should be in m68k/cpu.h or m68k/cacheops.h */ -#define CACHELINE_SIZE 16 -#define CACHELINE_MASK (CACHELINE_SIZE - 1) - void _bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset, bus_size_t len, int ops)
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: rkujawa Date: Mon Sep 19 19:18:19 UTC 2011 Modified Files: src/share/man/man4/man4.amiga: mppb.4 Log Message: Remove information about prometheus.library (not needed after last changes to mppb driver). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.amiga/mppb.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/man4.amiga/mppb.4 diff -u src/share/man/man4/man4.amiga/mppb.4:1.1 src/share/man/man4/man4.amiga/mppb.4:1.2 --- src/share/man/man4/man4.amiga/mppb.4:1.1 Sat Sep 17 17:04:22 2011 +++ src/share/man/man4/man4.amiga/mppb.4 Mon Sep 19 19:18:19 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: mppb.4,v 1.1 2011/09/17 17:04:22 rkujawa Exp $ +.\ $NetBSD: mppb.4,v 1.2 2011/09/19 19:18:19 rkujawa Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -63,8 +63,4 @@ driver was written by .An Radoslaw Kujawa Aq radoslaw.kuj...@gmail.com . .Sh BUGS -Current version of this driver depends on PCI bus setup and enumeration -done by the prometheus.library, therefore the Prometheus is usable only after -AmigaOS boot. -.Pp The hardware does not support DMA to host memory.
CVS commit: src/lib/libc
Module Name:src
Committed By: joerg
Date: Mon Sep 19 21:24:58 UTC 2011
Modified Files:
src/lib/libc/arch/alpha/gen: makecontext.c resumecontext.c
src/lib/libc/arch/arm/gen: resumecontext.c
src/lib/libc/arch/hppa/gen: makecontext.c resumecontext.c
src/lib/libc/arch/mips/gen: makecontext.c resumecontext.c
src/lib/libc/arch/powerpc/gen: resumecontext.c
src/lib/libc/arch/powerpc64/gen: resumecontext.c
src/lib/libc/arch/sh3/gen: resumecontext.c
src/lib/libc/arch/sparc/gen: resumecontext.c
src/lib/libc/arch/sparc64/gen: resumecontext.c
src/lib/libc/arch/vax/gen: resumecontext.c
src/lib/libc/gen: Lint_resumecontext.c
src/lib/libc/include: extern.h
Log Message:
Mark _resumecontext as dead. ANSIfy all declarations for it.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/alpha/gen/makecontext.c \
src/lib/libc/arch/alpha/gen/resumecontext.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/arm/gen/resumecontext.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/hppa/gen/makecontext.c \
src/lib/libc/arch/hppa/gen/resumecontext.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/mips/gen/makecontext.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/mips/gen/resumecontext.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc/gen/resumecontext.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/gen/resumecontext.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sh3/gen/resumecontext.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sparc/gen/resumecontext.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sparc64/gen/resumecontext.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/vax/gen/resumecontext.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/Lint_resumecontext.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/include/extern.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/libc/arch/alpha/gen/makecontext.c
diff -u src/lib/libc/arch/alpha/gen/makecontext.c:1.4 src/lib/libc/arch/alpha/gen/makecontext.c:1.5
--- src/lib/libc/arch/alpha/gen/makecontext.c:1.4 Mon Apr 28 20:22:55 2008
+++ src/lib/libc/arch/alpha/gen/makecontext.c Mon Sep 19 21:24:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:55 martin Exp $ */
+/* $NetBSD: makecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: makecontext.c,v 1.4 2008/04/28 20:22:55 martin Exp $);
+__RCSID($NetBSD: makecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $);
#endif
#include stddef.h
@@ -49,8 +49,6 @@
unsigned long *sp;
va_list ap;
- void __resumecontext(void);
-
/* Compute and align stack pointer. */
sp = (unsigned long *)
(((uintptr_t)ucp-uc_stack.ss_sp + ucp-uc_stack.ss_size) ~0x7);
Index: src/lib/libc/arch/alpha/gen/resumecontext.c
diff -u src/lib/libc/arch/alpha/gen/resumecontext.c:1.4 src/lib/libc/arch/alpha/gen/resumecontext.c:1.5
--- src/lib/libc/arch/alpha/gen/resumecontext.c:1.4 Mon Apr 28 20:22:55 2008
+++ src/lib/libc/arch/alpha/gen/resumecontext.c Mon Sep 19 21:24:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: resumecontext.c,v 1.4 2008/04/28 20:22:55 martin Exp $ */
+/* $NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: resumecontext.c,v 1.4 2008/04/28 20:22:55 martin Exp $);
+__RCSID($NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $);
#endif
#include namespace.h
@@ -41,7 +41,7 @@
#include extern.h
void
-_resumecontext()
+_resumecontext(void)
{
ucontext_t uct;
Index: src/lib/libc/arch/arm/gen/resumecontext.c
diff -u src/lib/libc/arch/arm/gen/resumecontext.c:1.4 src/lib/libc/arch/arm/gen/resumecontext.c:1.5
--- src/lib/libc/arch/arm/gen/resumecontext.c:1.4 Mon Apr 28 20:22:55 2008
+++ src/lib/libc/arch/arm/gen/resumecontext.c Mon Sep 19 21:24:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: resumecontext.c,v 1.4 2008/04/28 20:22:55 martin Exp $ */
+/* $NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: resumecontext.c,v 1.4 2008/04/28 20:22:55 martin Exp $);
+__RCSID($NetBSD: resumecontext.c,v 1.5 2011/09/19 21:24:57 joerg Exp $);
#endif
#include namespace.h
@@ -41,7 +41,7 @@
#include extern.h
void
-_resumecontext()
+_resumecontext(void)
{
ucontext_t uct;
Index: src/lib/libc/arch/hppa/gen/makecontext.c
diff -u src/lib/libc/arch/hppa/gen/makecontext.c:1.3 src/lib/libc/arch/hppa/gen/makecontext.c:1.4
--- src/lib/libc/arch/hppa/gen/makecontext.c:1.3 Mon Apr 28 20:22:56 2008
+++ src/lib/libc/arch/hppa/gen/makecontext.c
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Mon Sep 19 23:54:29 UTC 2011
Modified Files:
src/sys/kern: kern_subr.c
Log Message:
ifdef unused variable with -UPTRACE
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/sys/kern/kern_subr.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/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.211 src/sys/kern/kern_subr.c:1.212
--- src/sys/kern/kern_subr.c:1.211 Wed Aug 31 19:42:46 2011
+++ src/sys/kern/kern_subr.c Mon Sep 19 19:54:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.211 2011/08/31 23:42:46 jmcneill Exp $ */
+/* $NetBSD: kern_subr.c,v 1.212 2011/09/19 23:54:29 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.211 2011/08/31 23:42:46 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_subr.c,v 1.212 2011/09/19 23:54:29 christos Exp $);
#include opt_ddb.h
#include opt_md.h
@@ -717,7 +717,9 @@
void
trace_exit(register_t code, register_t rval[], int error)
{
+#ifdef PTRACE
struct proc *p = curlwp-l_proc;
+#endif
#ifdef SYSCALL_DEBUG
scdebug_ret(code, error, rval);
CVS commit: src/doc
Module Name:src Committed By: jym Date: Tue Sep 20 00:29:57 UTC 2011 Modified Files: src/doc: BRANCHES Log Message: jym-xensuspend is now terminated. To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.309 src/doc/BRANCHES:1.310 --- src/doc/BRANCHES:1.309 Sun Jun 12 03:50:42 2011 +++ src/doc/BRANCHES Tue Sep 20 00:29:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.309 2011/06/12 03:50:42 rmind Exp $ +# $NetBSD: BRANCHES,v 1.310 2011/09/20 00:29:57 jym Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -357,9 +357,9 @@ Branch: jym-xensuspend Description: Implement xm save/restore/migrate for NetBSD domU -Status: Active +Status: Terminated Start Date: 2009-02-08 -End Date: +End Date: 2011-09-20 Base Tag: jym-xensuspend-base Maintainer: Jean-Yves Migeon j...@netbsd.org Scope: kernel
CVS commit: src/doc
Module Name:src Committed By: jym Date: Tue Sep 20 00:31:06 UTC 2011 Modified Files: src/doc: NetBSD-6 Log Message: Xen suspend/resume will be part of NetBSD-6. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/doc/NetBSD-6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/NetBSD-6 diff -u src/doc/NetBSD-6:1.8 src/doc/NetBSD-6:1.9 --- src/doc/NetBSD-6:1.8 Tue Aug 16 04:04:57 2011 +++ src/doc/NetBSD-6 Tue Sep 20 00:31:06 2011 @@ -28,6 +28,7 @@ + support for resizing ffs - riz + production support for fss + Xen/SMP ++ Xen suspend/resume + automated test framework for testing releng autobuilds + full functionality for NPF - SMP-aware packet filter - rmind + fixed IPSEC NAT-T @@ -39,7 +40,6 @@ --- + mobile IPv6 - we have the mods, need application of same to the repo + kernel modules need work -+ Xen suspend/resume - jym working on it + TNF funding for release engineering May not make 6.0
CVS commit: src/doc
Module Name:src Committed By: jym Date: Tue Sep 20 00:33:43 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Xen suspend/resume code is now committed in -curent. To generate a diff of this commit: cvs rdiff -u -r1.1608 -r1.1609 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1608 src/doc/CHANGES:1.1609 --- src/doc/CHANGES:1.1608 Sat Sep 17 17:00:12 2011 +++ src/doc/CHANGES Tue Sep 20 00:33:43 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1608 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1609 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1122,3 +1122,5 @@ file: Update to 5.09 [christos 20110916] mppb(4): Add driver for Prometheus Zorro III to PCI bridge. [rkujawa 20110917] + xen: Provide experimental support for suspend/resume in + NetBSD domUs. [jym 20110920]
CVS commit: src/external/gpl3/gcc/lib/libgomp/arch/i386
Module Name:src
Committed By: mrg
Date: Tue Sep 20 02:26:40 UTC 2011
Added Files:
src/external/gpl3/gcc/lib/libgomp/arch/i386: config.h libgomp.spec
libgomp_f.h
Log Message:
mknative-gcc files for libgomp.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/arch/i386/config.h \
src/external/gpl3/gcc/lib/libgomp/arch/i386/libgomp.spec \
src/external/gpl3/gcc/lib/libgomp/arch/i386/libgomp_f.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/gpl3/gcc/lib/libgomp/arch/i386/config.h
diff -u /dev/null src/external/gpl3/gcc/lib/libgomp/arch/i386/config.h:1.1
--- /dev/null Tue Sep 20 02:26:40 2011
+++ src/external/gpl3/gcc/lib/libgomp/arch/i386/config.h Tue Sep 20 02:26:40 2011
@@ -0,0 +1,136 @@
+/* This file is automatically generated. DO NOT EDIT! */
+/* Generated from: NetBSD: mknative-gcc,v 1.62 2011/08/17 18:34:13 matt Exp */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */
+
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if the target assembler supports .symver directive. */
+#define HAVE_AS_SYMVER_DIRECTIVE 1
+
+/* Define to 1 if the target supports __attribute__((alias(...))). */
+#define HAVE_ATTRIBUTE_ALIAS 1
+
+/* Define to 1 if the target supports __attribute__((dllexport)). */
+/* #undef HAVE_ATTRIBUTE_DLLEXPORT */
+
+/* Define to 1 if the target supports __attribute__((visibility(...))). */
+#define HAVE_ATTRIBUTE_VISIBILITY 1
+
+/* Define if the POSIX Semaphores do not work on your system. */
+/* #undef HAVE_BROKEN_POSIX_SEMAPHORES */
+
+/* Define to 1 if the target assembler supports thread-local storage. */
+/* #undef HAVE_CC_TLS */
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#define HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the dlfcn.h header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `getloadavg' function. */
+#define HAVE_GETLOADAVG 1
+
+/* Define to 1 if you have the inttypes.h header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the memory.h header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if pthread_{,attr_}{g,s}etaffinity_np is supported. */
+/* #undef HAVE_PTHREAD_AFFINITY_NP */
+
+/* Define to 1 if you have the semaphore.h header file. */
+#define HAVE_SEMAPHORE_H 1
+
+/* Define to 1 if you have the stdint.h header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the stdlib.h header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the strings.h header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the string.h header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strtoull' function. */
+#define HAVE_STRTOULL 1
+
+/* Define to 1 if the target supports __sync_*_compare_and_swap */
+#define HAVE_SYNC_BUILTINS 1
+
+/* Define to 1 if you have the sys/loadavg.h header file. */
+/* #undef HAVE_SYS_LOADAVG_H */
+
+/* Define to 1 if you have the sys/stat.h header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the sys/time.h header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the sys/types.h header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if the target supports thread-local storage. */
+#define HAVE_TLS 1
+
+/* Define to 1 if you have the unistd.h header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if GNU symbol versioning is used for libgomp. */
+/* #undef LIBGOMP_GNU_SYMBOL_VERSIONING */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR .libs/
+
+/* Name of package */
+#define PACKAGE libgomp
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME GNU OpenMP Runtime Library
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING GNU OpenMP Runtime Library 1.0
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME libgomp
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL http://www.gnu.org/software/libgomp/;
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION 1.0
+
+/* The size of `char', as computed by sizeof. */
+/* #undef SIZEOF_CHAR */
+
+/* The size of `int', as computed by sizeof. */
+/* #undef SIZEOF_INT */
+
+/* The size of `long', as computed by sizeof. */
+/* #undef SIZEOF_LONG */
+
+/* The size of `short', as computed by sizeof. */
+/* #undef SIZEOF_SHORT */
+
+/* The size of `void *', as computed by sizeof. */
+/* #undef SIZEOF_VOID_P */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both string.h and strings.h.
CVS commit: src/external/gpl3/gcc/lib/libgomp
Module Name:src
Committed By: mrg
Date: Tue Sep 20 02:28:03 UTC 2011
Added Files:
src/external/gpl3/gcc/lib/libgomp: Makefile
Log Message:
makefile to build libgomp, as needed by gcc -fopenmp.
needs a full mknative-gcc run before it can be properly enabled.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgomp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libgomp/Makefile:1.1
--- /dev/null Tue Sep 20 02:28:03 2011
+++ src/external/gpl3/gcc/lib/libgomp/Makefile Tue Sep 20 02:28:03 2011
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile,v 1.1 2011/09/20 02:28:03 mrg Exp $
+
+# build GCC's libgomp, so that -fopenmp works.
+
+.include bsd.own.mk
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+
+LIB= gomp
+SRCS= \
+ alloc.c \
+ barrier.c \
+ critical.c \
+ env.c \
+ error.c \
+ iter.c \
+ iter_ull.c \
+ loop.c \
+ loop_ull.c \
+ ordered.c \
+ parallel.c \
+ sections.c \
+ single.c \
+ task.c \
+ team.c \
+ work.c \
+ lock.c \
+ mutex.c \
+ proc.c \
+ sem.c \
+ bar.c \
+ ptrlock.c \
+ time.c \
+ fortran.c \
+ affinity.c
+
+CPPFLAGS+= \
+ -DHAVE_CONFIG_H \
+ -I${DIST}/libgomp \
+ -I${DIST}/libgomp/config/posix \
+ -I${DIST}/libgcc \
+ -I${.CURDIR}/arch/${MACHINE_ARCH}
+CFLAGS+=-pthread
+
+# This is where GCC looks for it.
+FILES= libgomp.spec
+FILESDIR= ${LIBDIR}
+
+# libgomp.so.1.0 is in GCC 4.5.
+SHLIB_MAJOR= 1
+SHLIB_MINOR= 0
+
+LDFLAGS+= -Wl,--version-script,${DIST}/libgomp/libgomp.map
+
+.PATH: ${DIST}/libgomp ${DIST}/libgomp/config/posix
+
+.include bsd.lib.mk
CVS commit: src/sys/arch/evbmips/loongson
Module Name:src
Committed By: macallan
Date: Tue Sep 20 05:41:59 UTC 2011
Modified Files:
src/sys/arch/evbmips/loongson: gdium_machdep.c
Log Message:
move the early console code over from ../gdium
This is kinda hackish but it works and it's not like there will be new Gdium
revisions anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/gdium_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/evbmips/loongson/gdium_machdep.c
diff -u src/sys/arch/evbmips/loongson/gdium_machdep.c:1.1 src/sys/arch/evbmips/loongson/gdium_machdep.c:1.2
--- src/sys/arch/evbmips/loongson/gdium_machdep.c:1.1 Sat Aug 27 13:42:44 2011
+++ src/sys/arch/evbmips/loongson/gdium_machdep.c Tue Sep 20 05:41:58 2011
@@ -35,7 +35,14 @@
#include mips/bonito/bonitoreg.h
#include mips/bonito/bonitovar.h
+#include dev/wscons/wsconsio.h
+#include dev/wscons/wsdisplayvar.h
+#include dev/rasops/rasops.h
+#include dev/wsfont/wsfont.h
+#include dev/wscons/wsdisplay_vconsvar.h
+
int gdium_revision = 0;
+static pcireg_t fb_addr = 0;
void gdium_attach_hook(device_t, device_t, struct pcibus_attach_args *);
void gdium_device_register(struct device *, void *);
@@ -78,6 +85,12 @@
.reset = gdium_reset
};
+static struct vcons_screen gdium_console_screen;
+
+static struct wsscreen_descr gdium_stdscreen = {
+ .name = std,
+};
+
void
gdium_attach_hook(device_t parent, device_t self,
struct pcibus_attach_args *pba)
@@ -223,6 +236,7 @@
void
gdium_device_register(struct device *dev, void *aux)
{
+ prop_dictionary_t dict;
static int gkey_chain_pos = 0;
static struct device *lastparent = NULL;
@@ -270,6 +284,21 @@
break;
}
+ if (device_is_a(dev, genfb) || device_is_a(dev, voyagerfb)) {
+ dict = device_properties(dev);
+ /*
+ * this is a hack
+ * is_console needs to be checked against reality
+ */
+ prop_dictionary_set_bool(dict, is_console, 1);
+ prop_dictionary_set_uint32(dict, width, 1024);
+ prop_dictionary_set_uint32(dict, height, 600);
+ prop_dictionary_set_uint32(dict, depth, 16);
+ prop_dictionary_set_uint32(dict, linebytes, 2048);
+ if (fb_addr != 0)
+ prop_dictionary_set_uint32(dict, address, fb_addr);
+ }
+
return;
advance:
@@ -290,3 +319,60 @@
REGVAL(BONITO_GPIODATA) = ~0x0002;
REGVAL(BONITO_GPIOIE) = ~0x0002;
}
+
+/*
+ * Early console code
+ */
+
+int
+gdium_cnattach(bus_space_tag_t memt, bus_space_tag_t iot,
+pci_chipset_tag_t pc, pcitag_t tag, pcireg_t id)
+{
+ struct rasops_info * const ri = gdium_console_screen.scr_ri;
+ long defattr;
+ pcireg_t reg;
+
+
+ /* filter out unrecognized devices */
+ switch (id) {
+ default:
+ return ENODEV;
+ case PCI_ID_CODE(PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM502):
+ break;
+ }
+
+ wsfont_init();
+
+ /* set up rasops */
+ ri-ri_width = 1024;
+ ri-ri_height = 600;
+ ri-ri_depth = 16;
+ ri-ri_stride = 0x800;
+
+ /* read the mapping register for the frame buffer */
+ reg = pci_conf_read(pc, tag, PCI_MAPREG_START);
+ fb_addr = reg;
+
+ ri-ri_bits = (char *)MIPS_PHYS_TO_KSEG1(BONITO_PCILO_BASE + reg);
+ ri-ri_flg = RI_CENTER | RI_NO_AUTO;
+
+ memset(ri-ri_bits, 0, 0x20);
+
+ /* use as much of the screen as the font permits */
+ rasops_init(ri, 30, 80);
+
+ rasops_reconfig(ri, ri-ri_height / ri-ri_font-fontheight,
+ ri-ri_width / ri-ri_font-fontwidth);
+
+ gdium_stdscreen.nrows = ri-ri_rows;
+ gdium_stdscreen.ncols = ri-ri_cols;
+ gdium_stdscreen.textops = ri-ri_ops;
+ gdium_stdscreen.capabilities = ri-ri_caps;
+
+ ri-ri_ops.allocattr(ri, 0, ri-ri_rows - 1, 0, defattr);
+
+ wsdisplay_preattach(gdium_stdscreen, ri, 0, 0, defattr);
+
+ return 0;
+
+}
CVS commit: src/sys/arch/evbmips/loongson
Module Name:src Committed By: macallan Date: Tue Sep 20 05:50:17 UTC 2011 Modified Files: src/sys/arch/evbmips/loongson: machdep.c Log Message: make this work with NCOM == 0 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/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/evbmips/loongson/machdep.c diff -u src/sys/arch/evbmips/loongson/machdep.c:1.1 src/sys/arch/evbmips/loongson/machdep.c:1.2 --- src/sys/arch/evbmips/loongson/machdep.c:1.1 Sat Aug 27 13:42:45 2011 +++ src/sys/arch/evbmips/loongson/machdep.c Tue Sep 20 05:50:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.1 2011/08/27 13:42:45 bouyer Exp $ */ +/* $NetBSD: machdep.c,v 1.2 2011/09/20 05:50:17 macallan Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -90,7 +90,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1 2011/08/27 13:42:45 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.2 2011/09/20 05:50:17 macallan Exp $); #include opt_ddb.h #include opt_execfmt.h @@ -140,6 +140,11 @@ #include dev/ic/comreg.h #include dev/ic/comvar.h +bus_space_tag_t comconsiot; +bus_addr_t comconsaddr; +int comconsrate = 0; +#endif /* NCOM 0 */ + #ifdef LOW_DEBUG #define DPRINTF(x) printf x #define DPPRINTF(x) pmon_printf x @@ -148,11 +153,6 @@ #define DPPRINTF(x) #endif -bus_space_tag_t comconsiot; -bus_addr_t comconsaddr; -int comconsrate = 0; -#endif /* NCOM 0 */ - #include sisfb.h
CVS commit: src/sys/arch/evbmips/loongson
Module Name:src Committed By: macallan Date: Tue Sep 20 05:51:34 UTC 2011 Modified Files: src/sys/arch/evbmips/loongson: autoconf.h machdep.c Log Message: call gdium_cnattach() Now this actually boots on Gdium. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/autoconf.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/loongson/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/evbmips/loongson/autoconf.h diff -u src/sys/arch/evbmips/loongson/autoconf.h:1.1 src/sys/arch/evbmips/loongson/autoconf.h:1.2 --- src/sys/arch/evbmips/loongson/autoconf.h:1.1 Sat Aug 27 13:42:44 2011 +++ src/sys/arch/evbmips/loongson/autoconf.h Tue Sep 20 05:51:34 2011 @@ -104,4 +104,7 @@ extern phys_ram_seg_t mem_clusters[]; extern int mem_cluster_cnt; +int gdium_cnattach(bus_space_tag_t, bus_space_tag_t, +pci_chipset_tag_t, pcitag_t, pcireg_t); + #endif /* _MACHINE_AUTOCONF_H_ */ Index: src/sys/arch/evbmips/loongson/machdep.c diff -u src/sys/arch/evbmips/loongson/machdep.c:1.2 src/sys/arch/evbmips/loongson/machdep.c:1.3 --- src/sys/arch/evbmips/loongson/machdep.c:1.2 Tue Sep 20 05:50:17 2011 +++ src/sys/arch/evbmips/loongson/machdep.c Tue Sep 20 05:51:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.2 2011/09/20 05:50:17 macallan Exp $ */ +/* $NetBSD: machdep.c,v 1.3 2011/09/20 05:51:34 macallan Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -90,7 +90,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.2 2011/09/20 05:50:17 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.3 2011/09/20 05:51:34 macallan Exp $); #include opt_ddb.h #include opt_execfmt.h @@ -513,6 +513,9 @@ sisfb_cnattach(bonito_memt, bonito_iot, bonito_pc, pcitag, reg); #endif + if (cn_tab == pmoncons) + gdium_cnattach(bonito_memt, bonito_iot, bonito_pc, + pcitag, reg); } DPRINTF((\n));
CVS commit: src/sys/arch/evbmips/loongson
Module Name:src
Committed By: macallan
Date: Tue Sep 20 05:57:11 UTC 2011
Modified Files:
src/sys/arch/evbmips/loongson: gdium_machdep.c
Log Message:
wait after twiddling the gpio to power down, it takes a few seconds for it to
take effect. Without this we would run into gdium_reset() and reboot instead
of powering down.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/loongson/gdium_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/evbmips/loongson/gdium_machdep.c
diff -u src/sys/arch/evbmips/loongson/gdium_machdep.c:1.2 src/sys/arch/evbmips/loongson/gdium_machdep.c:1.3
--- src/sys/arch/evbmips/loongson/gdium_machdep.c:1.2 Tue Sep 20 05:41:58 2011
+++ src/sys/arch/evbmips/loongson/gdium_machdep.c Tue Sep 20 05:57:11 2011
@@ -311,6 +311,8 @@
{
REGVAL(BONITO_GPIODATA) |= 0x0002;
REGVAL(BONITO_GPIOIE) = ~0x0002;
+ printf(Powering down...\n);
+ while(1) delay(1000);
}
void
