CVS commit: src/tests/lib/libc/net
Module Name:src
Committed By: christos
Date: Fri Jan 10 01:43:55 UTC 2014
Modified Files:
src/tests/lib/libc/net: t_hostent.sh
Log Message:
Add a cleanup routine because if a test fails, the script exits and the
rest of the code is not executed.
Note that the cleanup routine is executed in a separate shell so environment
variables are not propagated and need to be set again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/net/t_hostent.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/net/t_hostent.sh
diff -u src/tests/lib/libc/net/t_hostent.sh:1.6 src/tests/lib/libc/net/t_hostent.sh:1.7
--- src/tests/lib/libc/net/t_hostent.sh:1.6 Thu Jan 9 09:07:31 2014
+++ src/tests/lib/libc/net/t_hostent.sh Thu Jan 9 20:43:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_hostent.sh,v 1.6 2014/01/09 14:07:31 christos Exp $
+# $NetBSD: t_hostent.sh,v 1.7 2014/01/10 01:43:55 christos Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -58,11 +58,12 @@ start_dns_server() {
}
stop_dns_server() {
+ export RUMP_SERVER=unix:///tmp/rumpserver
kill $(cat dns_server_$1.pid)
rump.halt
}
-atf_test_case gethostbyname4
+atf_test_case gethostbyname4 cleanup
gethostbyname4_head()
{
atf_set "descr" "Checks gethostbyname2(3) for AF_INET (auto, as determined by nsswitch.conf(5)"
@@ -71,10 +72,13 @@ gethostbyname4_body()
{
start_dns_server 4
atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent $res -t auto -4 $n4"
+}
+gethostbyname4_cleanup()
+{
stop_dns_server 4
}
-atf_test_case gethostbyname6
+atf_test_case gethostbyname6 cleanup cleanup
gethostbyname6_head()
{
atf_set "descr" "Checks gethostbyname2(3) for AF_INET6 (auto, as determined by nsswitch.conf(5)"
@@ -83,10 +87,13 @@ gethostbyname6_body()
{
start_dns_server 4
atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t auto -6 $n6"
+}
+gethostbyname6_cleanup()
+{
stop_dns_server 4
}
-atf_test_case gethostbyaddr4
+atf_test_case gethostbyaddr4 cleanup
gethostbyaddr4_head()
{
atf_set "descr" "Checks gethostbyaddr(3) for AF_INET (auto, as determined by nsswitch.conf(5)"
@@ -95,10 +102,13 @@ gethostbyaddr4_body()
{
start_dns_server 4
atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t auto -a $a4"
+}
+gethostbyaddr4_cleanup()
+{
stop_dns_server 4
}
-atf_test_case gethostbyaddr6
+atf_test_case gethostbyaddr6 cleanup
gethostbyaddr6_head()
{
atf_set "descr" "Checks gethostbyaddr(3) for AF_INET6 (auto, as determined by nsswitch.conf(5)"
@@ -107,6 +117,9 @@ gethostbyaddr6_body()
{
start_dns_server 4
atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent -t auto -a $a6"
+}
+gethostbyaddr6_cleanup()
+{
stop_dns_server 4
}
@@ -150,7 +163,7 @@ hostsbyaddrlookup6_body()
atf_check -o inline:"$loc6" -x "${dir}/h_hostent -f ${dir}/hosts -t file -6 -a $al6"
}
-atf_test_case dnsbynamelookup4
+atf_test_case dnsbynamelookup4 cleanup
dnsbynamelookup4_head()
{
atf_set "descr" "Checks DNS name lookup for AF_INET"
@@ -159,10 +172,13 @@ dnsbynamelookup4_body()
{
start_dns_server 4
atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -4 $n4"
+}
+dnsbynamelookup4_cleanup()
+{
stop_dns_server 4
}
-atf_test_case dnsbynamelookup6
+atf_test_case dnsbynamelookup6 cleanup
dnsbynamelookup6_head()
{
atf_set "descr" "Checks DNS name lookup for AF_INET6"
@@ -171,10 +187,13 @@ dnsbynamelookup6_body()
{
start_dns_server 4
atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -6 $n6"
+}
+dnsbynamelookup6_cleanup()
+{
stop_dns_server 4
}
-atf_test_case dnsbyaddrlookup4
+atf_test_case dnsbyaddrlookup4 cleanup
dnsbyaddrlookup4_head()
{
atf_set "descr" "Checks DNS address lookup for AF_INET"
@@ -183,10 +202,13 @@ dnsbyaddrlookup4_body()
{
start_dns_server 4
atf_check -o inline:"$ans4" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -4 -a $a4"
+}
+dnsbyaddrlookup4_cleanup()
+{
stop_dns_server 4
}
-atf_test_case dnsbyaddrlookup6
+atf_test_case dnsbyaddrlookup6 cleanup
dnsbyaddrlookup6_head()
{
atf_set "descr" "Checks dns address lookup for AF_INET6"
@@ -195,6 +217,9 @@ dnsbyaddrlookup6_body()
{
start_dns_server 4
atf_check -o inline:"$ans6" -x "$HIJACK_DNS ${dir}/h_hostent ${res} -t dns -6 -a $a6"
+}
+dnsbyaddrlookup6_cleanup()
+{
stop_dns_server 4
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri Jan 10 01:43:52 UTC 2014
Modified Files:
src/sys/dev/pci: ahcisata_pci.c
Log Message:
Sync with pcidev's change. Rename PCI_PRODUCT_MARVELL2_88SE9128 to
PCI_PRODUCT_MARVELL2_88SE912Z. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/ahcisata_pci.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/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.33 src/sys/dev/pci/ahcisata_pci.c:1.34
--- src/sys/dev/pci/ahcisata_pci.c:1.33 Thu Jan 9 22:37:19 2014
+++ src/sys/dev/pci/ahcisata_pci.c Fri Jan 10 01:43:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.34 2014/01/10 01:43:52 msaitoh Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.34 2014/01/10 01:43:52 msaitoh Exp $");
#include
#include
@@ -167,7 +167,7 @@ static const struct ahci_pci_quirk ahci_
AHCI_PCI_QUIRK_FORCE | AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6145,
AHCI_QUIRK_BADPMP },
- { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE9128,
+ { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE912Z,
AHCI_PCI_QUIRK_FORCE },
/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Jan 10 01:39:48 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Rework for Marvell 88SE9128. Change the description of 0x9123 to 88SE912[38]. For 0x91a3, add '(unclear)' into the description. FreeBSD, Linux and http://pci-ids.ucw.cz have no such device. To generate a diff of this commit: cvs rdiff -u -r1.1179 -r1.1180 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1179 src/sys/dev/pci/pcidevs:1.1180 --- src/sys/dev/pci/pcidevs:1.1179 Thu Jan 9 22:37:18 2014 +++ src/sys/dev/pci/pcidevs Fri Jan 10 01:39:48 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1179 2014/01/09 22:37:18 christos Exp $ +$NetBSD: pcidevs,v 1.1180 2014/01/10 01:39:48 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2337,12 +2337,12 @@ product MARVELL MV78460 0x7846 MV78460 product MARVELL 88W8660 0x8660 88W8660 SoC Orion1 product MARVELL2 88SE9120 0x9120 88SE9120 SATA -product MARVELL2 88SE912X 0x9123 88SE912x SATA II or III PCI-E AHCI Controller +product MARVELL2 88SE912X 0x9123 88SE912[38] SATA II or III PCI-E AHCI Controller product MARVELL2 88SE9125 0x9125 88SE9125 SATA III PCI-E AHCI Controller product MARVELL2 88SE9172 0x9172 88SE9172 SATA -product MARVELL2 88SE9128 0x91a3 88SE9128 SATA product MARVELL2 88SE9182 0x9182 88SE9182 SATA product MARVELL2 88SE9183 0x9183 88SE9183 SATA +product MARVELL2 88SE912Z 0x91a3 88SE9128 SATA (unclear) product MARVELL2 88SE9215 0x9215 88SE9215 SATA product MARVELL2 88SE9220 0x9220 88SE9220 SATA product MARVELL2 88SE9230 0x9230 88SE9230 SATA
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: christos
Date: Fri Jan 10 01:39:32 UTC 2014
Modified Files:
src/external/bsd/atf/dist/atf-sh: libatf-sh.subr
Log Message:
Undo previous; unfortunately the cleanup routine gets called in a different
shell so it can't cleanup stuff set in the environment of the first shell.
There are 2 problems:
- calling the test routine directly does not cleanup (not using
atf-run)
- when using atf-run, the cleanup routine needs state from the
running code which can only be stored in files. This will never
allow us to run tests in parallel since we need to keep a known
place to pass state.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
diff -u src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.2 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.3
--- src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.2 Thu Jan 9 20:16:07 2014
+++ src/external/bsd/atf/dist/atf-sh/libatf-sh.subr Thu Jan 9 20:39:32 2014
@@ -772,7 +772,6 @@ main()
_atf_syntax_error "Cannot provide more than one test case name"
else
_atf_run_tc "${1}"
-_atf_run_tc "${1}:cleanup"
fi
fi
}
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: christos
Date: Fri Jan 10 01:16:07 UTC 2014
Modified Files:
src/external/bsd/atf/dist/atf-sh: libatf-sh.subr
Log Message:
Make cleanup work as documented; note there are no tests testing that cleanup
works.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
diff -u src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.1.1.5 src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.2
--- src/external/bsd/atf/dist/atf-sh/libatf-sh.subr:1.1.1.5 Mon Jan 16 17:36:53 2012
+++ src/external/bsd/atf/dist/atf-sh/libatf-sh.subr Thu Jan 9 20:16:07 2014
@@ -772,6 +772,7 @@ main()
_atf_syntax_error "Cannot provide more than one test case name"
else
_atf_run_tc "${1}"
+_atf_run_tc "${1}:cleanup"
fi
fi
}
CVS commit: [matt-nb5-mips64] src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: matt
Date: Thu Jan 9 22:58:15 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/ramdisk [matt-nb5-mips64]: Makefile
Log Message:
Build BE ramdisks for BE MACHINE_ARCH's
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.24.1 src/distrib/evbarm/instkernel/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.4 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.4.24.1
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.4 Thu May 10 23:22:29 2007
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Thu Jan 9 22:58:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/05/10 23:22:29 dogcow Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2014/01/09 22:58:15 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,11 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
+.if empty(MACHINE_ARCH:M*eb)
IMAGEENDIAN= le
+.else
+IMAGEENDIAN= be
+.endif
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
disktab.preinstall dot.hdprofile dot.profile \
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: matt
Date: Thu Jan 9 22:48:17 UTC 2014
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
Build BE ramdisks for BE MACHINE_ARCH's
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/evbarm/instkernel/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.12 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.13
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.12 Thu Feb 11 09:06:48 2010
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Thu Jan 9 22:48:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/02/11 09:06:48 roy Exp $
+# $NetBSD: Makefile,v 1.13 2014/01/09 22:48:16 matt Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -13,7 +13,11 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
+.if empty(MACHINE_ARCH:M*eb)
IMAGEENDIAN= le
+.else
+IMAGEENDIAN= be
+.endif
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile \
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Thu Jan 9 22:37:19 UTC 2014
Modified Files:
src/sys/dev/pci: ahcisata_pci.c pcidevs
Log Message:
revert unintended changes
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/ahcisata_pci.c
cvs rdiff -u -r1.1178 -r1.1179 src/sys/dev/pci/pcidevs
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/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.32 src/sys/dev/pci/ahcisata_pci.c:1.33
--- src/sys/dev/pci/ahcisata_pci.c:1.32 Thu Jan 9 16:14:53 2014
+++ src/sys/dev/pci/ahcisata_pci.c Thu Jan 9 17:37:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.33 2014/01/09 22:37:19 christos Exp $");
#include
#include
@@ -167,7 +167,7 @@ static const struct ahci_pci_quirk ahci_
AHCI_PCI_QUIRK_FORCE | AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6145,
AHCI_QUIRK_BADPMP },
- { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE912X,
+ { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE9128,
AHCI_PCI_QUIRK_FORCE },
/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1,
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1178 src/sys/dev/pci/pcidevs:1.1179
--- src/sys/dev/pci/pcidevs:1.1178 Thu Jan 9 12:28:05 2014
+++ src/sys/dev/pci/pcidevs Thu Jan 9 17:37:18 2014
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1178 2014/01/09 17:28:05 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1179 2014/01/09 22:37:18 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2340,6 +2340,7 @@ product MARVELL2 88SE9120 0x9120 88SE912
product MARVELL2 88SE912X 0x9123 88SE912x SATA II or III PCI-E AHCI Controller
product MARVELL2 88SE9125 0x9125 88SE9125 SATA III PCI-E AHCI Controller
product MARVELL2 88SE9172 0x9172 88SE9172 SATA
+product MARVELL2 88SE9128 0x91a3 88SE9128 SATA
product MARVELL2 88SE9182 0x9182 88SE9182 SATA
product MARVELL2 88SE9183 0x9183 88SE9183 SATA
product MARVELL2 88SE9215 0x9215 88SE9215 SATA
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: htodd
Date: Thu Jan 9 21:14:53 UTC 2014
Modified Files:
src/sys/dev/pci: ahcisata_pci.c
Log Message:
Fix build. Only compile tested.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/ahcisata_pci.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/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.31 src/sys/dev/pci/ahcisata_pci.c:1.32
--- src/sys/dev/pci/ahcisata_pci.c:1.31 Sun Oct 21 23:09:53 2012
+++ src/sys/dev/pci/ahcisata_pci.c Thu Jan 9 21:14:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.31 2012/10/21 23:09:53 matt Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.31 2012/10/21 23:09:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.32 2014/01/09 21:14:53 htodd Exp $");
#include
#include
@@ -167,7 +167,7 @@ static const struct ahci_pci_quirk ahci_
AHCI_PCI_QUIRK_FORCE | AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6145,
AHCI_QUIRK_BADPMP },
- { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE9128,
+ { PCI_VENDOR_MARVELL2, PCI_PRODUCT_MARVELL2_88SE912X,
AHCI_PCI_QUIRK_FORCE },
/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1,
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: palle
Date: Thu Jan 9 20:28:24 UTC 2014
Modified Files:
src/sys/arch/sparc64/include: cpu.h
Log Message:
sun4v: Update description of the ci_mmfsa field in the cpu_info structure
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/sparc64/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.108 src/sys/arch/sparc64/include/cpu.h:1.109
--- src/sys/arch/sparc64/include/cpu.h:1.108 Thu Jan 9 12:51:27 2014
+++ src/sys/arch/sparc64/include/cpu.h Thu Jan 9 20:28:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.108 2014/01/09 12:51:27 macallan Exp $ */
+/* $NetBSD: cpu.h,v 1.109 2014/01/09 20:28:23 palle Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -174,11 +174,12 @@ struct cpu_info {
pte_t *ci_tsb_dmmu;
pte_t *ci_tsb_immu;
- /* this field is used by SUN4V */
- /* MMU Fault Status Area. Will be initialized to the physical
- address of the bottom of the interrupt stack */
+ /* MMU Fault Status Area (sun4v).
+ * Will be initialized to the physical address of the bottom of
+ * the interrupt stack.
+ */
paddr_t ci_mmfsa;
-
+
/* probe fault in PCI config space reads */
bool ci_pci_probe;
bool ci_pci_fault;
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Thu Jan 9 20:13:54 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64: cpu.c pmap.c Log Message: Coding style fixes (whitespace) - no functional changes To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sparc64/sparc64/cpu.c cvs rdiff -u -r1.285 -r1.286 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/cpu.c diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.107 src/sys/arch/sparc64/sparc64/cpu.c:1.108 --- src/sys/arch/sparc64/sparc64/cpu.c:1.107 Tue Jan 7 20:11:35 2014 +++ src/sys/arch/sparc64/sparc64/cpu.c Thu Jan 9 20:13:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.107 2014/01/07 20:11:35 palle Exp $ */ +/* $NetBSD: cpu.c,v 1.108 2014/01/09 20:13:54 palle Exp $ */ /* * Copyright (c) 1996 @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.107 2014/01/07 20:11:35 palle Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.108 2014/01/09 20:13:54 palle Exp $"); #include "opt_multiprocessor.h" @@ -180,7 +180,7 @@ alloc_cpuinfo(u_int cpu_node) cpi->ci_paddr = pa0; cpi->ci_self = cpi; #ifdef SUN4V - if ( CPU_ISSUN4V ) + if (CPU_ISSUN4V) cpi->ci_mmfsa = pa0; #endif cpi->ci_node = cpu_node; Index: src/sys/arch/sparc64/sparc64/pmap.c diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.285 src/sys/arch/sparc64/sparc64/pmap.c:1.286 --- src/sys/arch/sparc64/sparc64/pmap.c:1.285 Tue Jan 7 20:11:35 2014 +++ src/sys/arch/sparc64/sparc64/pmap.c Thu Jan 9 20:13:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.285 2014/01/07 20:11:35 palle Exp $ */ +/* $NetBSD: pmap.c,v 1.286 2014/01/09 20:13:54 palle Exp $ */ /* * * Copyright (C) 1996-1999 Eduardo Horvath. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.285 2014/01/07 20:11:35 palle Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.286 2014/01/09 20:13:54 palle Exp $"); #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -1158,7 +1158,7 @@ pmap_bootstrap(u_long kernelstart, u_lon cpus->ci_spinup = main; /* Call main when we're running. */ cpus->ci_paddr = cpu0paddr; #ifdef SUN4V - if ( CPU_ISSUN4V ) + if (CPU_ISSUN4V) cpus->ci_mmfsa = cpu0paddr; #endif cpus->ci_cpcb = (struct pcb *)u0va;
CVS commit: src/share/man/man7
Module Name:src Committed By: dholland Date: Thu Jan 9 18:55:41 UTC 2014 Modified Files: src/share/man/man7: symlink.7 Log Message: Clarify the behavior of the @machine and @machine_arch magic links relative to uname output when running in emulations: the magic links are *not* affected even though uname output changes. (This means @machine magic links can be used for e.g. amd64 vs. i386 device nodes. There's also an @emul magic link for emulation.) Noted by apb. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man7/symlink.7 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/man7/symlink.7 diff -u src/share/man/man7/symlink.7:1.21 src/share/man/man7/symlink.7:1.22 --- src/share/man/man7/symlink.7:1.21 Thu Jun 2 09:02:39 2011 +++ src/share/man/man7/symlink.7 Thu Jan 9 18:55:41 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: symlink.7,v 1.21 2011/06/02 09:02:39 jruoho Exp $ +.\" $NetBSD: symlink.7,v 1.22 2014/01/09 18:55:41 dholland Exp $ .\" .\" Copyright (c) 1992, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" -.Dd June 2, 2011 +.Dd January 9, 2014 .Dt SYMLINK 7 .Os .Sh NAME @@ -513,25 +513,31 @@ For example .It @machine Expands to the value of .Li MACHINE -for the system -.Po +for the system. +For native binaries, this is equivalent to the output of .Dq uname -m or .Xr sysctl 3 -.Dq hw.machine -.Pc . +.Dq hw.machine . +.Po +For non-native binaries, the values returned by uname and sysctl +typically vary to match the emulation environment. +.Pc .It @machine_arch Expands to the value of .Li MACHINE_ARCH -for the system -.Po +for the system. +For native binaries, this is equivalent to the output of .Dq uname -p or .Xr sysctl 3 -.Dq hw.machine_arch -.Pc . +.Dq hw.machine_arch . +.Po +For non-native binaries, the values returned by uname and sysctl +typically vary to match the emulation environment. +.Pc .It @osrelease Expands to the operating system release of the running kernel .Po
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Jan 9 17:28:05 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Remove 88SE9128(0x913a) entry. At least one of 88SE9128 chip's product ID is 0x9123. I have this one. Add new 88SE912X entry with 0x9123. OK'ed by jakllsch. To generate a diff of this commit: cvs rdiff -u -r1.1177 -r1.1178 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1177 src/sys/dev/pci/pcidevs:1.1178 --- src/sys/dev/pci/pcidevs:1.1177 Sat Jan 4 02:57:27 2014 +++ src/sys/dev/pci/pcidevs Thu Jan 9 17:28:05 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1177 2014/01/04 02:57:27 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1178 2014/01/09 17:28:05 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2337,9 +2337,8 @@ product MARVELL MV78460 0x7846 MV78460 product MARVELL 88W8660 0x8660 88W8660 SoC Orion1 product MARVELL2 88SE9120 0x9120 88SE9120 SATA -product MARVELL2 88SE9123 0x9123 88SE9123 SATA II PCI-E AHCI Controller +product MARVELL2 88SE912X 0x9123 88SE912x SATA II or III PCI-E AHCI Controller product MARVELL2 88SE9125 0x9125 88SE9125 SATA III PCI-E AHCI Controller -product MARVELL2 88SE9128 0x91a3 88SE9128 SATA product MARVELL2 88SE9172 0x9172 88SE9172 SATA product MARVELL2 88SE9182 0x9182 88SE9182 SATA product MARVELL2 88SE9183 0x9183 88SE9183 SATA
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: mlelstv
Date: Thu Jan 9 16:51:05 UTC 2014
Modified Files:
src/sys/dev/i2c: sdtemp.c sdtemp_reg.h
Log Message:
add three temperature sensors from ST.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/sdtemp_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.22 src/sys/dev/i2c/sdtemp.c:1.23
--- src/sys/dev/i2c/sdtemp.c:1.22 Mon Jul 22 13:46:20 2013
+++ src/sys/dev/i2c/sdtemp.c Thu Jan 9 16:51:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.22 2013/07/22 13:46:20 soren Exp $*/
+/* $NetBSD: sdtemp.c,v 1.23 2014/01/09 16:51:05 mlelstv Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.22 2013/07/22 13:46:20 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23 2014/01/09 16:51:05 mlelstv Exp $");
#include
#include
@@ -120,6 +120,12 @@ sdtemp_dev_table[] = {
"STmicroelectronics STTS424E" },
{ STTS_MANUFACTURER_ID, STTS_424_DEVICE_ID,STTS_424_MASK, 2,
"STmicroelectronics STTS424" },
+{ STTS_MANUFACTURER_ID, STTS_2002_DEVICE_ID,STTS_2002_MASK, 2,
+ "STmicroelectronics STTS2002" },
+{ STTS_MANUFACTURER_ID, STTS_2004_DEVICE_ID,STTS_2004_MASK, 2,
+ "STmicroelectronics STTS2002" },
+{ STTS_MANUFACTURER_ID, STTS_3000_DEVICE_ID,STTS_3000_MASK, 2,
+ "STmicroelectronics STTS3000" },
{ CAT_MANUFACTURER_ID, CAT_34TS02_DEVICE_ID, CAT_34TS02_MASK, 4,
"Catalyst CAT34TS02/CAT6095" },
{ IDT_MANUFACTURER_ID, IDT_TS3000B3_DEVICE_ID, IDT_TS3000B3_MASK, 4,
Index: src/sys/dev/i2c/sdtemp_reg.h
diff -u src/sys/dev/i2c/sdtemp_reg.h:1.6 src/sys/dev/i2c/sdtemp_reg.h:1.7
--- src/sys/dev/i2c/sdtemp_reg.h:1.6 Wed Aug 7 19:38:45 2013
+++ src/sys/dev/i2c/sdtemp_reg.h Thu Jan 9 16:51:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp_reg.h,v 1.6 2013/08/07 19:38:45 soren Exp $ */
+/* $NetBSD: sdtemp_reg.h,v 1.7 2014/01/09 16:51:05 mlelstv Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -124,6 +124,12 @@
#define STTS_424_MASK 0x
#define STTS_424E_DEVICE_ID 0x
#define STTS_424E_MASK 0xFFFE
+#define STTS_3000_DEVICE_ID 0x0200
+#define STTS_3000_MASK 0x
+#define STTS_2002_DEVICE_ID 0x0300
+#define STTS_2002_MASK 0x
+#define STTS_2004_DEVICE_ID 0x2201
+#define STTS_2004_MASK 0x
/* According to datasheets, both the CAT6095 and CAT34TS02 have the same ID */
CVS commit: src/tools/compat
Module Name:src Committed By: apb Date: Thu Jan 9 16:08:46 UTC 2014 Modified Files: src/tools/compat: compat_defs.h Log Message: fix prototype for strnlen. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/tools/compat/compat_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.94 src/tools/compat/compat_defs.h:1.95 --- src/tools/compat/compat_defs.h:1.94 Thu Jan 9 11:31:12 2014 +++ src/tools/compat/compat_defs.h Thu Jan 9 16:08:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.94 2014/01/09 11:31:12 apb Exp $ */ +/* $NetBSD: compat_defs.h,v 1.95 2014/01/09 16:08:46 apb Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -416,7 +416,7 @@ int pwcache_groupdb(int (*)(int), void ( char *strndup(const char *, size_t); #endif #if !HAVE_DECL_STRNLEN -char *strnlen(const char *, size_t); +size_t strnlen(const char *, size_t); #endif #if !HAVE_DECL_LCHFLAGS int lchflags(const char *, unsigned long);
CVS commit: src/tests/lib/libc/net
Module Name:src
Committed By: christos
Date: Thu Jan 9 14:07:31 UTC 2014
Modified Files:
src/tests/lib/libc/net: t_hostent.sh
Log Message:
fix copyright botch and add library for netinet6; still does not fix the
problem.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/net/t_hostent.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/net/t_hostent.sh
diff -u src/tests/lib/libc/net/t_hostent.sh:1.5 src/tests/lib/libc/net/t_hostent.sh:1.6
--- src/tests/lib/libc/net/t_hostent.sh:1.5 Wed Jan 8 21:18:10 2014
+++ src/tests/lib/libc/net/t_hostent.sh Thu Jan 9 09:07:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_hostent.sh,v 1.5 2014/01/09 02:18:10 christos Exp $
+# $NetBSD: t_hostent.sh,v 1.6 2014/01/09 14:07:31 christos Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -13,7 +13,7 @@
#documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXP{res}S OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
@@ -51,9 +51,8 @@ res="-r ${dir}/resolv.conf"
start_dns_server() {
export RUMP_SERVER=unix:///tmp/rumpserver
- rump_server -lrumpdev -lrumpnet \
- -lrumpnet_net -lrumpnet_netinet -lrumpnet_local \
- $RUMP_SERVER
+ rump_server -lrumpdev -lrumpnet -lrumpnet_net -lrumpnet_netinet \
+ -lrumpnet_netinet6 -lrumpnet_local $RUMP_SERVER
HIJACK_DNS="LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK='socket=inet:inet6'"
eval $HIJACK_DNS ${dir}/h_dns_server $1
}
CVS commit: src
Module Name:src
Committed By: hannken
Date: Thu Jan 9 13:23:57 UTC 2014
Modified Files:
src/sys/fs/sysvbfs: bfs.c bfs.h sysvbfs_vnops.c
src/tests/fs/vfs: t_renamerace.c
Log Message:
Operation sysvbfs_remove() destructs inodes attached to active vnodes.
Defer the destruction to sysvbfs_reclaim().
Disable test t_renamerace:sysvbfs_renamerace as it will exhaust the
inode table (sysvbfs has space for 8 inodes only).
Ok: Izumi Tsutsui
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/fs/sysvbfs/bfs.c
cvs rdiff -u -r1.7 -r1.8 src/sys/fs/sysvbfs/bfs.h
cvs rdiff -u -r1.49 -r1.50 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.29 -r1.30 src/tests/fs/vfs/t_renamerace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/sysvbfs/bfs.c
diff -u src/sys/fs/sysvbfs/bfs.c:1.16 src/sys/fs/sysvbfs/bfs.c:1.17
--- src/sys/fs/sysvbfs/bfs.c:1.16 Mon Jun 11 21:11:40 2012
+++ src/sys/fs/sysvbfs/bfs.c Thu Jan 9 13:23:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $ */
+/* $NetBSD: bfs.c,v 1.17 2014/01/09 13:23:57 hannken Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.17 2014/01/09 13:23:57 hannken Exp $");
#define BFS_DEBUG
#include
@@ -290,7 +290,7 @@ bfs_file_write(struct bfs *bfs, const ch
return ENOENT;
}
attr = inode->attr; /* copy old attribute */
- bfs_file_delete(bfs, name);
+ bfs_file_delete(bfs, name, false);
if ((err = bfs_file_create(bfs, name, buf, bufsz, &attr)) != 0)
return err;
} else {
@@ -308,7 +308,7 @@ bfs_file_write(struct bfs *bfs, const ch
}
int
-bfs_file_delete(struct bfs *bfs, const char *fname)
+bfs_file_delete(struct bfs *bfs, const char *fname, bool keep_inode)
{
struct bfs_inode *inode;
struct bfs_dirent *dirent;
@@ -316,16 +316,18 @@ bfs_file_delete(struct bfs *bfs, const c
if (!bfs_dirent_lookup_by_name(bfs, fname, &dirent))
return ENOENT;
- if (!bfs_inode_lookup(bfs, dirent->inode, &inode))
+ if (!keep_inode && !bfs_inode_lookup(bfs, dirent->inode, &inode))
return ENOENT;
memset(dirent, 0, sizeof *dirent);
- memset(inode, 0, sizeof *inode);
- bfs->n_inode--;
bfs->n_dirent--;
-
bfs_writeback_dirent(bfs, dirent, false);
- bfs_writeback_inode(bfs, inode);
+
+ if (!keep_inode) {
+ memset(inode, 0, sizeof *inode);
+ bfs->n_inode--;
+ bfs_writeback_inode(bfs, inode);
+ }
DPRINTF(bfs->debug, "%s: \"%s\" deleted.\n", __func__, fname);
return 0;
@@ -342,7 +344,7 @@ bfs_file_rename(struct bfs *bfs, const c
goto out;
}
- bfs_file_delete(bfs, to_name);
+ bfs_file_delete(bfs, to_name, false);
strncpy(dirent->name, to_name, BFS_FILENAME_MAXLEN);
bfs_writeback_dirent(bfs, dirent, false);
@@ -563,6 +565,24 @@ bfs_inode_lookup(const struct bfs *bfs,
return true;
}
+int
+bfs_inode_delete(struct bfs *bfs, ino_t ino)
+{
+ struct bfs_inode *inode;
+
+ if (!bfs_inode_lookup(bfs, ino, &inode))
+ return ENOENT;
+
+ memset(inode, 0, sizeof *inode);
+ bfs->n_inode--;
+
+ bfs_writeback_inode(bfs, inode);
+ DPRINTF(bfs->debug, "%s: %lld deleted.\n", __func__, (long long)ino);
+
+ return 0;
+}
+
+
size_t
bfs_file_size(const struct bfs_inode *inode)
{
Index: src/sys/fs/sysvbfs/bfs.h
diff -u src/sys/fs/sysvbfs/bfs.h:1.7 src/sys/fs/sysvbfs/bfs.h:1.8
--- src/sys/fs/sysvbfs/bfs.h:1.7 Tue May 8 14:28:55 2012
+++ src/sys/fs/sysvbfs/bfs.h Thu Jan 9 13:23:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bfs.h,v 1.7 2012/05/08 14:28:55 tsutsui Exp $ */
+/* $NetBSD: bfs.h,v 1.8 2014/01/09 13:23:57 hannken Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@ int bfs_file_read(const struct bfs *, co
int bfs_file_write(struct bfs *, const char *, void *, size_t);
int bfs_file_create(struct bfs *, const char *, void *, size_t,
const struct bfs_fileattr *);
-int bfs_file_delete(struct bfs *, const char *);
+int bfs_file_delete(struct bfs *, const char *, bool);
int bfs_file_rename(struct bfs *, const char *, const char *);
bool bfs_file_lookup(const struct bfs *, const char *, int *, int *,
size_t *);
@@ -162,6 +162,7 @@ bool bfs_dump(const struct bfs *);
int sysvbfs_bfs_init(struct bfs **, struct vnode *);
void sysvbfs_bfs_fini(struct bfs *);
bool bfs_inode_lookup(const struct bfs *, ino_t, struct bfs_inode **);
+int bfs_inode_delete(struct bfs *, ino_t);
bool bfs_dirent_lookup_by_name(const struct bfs *, const char *,
struct bfs_dirent **);
bool bfs_dirent_lookup_by_inode(const struct bfs *, int,
Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.49 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.50
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.49 Tue Dec 24 09:56:18 2013
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Thu Jan 9 13:23:57 2014
@
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: macallan
Date: Thu Jan 9 12:51:27 UTC 2014
Modified Files:
src/sys/arch/sparc64/include: cpu.h
Log Message:
allow non-SUN4V kernels to build
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sparc64/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.107 src/sys/arch/sparc64/include/cpu.h:1.108
--- src/sys/arch/sparc64/include/cpu.h:1.107 Tue Jan 7 20:11:35 2014
+++ src/sys/arch/sparc64/include/cpu.h Thu Jan 9 12:51:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.107 2014/01/07 20:11:35 palle Exp $ */
+/* $NetBSD: cpu.h,v 1.108 2014/01/09 12:51:27 macallan Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -174,11 +174,10 @@ struct cpu_info {
pte_t *ci_tsb_dmmu;
pte_t *ci_tsb_immu;
-#ifdef SUN4V
+ /* this field is used by SUN4V */
/* MMU Fault Status Area. Will be initialized to the physical
address of the bottom of the interrupt stack */
paddr_t ci_mmfsa;
-#endif
/* probe fault in PCI config space reads */
bool ci_pci_probe;
CVS commit: src/tools/compat
Module Name:src Committed By: apb Date: Thu Jan 9 11:31:12 UTC 2014 Modified Files: src/tools/compat: Makefile compat_defs.h Log Message: Declare and define strnlen if necessary. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/tools/compat/Makefile cvs rdiff -u -r1.93 -r1.94 src/tools/compat/compat_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/Makefile diff -u src/tools/compat/Makefile:1.70 src/tools/compat/Makefile:1.71 --- src/tools/compat/Makefile:1.70 Wed Dec 11 01:24:08 2013 +++ src/tools/compat/Makefile Thu Jan 9 11:31:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2013/12/11 01:24:08 joerg Exp $ +# $NetBSD: Makefile,v 1.71 2014/01/09 11:31:12 apb Exp $ HOSTLIB= nbcompat @@ -17,7 +17,8 @@ SRCS= atoll.c basename.c cdbr.c cdbw.c setenv.c setgroupent.c \ setpassent.c setprogname.c sha1.c sha1hl.c sha2.c \ sha256hl.c sha384hl.c sha512hl.c snprintb.c snprintf.c \ - stat_flags.c strlcat.c strlcpy.c strmode.c strndup.c \ + stat_flags.c strlcat.c strlcpy.c strmode.c \ + strndup.c strnlen.c \ strsep.c strsuftoll.c strtoll.c \ unvis.c vis.c err.c errx.c verr.c verrx.c \ vwarn.c vwarnx.c warn.c warnx.c fts.c glob.c efun.c Index: src/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.93 src/tools/compat/compat_defs.h:1.94 --- src/tools/compat/compat_defs.h:1.93 Thu Oct 24 13:59:47 2013 +++ src/tools/compat/compat_defs.h Thu Jan 9 11:31:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.93 2013/10/24 13:59:47 apb Exp $ */ +/* $NetBSD: compat_defs.h,v 1.94 2014/01/09 11:31:12 apb Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -415,6 +415,9 @@ int pwcache_groupdb(int (*)(int), void ( #if !HAVE_DECL_STRNDUP char *strndup(const char *, size_t); #endif +#if !HAVE_DECL_STRNLEN +char *strnlen(const char *, size_t); +#endif #if !HAVE_DECL_LCHFLAGS int lchflags(const char *, unsigned long); #endif
CVS commit: src/tools/compat
Module Name:src Committed By: apb Date: Thu Jan 9 11:30:01 UTC 2014 Modified Files: src/tools/compat: nbtool_config.h.in Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/tools/compat/nbtool_config.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/nbtool_config.h.in diff -u src/tools/compat/nbtool_config.h.in:1.33 src/tools/compat/nbtool_config.h.in:1.34 --- src/tools/compat/nbtool_config.h.in:1.33 Wed Aug 14 10:15:14 2013 +++ src/tools/compat/nbtool_config.h.in Thu Jan 9 11:30:01 2014 @@ -1,6 +1,6 @@ /* nbtool_config.h.in. Generated automatically from configure.ac by autoheader. */ -/* $NetBSD: nbtool_config.h.in,v 1.33 2013/08/14 10:15:14 jmcneill Exp $*/ +/* $NetBSD: nbtool_config.h.in,v 1.34 2014/01/09 11:30:01 apb Exp $*/ #ifndef __NETBSD_NBTOOL_CONFIG_H__ #define __NETBSD_NBTOOL_CONFIG_H__ @@ -203,6 +203,10 @@ don't. */ #undef HAVE_DECL_STRNDUP +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#undef HAVE_DECL_STRNLEN + /* Define to 1 if you have the declaration of `strsuftoll', and to 0 if you don't. */ #undef HAVE_DECL_STRSUFTOLL @@ -462,6 +466,9 @@ /* Define if you have the `strndup' function. */ #undef HAVE_STRNDUP +/* Define if you have the `strnlen' function. */ +#undef HAVE_STRNLEN + /* Define if you have the `strsep' function. */ #undef HAVE_STRSEP
CVS commit: src/tools/compat
Module Name:src Committed By: apb Date: Thu Jan 9 11:26:58 UTC 2014 Modified Files: src/tools/compat: configure.ac Log Message: Add strnlen to configure tests in tools/compat To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/tools/compat/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/configure.ac diff -u src/tools/compat/configure.ac:1.80 src/tools/compat/configure.ac:1.81 --- src/tools/compat/configure.ac:1.80 Wed Aug 14 10:14:45 2013 +++ src/tools/compat/configure.ac Thu Jan 9 11:26:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.80 2013/08/14 10:14:45 jmcneill Exp $ +# $NetBSD: configure.ac,v 1.81 2014/01/09 11:26:58 apb Exp $ # # Autoconf definition file for libnbcompat. # @@ -160,7 +160,7 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf pwrite raise_default_signal random setenv \ setgroupent setprogname setpassent \ snprintb_m snprintf strlcat strlcpy strmode \ - strndup strsep strsuftoll strtoll \ + strndup strnlen strsep strsuftoll strtoll \ user_from_uid uid_from_user vasprintf vasnprintf vsnprintf) AC_CHECK_DECLS([user_from_uid, uid_from_user, pwcache_userdb],,,[ @@ -169,7 +169,7 @@ AC_CHECK_DECLS([user_from_uid, uid_from_ AC_CHECK_DECLS([group_from_gid, gid_from_group, pwcache_groupdb],,,[ #include ]) -AC_CHECK_DECLS([strndup],,,[#include ]) +AC_CHECK_DECLS([strndup, strnlen],,,[#include ]) AC_CHECK_DECLS([strsuftoll],,,[#include ]) AC_CHECK_DECLS([lchflags, lchmod, lchown],,,[ #include
CVS commit: src/common/lib/libc/string
Module Name:src
Committed By: apb
Date: Thu Jan 9 11:25:11 UTC 2014
Modified Files:
src/common/lib/libc/string: strnlen.c
Log Message:
Make strnlen implementation usable from src/tools/compat.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/string/strnlen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/string/strnlen.c
diff -u src/common/lib/libc/string/strnlen.c:1.1 src/common/lib/libc/string/strnlen.c:1.2
--- src/common/lib/libc/string/strnlen.c:1.1 Thu Sep 1 22:35:18 2011
+++ src/common/lib/libc/string/strnlen.c Thu Jan 9 11:25:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: strnlen.c,v 1.1 2011/09/01 22:35:18 jym Exp $ */
+/* $NetBSD: strnlen.c,v 1.2 2014/01/09 11:25:11 apb Exp $ */
/*-
* Copyright (c) 2009 David Schultz
@@ -26,9 +26,13 @@
* SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strnlen.c,v 1.1 2011/09/01 22:35:18 jym Exp $");
+__RCSID("$NetBSD: strnlen.c,v 1.2 2014/01/09 11:25:11 apb Exp $");
#endif /* LIBC_SCCS and not lint */
/* FreeBSD: src/lib/libc/string/strnlen.c,v 1.1 2009/02/28 06:00:58 das Exp */
@@ -38,6 +42,7 @@ __RCSID("$NetBSD: strnlen.c,v 1.1 2011/0
#include
#endif
+#if !HAVE_STRNLEN
size_t
strnlen(const char *s, size_t maxlen)
{
@@ -49,3 +54,4 @@ strnlen(const char *s, size_t maxlen)
}
return (len);
}
+#endif /* !HAVE_STRNLEN */
