CVS commit: src/sys/dev
Module Name:src
Committed By: mrg
Date: Fri Apr 6 06:15:14 UTC 2012
Modified Files:
src/sys/dev: audio.c
Log Message:
don't hold the thread lock while calling allocm() or freem(). fixes PR#46121
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.259 src/sys/dev/audio.c:1.260
--- src/sys/dev/audio.c:1.259 Mon Mar 26 18:26:10 2012
+++ src/sys/dev/audio.c Fri Apr 6 06:15:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.259 2012/03/26 18:26:10 mrg Exp $ */
+/* $NetBSD: audio.c,v 1.260 2012/04/06 06:15:13 mrg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.259 2012/03/26 18:26:10 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.260 2012/04/06 06:15:13 mrg Exp $);
#include audio.h
#if NAUDIO 0
@@ -390,6 +390,7 @@ audioattach(device_t parent, device_t se
mixer_devinfo_t mi;
int iclass, mclass, oclass, rclass, props;
int record_master_found, record_source_found;
+ bool can_capture, can_playback;
sc = device_private(self);
sc-dev = self;
@@ -452,32 +453,27 @@ audioattach(device_t parent, device_t se
aprint_naive(\n);
aprint_normal(\n);
- /*
- * XXX Would like to not hold the sc_lock around this whole block
- * escpially for audio_alloc_ring(), except that the latter calls
- * -round_blocksize() which demands the thread lock to be taken.
- *
- * Revisit.
- */
mutex_enter(sc-sc_lock);
- if (audio_can_playback(sc)) {
+ can_playback = audio_can_playback(sc);
+ can_capture = audio_can_capture(sc);
+ mutex_exit(sc-sc_lock);
+
+ if (can_playback) {
error = audio_alloc_ring(sc, sc-sc_pr,
AUMODE_PLAY, AU_RING_SIZE);
if (error) {
sc-hw_if = NULL;
- mutex_exit(sc-sc_lock);
aprint_error(audio: could not allocate play buffer\n);
return;
}
}
- if (audio_can_capture(sc)) {
+ if (can_capture) {
error = audio_alloc_ring(sc, sc-sc_rr,
AUMODE_RECORD, AU_RING_SIZE);
if (error) {
if (sc-sc_pr.s.start != 0)
audio_free_ring(sc, sc-sc_pr);
sc-hw_if = NULL;
- mutex_exit(sc-sc_lock);
aprint_error(audio: could not allocate record buffer\n);
return;
}
@@ -485,6 +481,7 @@ audioattach(device_t parent, device_t se
sc-sc_lastgain = 128;
+ mutex_enter(sc-sc_lock);
error = audio_set_defaults(sc, 0);
mutex_exit(sc-sc_lock);
if (error != 0) {
@@ -885,8 +882,11 @@ audio_alloc_ring(struct audio_softc *sc,
if (bufsize AUMINBUF)
bufsize = AUMINBUF;
ROUNDSIZE(bufsize);
- if (hw-round_buffersize)
+ if (hw-round_buffersize) {
+ mutex_enter(sc-sc_lock);
bufsize = hw-round_buffersize(hdl, direction, bufsize);
+ mutex_exit(sc-sc_lock);
+ }
if (hw-allocm)
r-s.start = hw-allocm(hdl, direction, bufsize);
else
CVS commit: src/tests/lib/libc/string
Module Name:src
Committed By: jruoho
Date: Fri Apr 6 07:53:11 UTC 2012
Modified Files:
src/tests/lib/libc/string: t_memchr.c
Log Message:
Adjust.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/string/t_memchr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/string/t_memchr.c
diff -u src/tests/lib/libc/string/t_memchr.c:1.2 src/tests/lib/libc/string/t_memchr.c:1.3
--- src/tests/lib/libc/string/t_memchr.c:1.2 Thu Jul 14 05:46:04 2011
+++ src/tests/lib/libc/string/t_memchr.c Fri Apr 6 07:53:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_memchr.c,v 1.2 2011/07/14 05:46:04 jruoho Exp $ */
+/* $NetBSD: t_memchr.c,v 1.3 2012/04/06 07:53:10 jruoho Exp $ */
/*
* Written by J.T. Conklin j...@acorntoolworks.com
@@ -169,7 +169,6 @@ ATF_TC_HEAD(memrchr_simple, tc)
ATF_TC_BODY(memrchr_simple, tc)
{
char buf[] = abcdabcd;
- short i = 8;
ATF_CHECK(memrchr(buf, 'a', 0) == NULL);
ATF_CHECK(memrchr(buf, 'g', 0) == NULL);
@@ -178,15 +177,10 @@ ATF_TC_BODY(memrchr_simple, tc)
ATF_CHECK(memrchr(\0, 'x', 0) == NULL);
ATF_CHECK(memrchr(\0, 'x', 1) == NULL);
- while (i = 16) {
-
- ATF_CHECK(memrchr(buf, 'a', i) == buf + 4);
- ATF_CHECK(memrchr(buf, 'b', i) == buf + 5);
- ATF_CHECK(memrchr(buf, 'c', i) == buf + 6);
- ATF_CHECK(memrchr(buf, 'd', i) == buf + 7);
-
- i *= 2;
- }
+ ATF_CHECK(memrchr(buf, 'a', 8) == buf + 4);
+ ATF_CHECK(memrchr(buf, 'b', 8) == buf + 5);
+ ATF_CHECK(memrchr(buf, 'c', 8) == buf + 6);
+ ATF_CHECK(memrchr(buf, 'd', 8) == buf + 7);
}
ATF_TP_ADD_TCS(tp)
CVS commit: src/tests/lib/libm
Module Name:src Committed By: jruoho Date: Fri Apr 6 08:07:32 UTC 2012 Modified Files: src/tests/lib/libm: t_log.c Log Message: Point to PR port-alpha/46301 when failing on Alpha. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_log.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libm/t_log.c diff -u src/tests/lib/libm/t_log.c:1.6 src/tests/lib/libm/t_log.c:1.7 --- src/tests/lib/libm/t_log.c:1.6 Sun Feb 5 17:52:55 2012 +++ src/tests/lib/libm/t_log.c Fri Apr 6 08:07:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: t_log.c,v 1.6 2012/02/05 17:52:55 matt Exp $ */ +/* $NetBSD: t_log.c,v 1.7 2012/04/06 08:07:32 jruoho Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -29,11 +29,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: t_log.c,v 1.6 2012/02/05 17:52:55 matt Exp $); +__RCSID($NetBSD: t_log.c,v 1.7 2012/04/06 08:07:32 jruoho Exp $); #include atf-c.h -#include stdio.h +#include atf-c/config.h + #include math.h +#include stdio.h +#include string.h /* * log10(3) @@ -201,6 +204,9 @@ ATF_TC_BODY(log10f_inf_pos, tc) #ifndef __vax__ const float x = 1.0L / 0.0L; + if (strcmp(atf_config_get(atf_arch), alpha) == 0) + atf_tc_expect_fail(PR port-alpha/46301); + ATF_CHECK(log10f(x) == x); #endif } @@ -403,6 +409,9 @@ ATF_TC_BODY(log1pf_inf_pos, tc) #ifndef __vax__ const float x = 1.0L / 0.0L; + if (strcmp(atf_config_get(atf_arch), alpha) == 0) + atf_tc_expect_fail(PR port-alpha/46301); + ATF_CHECK(log1pf(x) == x); #endif } @@ -621,6 +630,9 @@ ATF_TC_BODY(log2f_inf_pos, tc) #ifndef __vax__ const float x = 1.0L / 0.0L; + if (strcmp(atf_config_get(atf_arch), alpha) == 0) + atf_tc_expect_fail(PR port-alpha/46301); + ATF_CHECK(log2f(x) == x); #endif } @@ -845,6 +857,9 @@ ATF_TC_BODY(logf_inf_pos, tc) #ifndef __vax__ const float x = 1.0L / 0.0L; + if (strcmp(atf_config_get(atf_arch), alpha) == 0) + atf_tc_expect_fail(PR port-alpha/46301); + ATF_CHECK(logf(x) == x); #endif }
CVS commit: [jmcneill-usbmp] src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Fri Apr 6 08:11:41 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: uhci.c
Log Message:
take the thread lock earlier in uhci_device_intr_start().
avoids failed mutex owned asserts, and now bt* work.
To generate a diff of this commit:
cvs rdiff -u -r1.240.6.19 -r1.240.6.20 src/sys/dev/usb/uhci.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/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.240.6.19 src/sys/dev/usb/uhci.c:1.240.6.20
--- src/sys/dev/usb/uhci.c:1.240.6.19 Thu Apr 5 22:32:09 2012
+++ src/sys/dev/usb/uhci.c Fri Apr 6 08:11:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.240.6.19 2012/04/05 22:32:09 mrg Exp $ */
+/* $NetBSD: uhci.c,v 1.240.6.20 2012/04/06 08:11:41 mrg Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.240.6.19 2012/04/05 22:32:09 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.240.6.20 2012/04/06 08:11:41 mrg Exp $);
#include opt_usb.h
@@ -2320,6 +2320,8 @@ uhci_device_intr_start(usbd_xfer_handle
panic(uhci_device_intr_transfer: a request);
#endif
+ mutex_enter(sc-sc_lock);
+
endpt = upipe-pipe.endpoint-edesc-bEndpointAddress;
isread = UE_GET_DIR(endpt) == UE_DIR_IN;
@@ -2328,8 +2330,11 @@ uhci_device_intr_start(usbd_xfer_handle
err = uhci_alloc_std_chain(upipe, sc, xfer-length, isread,
xfer-flags, xfer-dmabuf, data,
dataend);
- if (err)
+ if (err) {
+ mutex_exit(sc-sc_lock);
return (err);
+ }
+
dataend-td.td_status |= htole32(UHCI_TD_IOC);
usb_syncmem(dataend-dma,
dataend-offs + offsetof(uhci_td_t, td_status),
@@ -2344,7 +2349,6 @@ uhci_device_intr_start(usbd_xfer_handle
}
#endif
- mutex_enter(sc-sc_lock);
/* Set up interrupt info. */
ii-xfer = xfer;
ii-stdstart = data;
CVS commit: [jmcneill-usbmp] src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Apr 6 08:22:28 UTC 2012 Modified Files: src/sys/dev/usb [jmcneill-usbmp]: TODO.usbmp Log Message: note that ulpt and uplcom both attach To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/dev/usb/TODO.usbmp 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/TODO.usbmp diff -u src/sys/dev/usb/TODO.usbmp:1.1.2.9 src/sys/dev/usb/TODO.usbmp:1.1.2.10 --- src/sys/dev/usb/TODO.usbmp:1.1.2.9 Fri Apr 6 08:13:40 2012 +++ src/sys/dev/usb/TODO.usbmp Fri Apr 6 08:22:28 2012 @@ -1,4 +1,4 @@ -$NetBSD: TODO.usbmp,v 1.1.2.9 2012/04/06 08:13:40 mrg Exp $ +$NetBSD: TODO.usbmp,v 1.1.2.10 2012/04/06 08:22:28 mrg Exp $ the majority of the USB MP device interface is documented in usbdivar.h. @@ -123,7 +123,7 @@ driver testing: STATUS - ucycom - uep - udl - - ulpt + - ulpt attaches ok - uhso working (must take kernel lock for scsipi) - umass working (must take kernel lock for scsipi) - uaudio working @@ -171,7 +171,7 @@ ucom attachments: - uftdi - uipaq - umct - - uplcom + - uplcom attaches ok - uslsa - uvscom - moscom
CVS commit: src/sys/dev/mii
Module Name:src Committed By: isaki Date: Fri Apr 6 09:16:34 UTC 2012 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: Regen from miidevs,v 1.106; sync a comment with a fact. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.96 -r1.97 src/sys/dev/mii/miidevs_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/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.108 src/sys/dev/mii/miidevs.h:1.109 --- src/sys/dev/mii/miidevs.h:1.108 Fri Nov 25 23:29:28 2011 +++ src/sys/dev/mii/miidevs.h Fri Apr 6 09:16:34 2012 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.108 2011/11/25 23:29:28 jakllsch Exp $ */ +/* $NetBSD: miidevs.h,v 1.109 2012/04/06 09:16:34 isaki Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp + * NetBSD: miidevs,v 1.106 2012/04/06 09:15:37 isaki Exp */ /*- @@ -47,7 +47,7 @@ * mapping; the bit positions are defined in IEEE 802-1990, figure 5.2. * (There is a formal 802.3 interpretation, number 1-07/98 of July 09 1998, * about this.) - * The MII_OUI() macro in mii.h reflects this. + * The MII_OUI() macro in miivar.h reflects this. * If a vendor uses a different mapping, an xx prefixed OUI is defined here * which is mangled accordingly to compensate. */ Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.96 src/sys/dev/mii/miidevs_data.h:1.97 --- src/sys/dev/mii/miidevs_data.h:1.96 Fri Nov 25 23:29:28 2011 +++ src/sys/dev/mii/miidevs_data.h Fri Apr 6 09:16:34 2012 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs_data.h,v 1.96 2011/11/25 23:29:28 jakllsch Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.97 2012/04/06 09:16:34 isaki Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp + * NetBSD: miidevs,v 1.106 2012/04/06 09:15:37 isaki Exp */ /*-
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: wiz Date: Fri Apr 6 09:21:40 UTC 2012 Modified Files: src/external/public-domain/sqlite/lib: sqlite3.pc Log Message: Update version to 3.7.10, since that's what's currently in dist/ From Ryo ONODERA in PR 46300. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/sqlite/lib/sqlite3.pc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/sqlite3.pc diff -u src/external/public-domain/sqlite/lib/sqlite3.pc:1.1 src/external/public-domain/sqlite/lib/sqlite3.pc:1.2 --- src/external/public-domain/sqlite/lib/sqlite3.pc:1.1 Thu Oct 13 21:40:28 2011 +++ src/external/public-domain/sqlite/lib/sqlite3.pc Fri Apr 6 09:21:39 2012 @@ -1,4 +1,4 @@ Name: SQLite Description: SQL database engine -Version: 3.7.9 +Version: 3.7.10 Libs: -lsqlite3
CVS commit: src/sys/arch/x68k/stand/mboot
Module Name:src
Committed By: isaki
Date: Fri Apr 6 09:38:40 UTC 2012
Modified Files:
src/sys/arch/x68k/stand/mboot: mboot.c
Log Message:
Print my progname in error messages.
It makes easy to find who displayed it.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/mboot/mboot.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/x68k/stand/mboot/mboot.c
diff -u src/sys/arch/x68k/stand/mboot/mboot.c:1.10 src/sys/arch/x68k/stand/mboot/mboot.c:1.11
--- src/sys/arch/x68k/stand/mboot/mboot.c:1.10 Thu Apr 5 12:01:36 2012
+++ src/sys/arch/x68k/stand/mboot/mboot.c Fri Apr 6 09:38:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mboot.c,v 1.10 2012/04/05 12:01:36 isaki Exp $ */
+/* $NetBSD: mboot.c,v 1.11 2012/04/06 09:38:40 isaki Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -58,12 +58,12 @@ bootmain(int scsiid)
{
long *label = (void*) 0x3000;
if (IOCS_S_READ(0, 1, scsiid, size, label) 0) {
- IOCS_B_PRINT(Error in reading.\r\n);
+ IOCS_B_PRINT(BOOT : Error in reading.\r\n);
return 0;
}
if (label[0] != 0x58363853 ||
label[1] != 0x43534931) {
- IOCS_B_PRINT(Invalid disk.\r\n);
+ IOCS_B_PRINT(BOOT : Invalid disk.\r\n);
return 0;
}
}
@@ -74,12 +74,12 @@ bootmain(int scsiid)
unsigned char *t;
if (IOCS_S_READ(2(2-size), size?2:1, scsiid, size, label) 0) {
- IOCS_B_PRINT(Error in reading.\r\n);
+ IOCS_B_PRINT(BOOT : Error in reading.\r\n);
return 0;
}
t = label-dosparts[0].dp_typname;
if (t[0] != 'X' || t[1] != '6' || t[2] != '8' || t[3] != 'K') {
- IOCS_B_PRINT(Invalid disk.\r\n);
+ IOCS_B_PRINT(BOOT : Invalid disk.\r\n);
return 0;
}
@@ -108,11 +108,11 @@ bootmain(int scsiid)
size,
(void*) 0x2400);
if (r 0) {
-IOCS_B_PRINT (Error in reading.\r\n);
+IOCS_B_PRINT(BOOT : Error in reading.\r\n);
return 0;
}
if (*((char*) 0x2400) != 0x60) {
-IOCS_B_PRINT(Invalid disk.\r\n);
+IOCS_B_PRINT(BOOT : Invalid disk.\r\n);
return 0;
}
__asm volatile (movl %0,%%d4\n\t
@@ -123,7 +123,7 @@ bootmain(int scsiid)
: d4);
return 0;
}
- IOCS_B_PRINT (No bootable partition.\r\n);
+ IOCS_B_PRINT(BOOT : No bootable partition.\r\n);
return 0;
}
CVS commit: src/sys/arch/x68k/stand/mboot
Module Name:src
Committed By: isaki
Date: Fri Apr 6 09:44:44 UTC 2012
Modified Files:
src/sys/arch/x68k/stand/mboot: mboot.c
Log Message:
Oops, One more message.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/mboot/mboot.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/x68k/stand/mboot/mboot.c
diff -u src/sys/arch/x68k/stand/mboot/mboot.c:1.11 src/sys/arch/x68k/stand/mboot/mboot.c:1.12
--- src/sys/arch/x68k/stand/mboot/mboot.c:1.11 Fri Apr 6 09:38:40 2012
+++ src/sys/arch/x68k/stand/mboot/mboot.c Fri Apr 6 09:44:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mboot.c,v 1.11 2012/04/06 09:38:40 isaki Exp $ */
+/* $NetBSD: mboot.c,v 1.12 2012/04/06 09:44:44 isaki Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@ bootmain(int scsiid)
return 0;
if (IOCS_S_READCAP(scsiid, cap) 0) {
- IOCS_B_PRINT(Error in reading.\r\n);
+ IOCS_B_PRINT(BOOT : Error in reading.\r\n);
return 0;
}
size = cap.size 9;
CVS commit: src/external/mit/expat/dist
Module Name:src Committed By: spz Date: Fri Apr 6 10:23:44 UTC 2012 Update of /cvsroot/src/external/mit/expat/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16154 Log Message: import of expat 2.1.0 Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security issues have been previously fixed in our tree) relevant Changes: Release 2.1.0 Sat March 24 2012 - Bug Fixes: #1742315: Harmful XML_ParserCreateNS suggestion. #2895533: CVE-2012-1147 - Resource leak in readfilemap.c. #1785430: Expat build fails on linux-amd64 with gcc version=4.1 -O3. #1983953, 2517952, 2517962, 2649838: Build modifications using autoreconf instead of buildconf.sh. #2815947, #2884086: OBJEXT and EXEEXT support while building. #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences. #2517938: xmlwf should return non-zero exit status if not well-formed. #2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml. #2855609: Dangling positionPtr after error. #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8(). #2958794: CVE-2012-1148 - Memory leak in poolGrow. #2990652: CMake support. #3010819: UNEXPECTED_STATE with a trailing % in entity value. #3206497: Unitialized memory returned from XML_Parse. #3287849: make check fails on mingw-w64. #3496608: CVE-2012-0876 - Hash DOS attack. - Patches: #1749198: pkg-config support. #3010222: Fix for bug #3010819. #3312568: CMake support. #3446384: Report byte offsets for attr names and values. - New Features / API changes: Added new API member XML_SetHashSalt() that allows setting an intial value (salt) for hash calculations. This is part of the fix for bug #3496608 to randomize hash parameters. When compiled with XML_ATTR_INFO defined, adds new API member XML_GetAttributeInfo() that allows retrieving the byte offsets for attribute names and values (patch #3446384). Added CMake build system. See bug #2990652 and patch #3312568. Added run-benchmark target to Makefile.in - relies on testdata module present in the same relative location as in the repository. Status: Vendor Tag: expat Release Tags: expat-2-1-0 N src/external/mit/expat/dist/CMakeLists.txt U src/external/mit/expat/dist/COPYING U src/external/mit/expat/dist/expat.dsw U src/external/mit/expat/dist/README U src/external/mit/expat/dist/Changes N src/external/mit/expat/dist/ConfigureChecks.cmake U src/external/mit/expat/dist/configure N src/external/mit/expat/dist/expat.pc.in N src/external/mit/expat/dist/expat_config.h.cmake N src/external/mit/expat/dist/CMake.README U src/external/mit/expat/dist/MANIFEST U src/external/mit/expat/dist/expat_config.h.in U src/external/mit/expat/dist/Makefile.in U src/external/mit/expat/dist/configure.in N src/external/mit/expat/dist/aclocal.m4 C src/external/mit/expat/dist/conftools/mkinstalldirs U src/external/mit/expat/dist/conftools/PrintPath U src/external/mit/expat/dist/conftools/config.sub U src/external/mit/expat/dist/conftools/expat.m4 U src/external/mit/expat/dist/conftools/get-version.sh U src/external/mit/expat/dist/conftools/install-sh U src/external/mit/expat/dist/conftools/ltmain.sh U src/external/mit/expat/dist/conftools/config.guess C src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 U src/external/mit/expat/dist/examples/outline.c U src/external/mit/expat/dist/examples/elements.c U src/external/mit/expat/dist/examples/elements.dsp U src/external/mit/expat/dist/examples/outline.dsp U src/external/mit/expat/dist/bcb5/libexpatw_mtd.def U src/external/mit/expat/dist/bcb5/expat_static.mak U src/external/mit/expat/dist/bcb5/outline.mak U src/external/mit/expat/dist/bcb5/xmlwf.bpf U src/external/mit/expat/dist/bcb5/all_projects.bpg U src/external/mit/expat/dist/bcb5/expatw.mak U src/external/mit/expat/dist/bcb5/expat.mak U src/external/mit/expat/dist/bcb5/xmlwf.bpr U src/external/mit/expat/dist/bcb5/expat_static.bpf U src/external/mit/expat/dist/bcb5/expatw.bpf U src/external/mit/expat/dist/bcb5/makefile.mak U src/external/mit/expat/dist/bcb5/outline.bpr U src/external/mit/expat/dist/bcb5/expatw.bpr U src/external/mit/expat/dist/bcb5/expat.bpf U src/external/mit/expat/dist/bcb5/setup.bat U src/external/mit/expat/dist/bcb5/outline.bpf U src/external/mit/expat/dist/bcb5/elements.bpr U src/external/mit/expat/dist/bcb5/elements.mak U src/external/mit/expat/dist/bcb5/elements.bpf U src/external/mit/expat/dist/bcb5/README.txt U src/external/mit/expat/dist/bcb5/expatw_static.mak U src/external/mit/expat/dist/bcb5/expatw_static.bpf U src/external/mit/expat/dist/bcb5/libexpat_mtd.def U src/external/mit/expat/dist/bcb5/expat_static.bpr U
CVS commit: src/external/mit/expat/dist
Module Name:src Committed By: spz Date: Fri Apr 6 10:46:13 UTC 2012 Modified Files: src/external/mit/expat/dist/conftools: ac_c_bigendian_cross.m4 mkinstalldirs src/external/mit/expat/dist/lib: xmlparse.c xmltok_impl.c Removed Files: src/external/mit/expat/dist/amiga: stdlib.c src/external/mit/expat/dist/conftools: libtool.m4 Log Message: merge expat-2.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/amiga/stdlib.c cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 \ src/external/mit/expat/dist/conftools/mkinstalldirs cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/conftools/libtool.m4 cvs rdiff -u -r1.2 -r1.3 src/external/mit/expat/dist/lib/xmlparse.c \ src/external/mit/expat/dist/lib/xmltok_impl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 diff -u src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.2 src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.3 --- src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.2 Sat Feb 11 18:22:58 2012 +++ src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 Fri Apr 6 10:46:13 2012 @@ -7,7 +7,7 @@ dnl The implementation will create a bin dnl the binary it will be grep'ed for some symbols that will look dnl different for different endianess of the binary. dnl -dnl @version $Id: ac_c_bigendian_cross.m4,v 1.2 2012/02/11 18:22:58 tron Exp $ +dnl @version Id: ac_c_bigendian_cross.m4,v 1.2 2001/10/01 20:03:13 fdrake Exp dnl @author Guido Draheim gui...@gmx.de dnl AC_DEFUN([AC_C_BIGENDIAN_CROSS], Index: src/external/mit/expat/dist/conftools/mkinstalldirs diff -u src/external/mit/expat/dist/conftools/mkinstalldirs:1.2 src/external/mit/expat/dist/conftools/mkinstalldirs:1.3 --- src/external/mit/expat/dist/conftools/mkinstalldirs:1.2 Sat Feb 11 18:22:58 2012 +++ src/external/mit/expat/dist/conftools/mkinstalldirs Fri Apr 6 10:46:13 2012 @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.2 2012/02/11 18:22:58 tron Exp $ +# Id: mkinstalldirs,v 1.1 2000/09/18 16:26:21 coopercc Exp errstatus=0 Index: src/external/mit/expat/dist/lib/xmlparse.c diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.2 src/external/mit/expat/dist/lib/xmlparse.c:1.3 --- src/external/mit/expat/dist/lib/xmlparse.c:1.2 Sat Feb 11 18:22:58 2012 +++ src/external/mit/expat/dist/lib/xmlparse.c Fri Apr 6 10:46:13 2012 @@ -5,6 +5,8 @@ #include stddef.h #include string.h /* memset(), memcpy() */ #include assert.h +#include limits.h /* UINT_MAX */ +#include time.h /* time() */ #define XML_BUILDING_EXPAT 1 @@ -12,7 +14,7 @@ #include winconfig.h #elif defined(MACOS_CLASSIC) #include macconfig.h -#elif defined(__amigaos4__) +#elif defined(__amigaos__) #include amigaconfig.h #elif defined(__WATCOMC__) #include watcomconfig.h @@ -327,15 +329,15 @@ processXmlDecl(XML_Parser parser, int is static enum XML_Error initializeEncoding(XML_Parser parser); static enum XML_Error -doProlog(XML_Parser parser, const ENCODING *enc, const char *s, - const char *end, int tok, const char *next, const char **nextPtr, +doProlog(XML_Parser parser, const ENCODING *enc, const char *s, + const char *end, int tok, const char *next, const char **nextPtr, XML_Bool haveMore); static enum XML_Error -processInternalEntity(XML_Parser parser, ENTITY *entity, +processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl); static enum XML_Error doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc, - const char *start, const char *end, const char **endPtr, + const char *start, const char *end, const char **endPtr, XML_Bool haveMore); static enum XML_Error doCdataSection(XML_Parser parser, const ENCODING *, const char **startPtr, @@ -353,7 +355,7 @@ static enum XML_Error addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId, const XML_Char *uri, BINDING **bindingsPtr); static int -defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata, +defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata, XML_Bool isId, const XML_Char *dfltValue, XML_Parser parser); static enum XML_Error storeAttributeValue(XML_Parser parser, const ENCODING *, XML_Bool isCdata, @@ -391,12 +393,13 @@ static void dtdReset(DTD *p, const XML_M static void dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms); static int -dtdCopy(DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms); +dtdCopy(XML_Parser oldParser, +DTD *newDtd, const DTD *oldDtd, const
CVS commit: src/doc
Module Name:src Committed By: spz Date: Fri Apr 6 10:55:19 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: expat is now at 2.1.0 To generate a diff of this commit: cvs rdiff -u -r1.932 -r1.933 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.932 src/doc/3RDPARTY:1.933 --- src/doc/3RDPARTY:1.932 Tue Apr 3 22:21:13 2012 +++ src/doc/3RDPARTY Fri Apr 6 10:55:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.932 2012/04/03 22:21:13 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.933 2012/04/06 10:55:19 spz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -311,7 +311,7 @@ Use src/gnu/dist/diffutils/diffutils2net for the import. Package: expat -Version: 2.0.1 +Version: 2.1.0 Current Vers: 2.1.0 Maintainer: mrg Archive Site: http://sourceforge.net/projects/expat/files/expat/
CVS commit: src/lib/libc/time
Module Name:src Committed By: wiz Date: Fri Apr 6 11:35:39 UTC 2012 Modified Files: src/lib/libc/time: strftime.3 Log Message: Fix typo, from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/time/strftime.3 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/time/strftime.3 diff -u src/lib/libc/time/strftime.3:1.28 src/lib/libc/time/strftime.3:1.29 --- src/lib/libc/time/strftime.3:1.28 Thu Apr 14 05:50:50 2011 +++ src/lib/libc/time/strftime.3 Fri Apr 6 11:35:39 2012 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ from: @(#)strftime.3 5.12 (Berkeley) 6/29/91 -.\ $NetBSD: strftime.3,v 1.28 2011/04/14 05:50:50 jruoho Exp $ +.\ $NetBSD: strftime.3,v 1.29 2012/04/06 11:35:39 wiz Exp $ .\ .Dd April 14, 2011 .Dt STRFTIME 3 @@ -190,7 +190,7 @@ is replaced by the year without century .It Cm \%Z is replaced by the time zone name. .It Cm \%z -is replaced by the offset from ITC in the ISO 8601 format +is replaced by the offset from UTC in the ISO 8601 format .Dq Li [-]hhmm . .It Cm %% is replaced by
CVS commit: src/lib/libutil
Module Name:src Committed By: wiz Date: Fri Apr 6 11:36:04 UTC 2012 Modified Files: src/lib/libutil: parsedate.3 Log Message: Fix capitalization and typo, from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libutil/parsedate.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/parsedate.3 diff -u src/lib/libutil/parsedate.3:1.10 src/lib/libutil/parsedate.3:1.11 --- src/lib/libutil/parsedate.3:1.10 Wed Dec 22 09:12:28 2010 +++ src/lib/libutil/parsedate.3 Fri Apr 6 11:36:04 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: parsedate.3,v 1.10 2010/12/22 09:12:28 wiz Exp $ +.\ $NetBSD: parsedate.3,v 1.11 2012/04/06 11:36:04 wiz Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,7 +44,7 @@ The .Fn parsedate function parses a datetime from .Ar datestr -described in english relative to an optional +described in English relative to an optional .Ar time point and an optional timezone offset in seconds specified in .Ar tzoff . @@ -94,7 +94,7 @@ is unused so that it is not confused wit 10, .Dv eleventh or eleven = 11, -.Dv twelfth or twoelve = +.Dv twelfth or twelve = 12. .Pp The following words are recognized in English only:
CVS commit: src/bin/date
Module Name:src Committed By: wiz Date: Fri Apr 6 11:36:56 UTC 2012 Modified Files: src/bin/date: date.1 Log Message: - fix timed(8) references; - fix capitalization; - add reference to environ(7) in `SEE ALSO' section, as it is mentioned in the text. From patch by Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/bin/date/date.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/date/date.1 diff -u src/bin/date/date.1:1.41 src/bin/date/date.1:1.42 --- src/bin/date/date.1:1.41 Thu Feb 4 22:56:11 2010 +++ src/bin/date/date.1 Fri Apr 6 11:36:56 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: date.1,v 1.41 2010/02/04 22:56:11 wiz Exp $ +.\ $NetBSD: date.1,v 1.42 2012/04/06 11:36:56 wiz Exp $ .\ .\ Copyright (c) 1980, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -84,7 +84,7 @@ The utility .Xr timed 8 is used to synchronize the clocks on groups of machines. By default, if -timed +.Xr timed 8 is running, .Nm will set the time on all of the machines in the local group. @@ -153,7 +153,7 @@ The second of the minute, from 00 to 61. .Pp Everything but the minutes is optional. .Pp -Time changes for Daylight Saving and Standard time and leap seconds +Time changes for Daylight Saving and Standard Time and leap seconds and years are handled automatically. .Sh ENVIRONMENT The following environment variables affect the execution of @@ -217,12 +217,13 @@ On these occasions, prints: .Ql Network time being set . The message -.Ql Communication error with timed +.Ql Communication error with +.Xr timed 8 occurs when the communication between .Nm and -timed +.Xr timed 8 fails. .Sh SEE ALSO .Xr adjtime 2 , @@ -231,6 +232,7 @@ fails. .Xr parsedate 3 , .Xr strftime 3 , .Xr utmp 5 , +.Xr environ 7 , .Xr timed 8 .Rs .%T TSP: The Time Synchronization Protocol for UNIX 4.3BSD
CVS commit: src/bin/cat
Module Name:src Committed By: wiz Date: Fri Apr 6 11:42:08 UTC 2012 Modified Files: src/bin/cat: cat.1 Log Message: Describe behaviour when no arguments are given. Add comma. Bump date. From Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/bin/cat/cat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/cat/cat.1 diff -u src/bin/cat/cat.1:1.32 src/bin/cat/cat.1:1.33 --- src/bin/cat/cat.1:1.32 Sat Sep 23 11:24:44 2006 +++ src/bin/cat/cat.1 Fri Apr 6 11:42:08 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cat.1,v 1.32 2006/09/23 11:24:44 wiz Exp $ +.\ $NetBSD: cat.1,v 1.33 2012/04/06 11:42:08 wiz Exp $ .\ .\ Copyright (c) 1989, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)cat.1 8.3 (Berkeley) 5/2/95 .\ -.Dd September 23, 2006 +.Dd April 6, 2012 .Dt CAT 1 .Os .Sh NAME @@ -54,6 +54,9 @@ A single dash represents the standard in and may appear multiple times in the .Ar file list. +If no +.Ar file +operands are given, standard input is read. .Pp The word .Dq concatenate @@ -65,7 +68,7 @@ The options are as follows: .It Fl b Implies the .Fl n -option but doesn't number blank lines. +option, but doesn't number blank lines. .It Fl e Implies the .Fl v
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Fri Apr 6 12:21:59 UTC 2012
Modified Files:
src/sys/arch/hp700/conf: GENERIC
src/sys/arch/hp700/dev: cpu.c
src/sys/arch/hp700/hp700: locore.S
src/sys/arch/hppa/hppa: fpu.c trap.S trap.c
Log Message:
unifdef FPEMUL. All our supported systems have an FPU.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/hp700/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hp700/dev/cpu.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/hp700/hp700/locore.S
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hppa/hppa/fpu.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/hppa/hppa/trap.S
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/hppa/hppa/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/conf/GENERIC
diff -u src/sys/arch/hp700/conf/GENERIC:1.112 src/sys/arch/hp700/conf/GENERIC:1.113
--- src/sys/arch/hp700/conf/GENERIC:1.112 Sat Mar 10 21:51:52 2012
+++ src/sys/arch/hp700/conf/GENERIC Fri Apr 6 12:21:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.112 2012/03/10 21:51:52 joerg Exp $
+# $NetBSD: GENERIC,v 1.113 2012/04/06 12:21:58 skrll Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include arch/hp700/conf/std.hp700
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident GENERIC-$Revision: 1.112 $
+#ident GENERIC-$Revision: 1.113 $
maxusers 32 # estimated number of users
@@ -40,7 +40,6 @@ options HP8600_CPU # PCX-W+ (in 32bit
options HP8700_CPU # PCX-W2 (in 32bit mode)
# CPU-related options.
-options FPEMUL # floating point emulation XXX DO NOT REMOVE
options USELEDS # blink 'em
# delay between rebooting ... message and hardware reset, in milliseconds
Index: src/sys/arch/hp700/dev/cpu.c
diff -u src/sys/arch/hp700/dev/cpu.c:1.22 src/sys/arch/hp700/dev/cpu.c:1.23
--- src/sys/arch/hp700/dev/cpu.c:1.22 Thu Apr 5 21:00:29 2012
+++ src/sys/arch/hp700/dev/cpu.c Fri Apr 6 12:21:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.22 2012/04/05 21:00:29 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.23 2012/04/06 12:21:58 skrll Exp $ */
/* $OpenBSD: cpu.c,v 1.29 2009/02/08 18:33:28 miod Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.22 2012/04/05 21:00:29 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.23 2012/04/06 12:21:58 skrll Exp $);
#include opt_multiprocessor.h
@@ -146,23 +146,14 @@ cpuattach(device_t parent, device_t self
aprint_normal(, %u/%u D/I BTLBs, pdc_btlb.finfo.num_i,
pdc_btlb.finfo.num_d);
}
+ aprint_normal(\n);
/*
* Describe the floating-point support.
*/
-#ifndef FPEMUL
- if (!fpu_present)
- aprint_normal(\n%s: no floating point support,
- self-dv_xname);
- else
-#endif /* !FPEMUL */
- {
- aprint_normal(\n%s: %s floating point, rev %d, self-dv_xname,
- hppa_mod_info(HPPA_TYPE_FPU, (fpu_version 16) 0x1f),
- (fpu_version 11) 0x1f);
- }
-
- aprint_normal(\n);
+ aprint_normal(%s: %s floating point, rev %d\n, self-dv_xname,
+ hppa_mod_info(HPPA_TYPE_FPU, (fpu_version 16) 0x1f),
+ (fpu_version 11) 0x1f);
/* sanity against luser amongst config editors */
if (ca-ca_irq != 31) {
Index: src/sys/arch/hp700/hp700/locore.S
diff -u src/sys/arch/hp700/hp700/locore.S:1.59 src/sys/arch/hp700/hp700/locore.S:1.60
--- src/sys/arch/hp700/hp700/locore.S:1.59 Thu Apr 5 19:42:13 2012
+++ src/sys/arch/hp700/hp700/locore.S Fri Apr 6 12:21:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.59 2012/04/05 19:42:13 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.60 2012/04/06 12:21:59 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */
/*
@@ -1034,13 +1034,6 @@ switch_exited:
ldw HPPA_FRAME_ARG(0)(%r3), %arg0
noras:
- /*
- * As an optimization, hppa_fpu_bootstrap
- * replaces this branch instruction with a
- * nop if there is a hardware FPU.
- */
-ALTENTRY(hppa_fpu_nop1)
- b,n switch_return
/*
* We do have a hardware FPU. If the LWP
Index: src/sys/arch/hppa/hppa/fpu.c
diff -u src/sys/arch/hppa/hppa/fpu.c:1.23 src/sys/arch/hppa/hppa/fpu.c:1.24
--- src/sys/arch/hppa/hppa/fpu.c:1.23 Sun Jan 23 09:44:59 2011
+++ src/sys/arch/hppa/hppa/fpu.c Fri Apr 6 12:21:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.23 2011/01/23 09:44:59 skrll Exp $ */
+/* $NetBSD: fpu.c,v 1.24 2012/04/06 12:21:59 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.23 2011/01/23 09:44:59 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.24 2012/04/06 12:21:59 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -82,7 +82,8 @@ u_int fpu_csw;
void hppa_fpu_swapout(struct pcb *);
void hppa_fpu_swap(struct fpreg *, struct fpreg *);
-#ifdef FPEMUL
+static int
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Fri Apr 6 13:09:32 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: Remove unnecessary cache flushes. FP regs are stored in memory from a pool which is direct mapped and therefore available in virtual and physical modes. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/trap.S diff -u src/sys/arch/hppa/hppa/trap.S:1.66 src/sys/arch/hppa/hppa/trap.S:1.67 --- src/sys/arch/hppa/hppa/trap.S:1.66 Fri Apr 6 12:21:59 2012 +++ src/sys/arch/hppa/hppa/trap.S Fri Apr 6 13:09:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.S,v 1.66 2012/04/06 12:21:59 skrll Exp $ */ +/* $NetBSD: trap.S,v 1.67 2012/04/06 13:09:32 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -1094,19 +1094,6 @@ ALTENTRY(hppa_fpu_swap) fstds,ma %fr30, 8(%arg0) fstds%fr31, 0(%arg0) - ldo -248(%arg0), %arg0 - ldil L%dcache_stride, %r1 - ldw R%dcache_stride(%r1), %r1 - fdc,m %r1(%arg0) - fdc,m %r1(%arg0) - fdc,m %r1(%arg0) - fdc,m %r1(%arg0) - fdc,m %r1(%arg0) - fdc,m %r1(%arg0) - fdc,m %r1(%arg0) - fdc,m %r1(%arg0) - sync - L$fpu_swap_in: /* @@ -1160,18 +1147,6 @@ L$fpu_swap_in: fldds,ma -8(%arg1), %fr1 fldds 0(%arg1), %fr0 /* fr0 must be restored last */ - ldil L%dcache_stride, %r1 - ldw R%dcache_stride(%r1), %r1 - fdc,m %r1(%arg1) - fdc,m %r1(%arg1) - fdc,m %r1(%arg1) - fdc,m %r1(%arg1) - fdc,m %r1(%arg1) - fdc,m %r1(%arg1) - fdc,m %r1(%arg1) - fdc,m %r1(%arg1) - sync - L$fpu_swap_done: /* Increment the switch count and return. */
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Fri Apr 6 13:13:13 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: trap.S Log Message: Update comments to reflect that we always have a hardware FPU. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/hppa/hppa/trap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/trap.S diff -u src/sys/arch/hppa/hppa/trap.S:1.67 src/sys/arch/hppa/hppa/trap.S:1.68 --- src/sys/arch/hppa/hppa/trap.S:1.67 Fri Apr 6 13:09:32 2012 +++ src/sys/arch/hppa/hppa/trap.S Fri Apr 6 13:13:13 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.S,v 1.67 2012/04/06 13:09:32 skrll Exp $ */ +/* $NetBSD: trap.S,v 1.68 2012/04/06 13:13:13 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -911,10 +911,7 @@ LEAF_ENTRY_NOPROFILE(TLABEL(emu)) /* * If we're still here, this is a FPU coprocessor instruction. That we - * trapped to emulate it means one of three things. - * - * If we do not have a hardware FPU, we need to emulate this instr- - * uction. + * trapped to emulate it means one of two things. * * If we do have a hardware FPU but it is disabled, we trapped because * the current process' state is not loaded into the FPU. We load that @@ -925,12 +922,6 @@ LEAF_ENTRY_NOPROFILE(TLABEL(emu)) * emulate it. */ - /* - * As an optimization, hppa_fpu_bootstrap replaces this branch inst- - * ruction with a nop if there is a hardware FPU. - * - * Otherwise, this is the branch to emulate an FPU coprocessor. - */ hppa_fpu_emulate: /*
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Fri Apr 6 17:02:09 UTC 2012
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader [netbsd-6]:
Makefile
src/tests/lib/libppath [netbsd-6]: Makefile plist_to_c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #147):
tests/lib/libppath/Makefile: revision 1.4
external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:
revision 1.11
external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:
revision 1.12
tests/lib/libppath/plist_to_c: revision 1.2
Use :Q for quoting. Execute shell script using the host shell.
Use :Q for quoting. Execute shell script using the host shell.
Use toolchain awk to make them buildable on Solaris 10.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.4.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.3 -r1.3.2.1 src/tests/lib/libppath/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tests/lib/libppath/plist_to_c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10.4.1
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Fri Apr 6 17:02:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2012/04/06 17:02:09 riz Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -48,10 +48,10 @@ CPPFLAGS.sdksyms.c= ${X11FLAGS.EXTENSION
#COPTS.sdksyms.c= -Wno-error
COPTS.loadmod.c= -Wno-error
-.include bsd.x11.mk
-.include bsd.lib.mk
-
sdksyms.c: sdksyms.sh
- CPP='$(CPP)' AWK='$(AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+ CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
sdksyms.d: sdksyms.c
CLEANFILES+= sdksyms.c
+
+.include bsd.x11.mk
+.include bsd.lib.mk
Index: src/tests/lib/libppath/Makefile
diff -u src/tests/lib/libppath/Makefile:1.3 src/tests/lib/libppath/Makefile:1.3.2.1
--- src/tests/lib/libppath/Makefile:1.3 Fri Jan 20 15:06:47 2012
+++ src/tests/lib/libppath/Makefile Fri Apr 6 17:02:09 2012
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2012/01/20 15:06:47 tsutsui Exp $
+# $Id: Makefile,v 1.3.2.1 2012/04/06 17:02:09 riz Exp $
.include bsd.own.mk
@@ -16,7 +16,7 @@ CPPFLAGS+=-I$(.OBJDIR)
echo extern const char ${.TARGET:S,.h$,,} []; ${.TARGET}
.plist.c:
- ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} ${.IMPSRC} ${.TARGET}
+ AWK=${TOOL_AWK:Q} ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} ${.IMPSRC} ${.TARGET}
CLEANFILES+=personnel.c personnel.h
Index: src/tests/lib/libppath/plist_to_c
diff -u src/tests/lib/libppath/plist_to_c:1.1 src/tests/lib/libppath/plist_to_c:1.1.4.1
--- src/tests/lib/libppath/plist_to_c:1.1 Thu Aug 25 19:09:46 2011
+++ src/tests/lib/libppath/plist_to_c Fri Apr 6 17:02:09 2012
@@ -12,7 +12,7 @@ if [ $# -ne 1 ]; then
fi
sed 's/\([\]\)/\\\1/g' | \
-awk -v sym=$1 '
+${AWK:-awk} -v sym=$1 '
BEGIN { printf const char sym [] = \; }
{ printf $0 \\n; }
END { print \;; }'
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: chs
Date: Fri Apr 6 17:12:46 UTC 2012
Modified Files:
src/sys/dev/scsipi: atapiconf.c
Log Message:
take the kernel lock during detach of atapibus as well.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/scsipi/atapiconf.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/scsipi/atapiconf.c
diff -u src/sys/dev/scsipi/atapiconf.c:1.83 src/sys/dev/scsipi/atapiconf.c:1.84
--- src/sys/dev/scsipi/atapiconf.c:1.83 Mon Jun 7 01:41:39 2010
+++ src/sys/dev/scsipi/atapiconf.c Fri Apr 6 17:12:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atapiconf.c,v 1.83 2010/06/07 01:41:39 pgoyette Exp $ */
+/* $NetBSD: atapiconf.c,v 1.84 2012/04/06 17:12:45 chs Exp $ */
/*
* Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atapiconf.c,v 1.83 2010/06/07 01:41:39 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: atapiconf.c,v 1.84 2012/04/06 17:12:45 chs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -171,6 +171,9 @@ atapibuschilddet(device_t self, device_t
struct scsipi_periph *periph;
int target;
+ /* XXXSMP scsipi */
+ KERNEL_LOCK(1, curlwp);
+
for (target = 0; target chan-chan_ntargets; target++) {
periph = scsipi_lookup_periph(chan, target, 0);
if (periph == NULL || periph-periph_dev != child)
@@ -179,6 +182,9 @@ atapibuschilddet(device_t self, device_t
free(periph, M_DEVBUF);
break;
}
+
+ /* XXXSMP scsipi */
+ KERNEL_UNLOCK_ONE(curlwp);
}
static int
CVS commit: src/sys/uvm
Module Name:src
Committed By: chs
Date: Fri Apr 6 17:16:30 UTC 2012
Modified Files:
src/sys/uvm: uvm_glue.c
Log Message:
fix uarea_system_poolpage_free() to handle freeing a uarea
that was not allocated by cpu_uarea_alloc() (ie. on plaforms
where cpu_uarea_alloc() failing is not fatal).
fixes PR 46284.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/uvm/uvm_glue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.157 src/sys/uvm/uvm_glue.c:1.158
--- src/sys/uvm/uvm_glue.c:1.157 Mon Feb 20 12:21:23 2012
+++ src/sys/uvm/uvm_glue.c Fri Apr 6 17:16:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.157 2012/02/20 12:21:23 martin Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.158 2012/04/06 17:16:30 chs Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.157 2012/02/20 12:21:23 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_glue.c,v 1.158 2012/04/06 17:16:30 chs Exp $);
#include opt_kgdb.h
#include opt_kstack.h
@@ -315,8 +315,11 @@ uarea_system_poolpage_alloc(struct pool
static void
uarea_system_poolpage_free(struct pool *pp, void *addr)
{
- if (!cpu_uarea_free(addr))
- panic(%s: failed to free uarea %p, __func__, addr);
+ if (cpu_uarea_free(addr))
+ return;
+
+ uvm_km_free(kernel_map, (vaddr_t)addr, pp-pr_alloc-pa_pagesz,
+ UVM_KMF_WIRED);
}
static struct pool_allocator uvm_uarea_system_allocator = {
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: chs
Date: Fri Apr 6 17:23:40 UTC 2012
Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: errata.c
Log Message:
bring in this change from openbsd:
Implement the AMD suggested workaround for family 10h 12h errata 721
Processor May Incorrectly Update Stack Pointer by setting a bit
marked 'reserved' in an MSR that is only documented to exist on 12h.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/x86/errata.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/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.56 src/sys/arch/x86/include/specialreg.h:1.57
--- src/sys/arch/x86/include/specialreg.h:1.56 Fri Mar 2 16:41:00 2012
+++ src/sys/arch/x86/include/specialreg.h Fri Apr 6 17:23:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.56 2012/03/02 16:41:00 bouyer Exp $ */
+/* $NetBSD: specialreg.h,v 1.57 2012/04/06 17:23:39 chs Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -516,6 +516,9 @@
#define BU_CFG_WBPFSMCCHKDIS 0x2000ULL
#define BU_CFG_WBENHWSBDIS 0x0001ULL
+#define MSR_DE_CFG 0xc0011029
+#define DE_CFG_ERRATA_721 0x0001
+
/* AMD Family10h MSRs */
#define MSR_OSVW_ID_LENGTH 0xc0010140
#define MSR_OSVW_STATUS 0xc0010141
Index: src/sys/arch/x86/x86/errata.c
diff -u src/sys/arch/x86/x86/errata.c:1.19 src/sys/arch/x86/x86/errata.c:1.20
--- src/sys/arch/x86/x86/errata.c:1.19 Fri Jul 23 22:31:35 2010
+++ src/sys/arch/x86/x86/errata.c Fri Apr 6 17:23:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: errata.c,v 1.19 2010/07/23 22:31:35 cegger Exp $ */
+/* $NetBSD: errata.c,v 1.20 2012/04/06 17:23:39 chs Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: errata.c,v 1.19 2010/07/23 22:31:35 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: errata.c,v 1.20 2012/04/06 17:23:39 chs Exp $);
#include sys/types.h
#include sys/systm.h
@@ -69,7 +69,8 @@ typedef struct errata {
typedef enum cpurev {
BH_E4, CH_CG, CH_D0, DH_CG, DH_D0, DH_E3, DH_E6, JH_E1,
JH_E6, SH_B0, SH_B3, SH_C0, SH_CG, SH_D0, SH_E4, SH_E5,
- DR_BA, DR_B2, DR_B3,
+ DR_BA, DR_B2, DR_B3, RB_C2, RB_C3, BL_C2, BL_C3, DA_C2,
+ DA_C3, HY_D0, HY_D1, HY_D1_G34R1, PH_E0, LN_B0,
OINK
} cpurev_t;
@@ -85,6 +86,10 @@ static const u_int cpurevs[] = {
SH_D0, 0x0010f40, SH_D0, 0x0010f50, SH_D0, 0x0010f70,
SH_E4, 0x0020f51, SH_E4, 0x0020f71, SH_E5, 0x0020f42,
DR_BA, 0x0100f2a, DR_B2, 0x0100f22, DR_B3, 0x0100f23,
+ RB_C2, 0x0100f42, RB_C3, 0x0100f43, BL_C2, 0x0100f52,
+ BL_C3, 0x0100f53, DA_C2, 0x0100f62, DA_C3, 0x0100f63,
+ HY_D0, 0x0100f80, HY_D1, 0x0100f81, HY_D1_G34R1, 0x0100f91,
+ PH_E0, 0x0100fa0, LN_B0, 0x0300f10,
OINK
};
@@ -132,6 +137,11 @@ static const uint8_t x86_errata_set10[]
DR_BA, DR_B2, DR_B3, OINK
};
+static const uint8_t x86_errata_set11[] = {
+ DR_BA, DR_B2, DR_B3, RB_C2, RB_C3, BL_C2, BL_C3, DA_C2,
+ DA_C3, HY_D0, HY_D1, HY_D1_G34R1, PH_E0, LN_B0, OINK
+};
+
static bool x86_errata_setmsr(struct cpu_info *, errata_t *);
static bool x86_errata_testmsr(struct cpu_info *, errata_t *);
@@ -268,6 +278,13 @@ static errata_t errata[] = {
309, FALSE, MSR_BU_CFG, x86_errata_set9,
x86_errata_testmsr, BU_CFG_ERRATA_309
},
+ /*
+ * 721: Processor May Incorrectly Update Stack Pointer
+ */
+ {
+ 721, FALSE, MSR_DE_CFG, x86_errata_set11,
+ x86_errata_setmsr, DE_CFG_ERRATA_721
+ },
};
static bool
CVS commit: [netbsd-6] src/sys/arch/landisk/landisk
Module Name:src Committed By: riz Date: Fri Apr 6 17:28:04 UTC 2012 Modified Files: src/sys/arch/landisk/landisk [netbsd-6]: bus_dma.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #160): sys/arch/landisk/landisk/bus_dma.c: revision 1.15 Don't call sh_dcache_inv_range() on BUS_DMASYNC_POSTREAD ops as other mips and arm ports. All cached data is cared on BUS_DMASYNC_PREREAD and invalidating cache without writeback could cause unexpected data loss if specified sync region is not cacheline aligned. This may fix ffs_alloccg: map corrupted panic on acardide IDE disks, which didn't happen on USB HDD. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/arch/landisk/landisk/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/landisk/landisk/bus_dma.c diff -u src/sys/arch/landisk/landisk/bus_dma.c:1.14 src/sys/arch/landisk/landisk/bus_dma.c:1.14.8.1 --- src/sys/arch/landisk/landisk/bus_dma.c:1.14 Fri Jul 1 19:12:53 2011 +++ src/sys/arch/landisk/landisk/bus_dma.c Fri Apr 6 17:28:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.14 2011/07/01 19:12:53 dyoung Exp $ */ +/* $NetBSD: bus_dma.c,v 1.14.8.1 2012/04/06 17:28:04 riz Exp $ */ /* * Copyright (c) 2005 NONAKA Kimihiro @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.14 2011/07/01 19:12:53 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.14.8.1 2012/04/06 17:28:04 riz Exp $); #include sys/param.h #include sys/systm.h @@ -545,11 +545,6 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm if (SH_HAS_WRITEBACK_CACHE) sh_dcache_wb_range(naddr, minlen); break; - - case BUS_DMASYNC_POSTREAD: - case BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE: - sh_dcache_inv_range(naddr, minlen); - break; } offset = 0; len -= minlen;
CVS commit: [netbsd-6] src/sys/fs/msdosfs
Module Name:src
Committed By: riz
Date: Fri Apr 6 17:40:21 UTC 2012
Modified Files:
src/sys/fs/msdosfs [netbsd-6]: msdosfs_vnops.c
Log Message:
Pull up following revision(s) (requested by njoly in ticket #161):
sys/fs/msdosfs/msdosfs_vnops.c: revision 1.81
sys/fs/msdosfs/msdosfs_vnops.c: revision 1.82
Report the SF_ARCHIVED file flag if set.
Add missing braces in previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.79.4.1 src/sys/fs/msdosfs/msdosfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.79 src/sys/fs/msdosfs/msdosfs_vnops.c:1.79.4.1
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.79 Mon Nov 21 10:46:56 2011
+++ src/sys/fs/msdosfs/msdosfs_vnops.c Fri Apr 6 17:40:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.79 2011/11/21 10:46:56 hannken Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.79.4.1 2012/04/06 17:40:20 riz Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vnops.c,v 1.79 2011/11/21 10:46:56 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vnops.c,v 1.79.4.1 2012/04/06 17:40:20 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -304,8 +304,10 @@ msdosfs_getattr(void *v)
vap-va_ctime = vap-va_mtime;
}
vap-va_flags = 0;
- if ((dep-de_Attributes ATTR_ARCHIVE) == 0)
+ if ((dep-de_Attributes ATTR_ARCHIVE) == 0) {
+ vap-va_flags |= SF_ARCHIVED;
vap-va_mode |= S_ARCH1;
+ }
vap-va_gen = 0;
vap-va_blocksize = pmp-pm_bpcluster;
vap-va_bytes =
CVS commit: [netbsd-6] src/sys/dev
Module Name:src
Committed By: riz
Date: Fri Apr 6 17:44:21 UTC 2012
Modified Files:
src/sys/dev [netbsd-6]: vnd.c vndvar.h
Log Message:
Pull up following revision(s) (requested by hannken in ticket #162):
sys/dev/vnd.c: revision 1.220
sys/dev/vndvar.h: revision 1.32
When backed by a sparse file limit the number of pending requests.
Should fix PR #45829: writing to vnd on sparse file blocks on pager_map
where the pager_map gets exhausted by requests enqueued on a vnd
device and the device worker thread blocks on putpages() needing the map.
While here always sync the underlying vnode before calling biodone().
XXX: vnd should be converted to mutex/condvar.
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.219.8.1 src/sys/dev/vnd.c
cvs rdiff -u -r1.31 -r1.31.8.1 src/sys/dev/vndvar.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/vnd.c
diff -u src/sys/dev/vnd.c:1.219 src/sys/dev/vnd.c:1.219.8.1
--- src/sys/dev/vnd.c:1.219 Fri Oct 14 09:23:30 2011
+++ src/sys/dev/vnd.c Fri Apr 6 17:44:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.219 2011/10/14 09:23:30 hannken Exp $ */
+/* $NetBSD: vnd.c,v 1.219.8.1 2012/04/06 17:44:21 riz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.219 2011/10/14 09:23:30 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.219.8.1 2012/04/06 17:44:21 riz Exp $);
#if defined(_KERNEL_OPT)
#include opt_vnd.h
@@ -156,6 +156,8 @@ struct vndxfer {
#define VNDLABELDEV(dev) \
(MAKEDISKDEV(major((dev)), vndunit((dev)), RAW_PART))
+#define VND_MAXPENDING(vnd) ((vnd)-sc_maxactive * 4)
+
/* called by main() at boot time */
void vndattach(int);
@@ -496,6 +498,13 @@ vndstrategy(struct buf *bp)
if (vnddebug VDB_FOLLOW)
printf(vndstrategy(%p): unit %d\n, bp, unit);
#endif
+ if ((vnd-sc_flags VNF_USE_VN_RDWR)) {
+ KASSERT(vnd-sc_pending = 0
+ vnd-sc_pending = VND_MAXPENDING(vnd));
+ while (vnd-sc_pending == VND_MAXPENDING(vnd))
+ tsleep(vnd-sc_pending, PRIBIO, vndpc, 0);
+ vnd-sc_pending++;
+ }
bufq_put(vnd-sc_tab, bp);
wakeup(vnd-sc_tab);
splx(s);
@@ -587,6 +596,12 @@ vndthread(void *arg)
tsleep(vnd-sc_tab, PRIBIO, vndbp, 0);
continue;
};
+ if ((vnd-sc_flags VNF_USE_VN_RDWR)) {
+ KASSERT(vnd-sc_pending 0
+ vnd-sc_pending = VND_MAXPENDING(vnd));
+ if (vnd-sc_pending-- == VND_MAXPENDING(vnd))
+wakeup(vnd-sc_pending);
+ }
splx(s);
flags = obp-b_flags;
#ifdef DEBUG
@@ -722,13 +737,9 @@ handle_with_rdwr(struct vnd_softc *vnd,
IO_ADV_ENCODE(POSIX_FADV_NOREUSE), vnd-sc_cred, resid, NULL);
bp-b_resid = resid;
- /* Keep mapped pages below threshold. */
mutex_enter(vp-v_interlock);
- if (vp-v_uobj.uo_npages 1024*1024 / PAGE_SIZE)
- (void) VOP_PUTPAGES(vp, 0, 0,
- PGO_ALLPAGES | PGO_CLEANIT | PGO_FREE | PGO_SYNCIO);
- else
- mutex_exit(vp-v_interlock);
+ (void) VOP_PUTPAGES(vp, 0, 0,
+ PGO_ALLPAGES | PGO_CLEANIT | PGO_FREE | PGO_SYNCIO);
/* We need to increase the number of outputs on the vnode if
* there was any write to it. */
Index: src/sys/dev/vndvar.h
diff -u src/sys/dev/vndvar.h:1.31 src/sys/dev/vndvar.h:1.31.8.1
--- src/sys/dev/vndvar.h:1.31 Wed Jun 29 09:12:42 2011
+++ src/sys/dev/vndvar.h Fri Apr 6 17:44:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vndvar.h,v 1.31 2011/06/29 09:12:42 hannken Exp $ */
+/* $NetBSD: vndvar.h,v 1.31.8.1 2012/04/06 17:44:21 riz Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -113,6 +113,7 @@ struct vnd_softc {
kauth_cred_t sc_cred; /* credentials */
int sc_maxactive; /* max # of active requests */
struct bufq_state *sc_tab; /* transfer queue */
+ int sc_pending; /* number of pending transfers */
int sc_active; /* number of active transfers */
struct disk sc_dkdev; /* generic disk device info */
struct vndgeom sc_geom; /* virtual geometry */
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Fri Apr 6 17:48:09 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 147,160-163. To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.65 src/doc/CHANGES-6.0:1.1.2.66 --- src/doc/CHANGES-6.0:1.1.2.65 Tue Apr 3 17:32:12 2012 +++ src/doc/CHANGES-6.0 Fri Apr 6 17:48:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.65 2012/04/03 17:32:12 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.66 2012/04/06 17:48:09 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -1672,3 +1672,33 @@ sys/dev/bluetooth/btsco.c 1.28 Power management for bthub(4). PR#39006. [plunky, ticket #159] +external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile 1.11-1.12 +tests/lib/libppath/Makefile 1.4 +tests/lib/libppath/plist_to_c 1.2 + + Use :Q for quoting. Execute shell script using the host shell. + [joerg, ticket #147] + +sys/arch/landisk/landisk/bus_dma.c 1.15 + + Fix bus_dmamap_sync(9) bug which could cause FFS corruption on + IDE disks. + [tsutsui, ticket #160] + +sys/fs/msdosfs/msdosfs_vnops.c 1.81-1.82 + + Report the SF_ARCHIVED file flag if set. + [njoly, ticket #161] + +sys/dev/vnd.c 1.220 +sys/dev/vndvar.h1.32 + + When backed by a sparse file limit the number of pending requests. + Fixes PR#45829. + [hannken, ticket #162] + +usr.sbin/cpuctl/arch/i386.c 1.30 + + Report L3 cache information on AMD Family 10h and newer processors. + [cegger, ticket #163] +
CVS commit: src/sys/dev/mii
Module Name:src Committed By: matt Date: Fri Apr 6 18:49:17 UTC 2012 Modified Files: src/sys/dev/mii: miidevs Log Message: Add VSC8221 To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.106 src/sys/dev/mii/miidevs:1.107 --- src/sys/dev/mii/miidevs:1.106 Fri Apr 6 09:15:37 2012 +++ src/sys/dev/mii/miidevs Fri Apr 6 18:49:17 2012 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.106 2012/04/06 09:15:37 isaki Exp $ +$NetBSD: miidevs,v 1.107 2012/04/06 18:49:17 matt Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -186,6 +186,7 @@ model CICADA CS8204 0x0004 Cicada CS820 model CICADA VSC8211 0x000b Cicada VSC8211 10/100/1000TX PHY model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY +model xxCICADA VSC8221 0x0015 Vitesse VSC8221 10/100/1000BASE-T PHY model xxCICADA VSC8244 0x002c Vitesse VSC8244 Quad 10/100/1000BASE-T PHY model xxCICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: matt
Date: Fri Apr 6 18:49:45 UTC 2012
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/mii/miidevs_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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.109 src/sys/dev/mii/miidevs.h:1.110
--- src/sys/dev/mii/miidevs.h:1.109 Fri Apr 6 09:16:34 2012
+++ src/sys/dev/mii/miidevs.h Fri Apr 6 18:49:44 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.109 2012/04/06 09:16:34 isaki Exp $ */
+/* $NetBSD: miidevs.h,v 1.110 2012/04/06 18:49:44 matt Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.106 2012/04/06 09:15:37 isaki Exp
+ * NetBSD: miidevs,v 1.107 2012/04/06 18:49:17 matt Exp
*/
/*-
@@ -252,6 +252,8 @@
#define MII_STR_CICADA_CS8201A Cicada CS8201 10/100/1000TX PHY
#define MII_MODEL_CICADA_CS8201B 0x0021
#define MII_STR_CICADA_CS8201B Cicada CS8201 10/100/1000TX PHY
+#define MII_MODEL_xxCICADA_VSC8221 0x0015
+#define MII_STR_xxCICADA_VSC8221 Vitesse VSC8221 10/100/1000BASE-T PHY
#define MII_MODEL_xxCICADA_VSC8244 0x002c
#define MII_STR_xxCICADA_VSC8244 Vitesse VSC8244 Quad 10/100/1000BASE-T PHY
#define MII_MODEL_xxCICADA_CS8201B 0x0021
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.97 src/sys/dev/mii/miidevs_data.h:1.98
--- src/sys/dev/mii/miidevs_data.h:1.97 Fri Apr 6 09:16:34 2012
+++ src/sys/dev/mii/miidevs_data.h Fri Apr 6 18:49:45 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.97 2012/04/06 09:16:34 isaki Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.98 2012/04/06 18:49:45 matt Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.106 2012/04/06 09:15:37 isaki Exp
+ * NetBSD: miidevs,v 1.107 2012/04/06 18:49:17 matt Exp
*/
/*-
@@ -96,6 +96,7 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_CICADA, MII_MODEL_CICADA_VSC8211, MII_STR_CICADA_VSC8211 },
{ MII_OUI_CICADA, MII_MODEL_CICADA_CS8201A, MII_STR_CICADA_CS8201A },
{ MII_OUI_CICADA, MII_MODEL_CICADA_CS8201B, MII_STR_CICADA_CS8201B },
+ { MII_OUI_xxCICADA, MII_MODEL_xxCICADA_VSC8221, MII_STR_xxCICADA_VSC8221 },
{ MII_OUI_xxCICADA, MII_MODEL_xxCICADA_VSC8244, MII_STR_xxCICADA_VSC8244 },
{ MII_OUI_xxCICADA, MII_MODEL_xxCICADA_CS8201B, MII_STR_xxCICADA_CS8201B },
{ MII_OUI_xxDAVICOM, MII_MODEL_xxDAVICOM_DM9101, MII_STR_xxDAVICOM_DM9101 },
CVS commit: src/sbin/fdisk
Module Name:src
Committed By: christos
Date: Fri Apr 6 20:09:26 UTC 2012
Modified Files:
src/sbin/fdisk: fdisk.8 fdisk.c
Log Message:
support sector sizes 512.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sbin/fdisk/fdisk.8
cvs rdiff -u -r1.139 -r1.140 src/sbin/fdisk/fdisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fdisk/fdisk.8
diff -u src/sbin/fdisk/fdisk.8:1.75 src/sbin/fdisk/fdisk.8:1.76
--- src/sbin/fdisk/fdisk.8:1.75 Wed Jan 4 05:57:40 2012
+++ src/sbin/fdisk/fdisk.8 Fri Apr 6 16:09:26 2012
@@ -1,6 +1,6 @@
-.\ $NetBSD: fdisk.8,v 1.75 2012/01/04 10:57:40 wiz Exp $
+.\ $NetBSD: fdisk.8,v 1.76 2012/04/06 20:09:26 christos Exp $
.\
-.Dd December 1, 2011
+.Dd April 6, 2012
.Dt FDISK 8
.Os
.Sh NAME
@@ -34,6 +34,9 @@
.Op Fl t Ar disktab
.Ek
.Bk -words
+.Op Fl z Ar sectorsize
+.Ek
+.Bk -words
.Op Ar device
.Ek
.Nm
@@ -397,6 +400,10 @@ allows the user to change more parameter
Write the modified partition table to file
.Ar file
instead of the disk.
+.It Fl z Ar sectorsize
+Specify a sector size other than 512, for devices that only
+support larger sector sizes.
+The sector size needs to be a power of two greater than 512.
.El
.Pp
When called with no arguments, it prints the partition table.
Index: src/sbin/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.139 src/sbin/fdisk/fdisk.c:1.140
--- src/sbin/fdisk/fdisk.c:1.139 Wed Mar 14 22:02:21 2012
+++ src/sbin/fdisk/fdisk.c Fri Apr 6 16:09:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.139 2012/03/15 02:02:21 joerg Exp $ */
+/* $NetBSD: fdisk.c,v 1.140 2012/04/06 20:09:26 christos Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fdisk.c,v 1.139 2012/03/15 02:02:21 joerg Exp $);
+__RCSID($NetBSD: fdisk.c,v 1.140 2012/04/06 20:09:26 christos Exp $);
#endif /* not lint */
#define MBRPTYPENAMES
@@ -155,7 +155,7 @@ static char *boot_path = NULL; /* name
#define BOOTSEL_OPTIONS
#define change_part(e, p, id, st, sz, bm) change__part(e, p, id, st, sz)
#endif
-#define OPTIONS BOOTSEL_OPTIONS 0123FSafiIluvA:b:c:E:r:s:w:
+#define OPTIONS BOOTSEL_OPTIONS 0123FSafiIluvA:b:c:E:r:s:w:z:
/*
* Disk geometry and partition alignment.
@@ -245,6 +245,8 @@ static int F_flag = 1;
static struct gpt_hdr gpt1, gpt2; /* GUID partition tables */
static struct mbr_sector bootcode[8192 / sizeof (struct mbr_sector)];
+static ssize_t secsize = 512; /* sector size */
+static char *iobuf; /* buffer for non 512 sector I/O */
static int bootsize; /* actual size of bootcode */
static int boot_installed; /* 1 if we've copied code into the mbr */
@@ -279,8 +281,8 @@ static void change_active(int);
static void change_bios_geometry(void);
static void dos(int, unsigned char *, unsigned char *, unsigned char *);
static int open_disk(int);
-static int read_disk(daddr_t, void *);
-static int write_disk(daddr_t, void *);
+static ssize_t read_disk(daddr_t, void *);
+static ssize_t write_disk(daddr_t, void *);
static int get_params(void);
static int read_s0(daddr_t, struct mbr_sector *);
static int write_mbr(void);
@@ -454,6 +456,19 @@ main(int argc, char *argv[])
case 'T':
disk_type = optarg;
break;
+ case 'z':
+ secsize = atoi(optarg);
+ if (secsize = 512)
+out: errx(EXIT_FAILURE, Invalid sector size %zd,
+secsize);
+ for (ch = secsize; (ch 1) == 0; ch = 1)
+continue;
+ if (ch != 1)
+goto out;
+ if ((iobuf = malloc(secsize)) == NULL)
+err(EXIT_FAILURE, Cannot allocate %zd buffer,
+secsize);
+ break;
default:
usage();
}
@@ -2468,26 +2483,62 @@ open_disk(int update)
return (0);
}
-static int
+static ssize_t
read_disk(daddr_t sector, void *buf)
{
+ ssize_t nr;
if (*rfd == -1)
errx(1, read_disk(); fd == -1);
- if (lseek(*rfd, sector * (off_t)512, 0) == -1)
- return (-1);
- return (read(*rfd, buf, 512));
-}
-static int
+ off_t offs = sector * (off_t)512;
+ off_t mod = offs (secsize - 1);
+ off_t rnd = offs ~(secsize - 1);
+
+ if (lseek(*rfd, rnd, SEEK_SET) == (off_t)-1)
+ return -1;
+
+ if (secsize == 512)
+ return read(*rfd, buf, 512);
+
+ if ((nr = read(*rfd, iobuf, secsize)) != secsize)
+ return nr;
+
+ memcpy(buf, iobuf[mod], 512);
+
+ return 512;
+}
+
+static ssize_t
write_disk(daddr_t sector, void *buf)
{
+ ssize_t nr;
if (wfd == -1)
errx(1, write_disk(); wfd == -1);
- if (lseek(wfd, sector * (off_t)512, 0) == -1)
- return (-1);
- return (write(wfd, buf, 512));
+
+ off_t offs = sector * (off_t)512;
+ off_t mod = offs (secsize - 1);
+ off_t rnd = offs ~(secsize - 1);
+
+ if (lseek(wfd, rnd, SEEK_SET) == (off_t)-1)
+ return -1;
+
+ if (secsize == 512)
+ return write(wfd, buf, 512);
+
+ if ((nr = read(wfd, iobuf, secsize)) != secsize)
+ return nr;
+
+ if (lseek(wfd, rnd, SEEK_SET) == (off_t)-1)
+ return -1;
+
+ memcpy(iobuf[mod], buf,
CVS commit: src/external/gpl3/gcc/lib/libgomp/arch/m68k
Module Name:src Committed By: he Date: Fri Apr 6 20:10:28 UTC 2012 Modified Files: src/external/gpl3/gcc/lib/libgomp/arch/m68k: config.h Log Message: Disable HAVE_TLS for now for gcc's libgomp, since it otherwise causes gcc indigestion (internal compiler error) for all m68k ports. mrg@ says this will do for now, and committing to this generated- by-mknative file is ok. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgomp/arch/m68k/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libgomp/arch/m68k/config.h diff -u src/external/gpl3/gcc/lib/libgomp/arch/m68k/config.h:1.2 src/external/gpl3/gcc/lib/libgomp/arch/m68k/config.h:1.3 --- src/external/gpl3/gcc/lib/libgomp/arch/m68k/config.h:1.2 Thu Apr 5 21:09:20 2012 +++ src/external/gpl3/gcc/lib/libgomp/arch/m68k/config.h Fri Apr 6 20:10:28 2012 @@ -75,7 +75,7 @@ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if the target supports thread-local storage. */ -#define HAVE_TLS 1 +/* #define HAVE_TLS 1 */ /* Define to 1 if you have the unistd.h header file. */ #define HAVE_UNISTD_H 1
CVS commit: src/sys/dev/isa
Module Name:src Committed By: plunky Date: Fri Apr 6 20:16:59 UTC 2012 Modified Files: src/sys/dev/isa: spkr.c Log Message: device_pmf_is_registered() is not required To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/isa/spkr.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/isa/spkr.c diff -u src/sys/dev/isa/spkr.c:1.32 src/sys/dev/isa/spkr.c:1.33 --- src/sys/dev/isa/spkr.c:1.32 Wed Feb 1 02:01:28 2012 +++ src/sys/dev/isa/spkr.c Fri Apr 6 20:16:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: spkr.c,v 1.32 2012/02/01 02:01:28 matt Exp $ */ +/* $NetBSD: spkr.c,v 1.33 2012/04/06 20:16:58 plunky Exp $ */ /* * Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com) @@ -43,7 +43,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: spkr.c,v 1.32 2012/02/01 02:01:28 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: spkr.c,v 1.33 2012/04/06 20:16:58 plunky Exp $); #include sys/param.h #include sys/systm.h @@ -409,10 +409,8 @@ spkrattach(device_t parent, device_t sel printf(\n); ppicookie = ((struct pcppi_attach_args *)aux)-pa_cookie; spkr_attached = 1; -if (!device_pmf_is_registered(self) - !pmf_device_register(self, NULL, NULL)) + if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, couldn't establish power handler\n); - } int
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: plunky
Date: Fri Apr 6 20:24:29 UTC 2012
Modified Files:
src/sys/dev/pci: agp.c
Log Message:
device_pmf_is_registered() is not required
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/pci/agp.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/agp.c
diff -u src/sys/dev/pci/agp.c:1.79 src/sys/dev/pci/agp.c:1.80
--- src/sys/dev/pci/agp.c:1.79 Mon Apr 4 20:37:56 2011
+++ src/sys/dev/pci/agp.c Fri Apr 6 20:24:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: agp.c,v 1.79 2011/04/04 20:37:56 dyoung Exp $ */
+/* $NetBSD: agp.c,v 1.80 2012/04/06 20:24:28 plunky Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp.c,v 1.79 2011/04/04 20:37:56 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp.c,v 1.80 2012/04/06 20:24:28 plunky Exp $);
#include sys/param.h
#include sys/systm.h
@@ -374,11 +374,8 @@ agpattach(device_t parent, device_t self
else
sc-as_chipc = NULL;
- if (!device_pmf_is_registered(self)) {
- if (!pmf_device_register(self, NULL, agp_resume))
- aprint_error_dev(self, couldn't establish power
- handler\n);
- }
+ if (!pmf_device_register(self, NULL, agp_resume))
+ aprint_error_dev(self, couldn't establish power handler\n);
}
CFATTACH_DECL_NEW(agp, sizeof(struct agp_softc),
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: plunky
Date: Fri Apr 6 20:38:52 UTC 2012
Modified Files:
src/sys/arch/x86/pci: pcib.c
Log Message:
device_pmf_is_registered() is not required
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/pcib.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/pci/pcib.c
diff -u src/sys/arch/x86/pci/pcib.c:1.14 src/sys/arch/x86/pci/pcib.c:1.15
--- src/sys/arch/x86/pci/pcib.c:1.14 Mon Jan 30 19:41:18 2012
+++ src/sys/arch/x86/pci/pcib.c Fri Apr 6 20:38:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.14 2012/01/30 19:41:18 drochner Exp $ */
+/* $NetBSD: pcib.c,v 1.15 2012/04/06 20:38:52 plunky Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.14 2012/01/30 19:41:18 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.15 2012/04/06 20:38:52 plunky Exp $);
#include sys/types.h
#include sys/param.h
@@ -195,13 +195,8 @@ pcibattach(device_t parent, device_t sel
sc-sc_pc = pa-pa_pc;
sc-sc_tag = pa-pa_tag;
- /* If a more specific pcib implementation has already registered a
- * power handler, don't overwrite it.
- */
- if (!device_pmf_is_registered(self)) {
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, couldn't establish power handler\n);
- }
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, couldn't establish power handler\n);
config_defer(self, pcib_callback);
}
CVS commit: src/sbin/pdisk
Module Name:src
Committed By: christos
Date: Fri Apr 6 22:42:50 UTC 2012
Modified Files:
src/sbin/pdisk: Makefile
Log Message:
compile this for everyone, and warns=5
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/pdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/pdisk/Makefile
diff -u src/sbin/pdisk/Makefile:1.4 src/sbin/pdisk/Makefile:1.5
--- src/sbin/pdisk/Makefile:1.4 Sun Jun 26 21:00:06 2005
+++ src/sbin/pdisk/Makefile Fri Apr 6 18:42:50 2012
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2005/06/27 01:00:06 christos Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/06 22:42:50 christos Exp $
.include bsd.own.mk
+WARNS=5
SRCDIR= ${NETBSDSRCDIR}/dist/pdisk
.PATH: ${SRCDIR}
-.if (${MACHINE} == macppc || \
- ${MACHINE} == mac68k)
-
PROG= pdisk
SRCS= bitfield.c convert.c deblock_media.c dump.c \
file_media.c hfs_misc.c io.c layout_dump.c \
media.c partition_map.c pathname.c pdisk.c util.c \
validate.c errors.c
-.endif
MAN= pdisk.8
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: christos
Date: Fri Apr 6 22:50:40 UTC 2012
Modified Files:
src/sys/dev/scsipi: scsiconf.c scsipiconf.h sd.c
Log Message:
Add a quirk for the Apple iPod whose mode sense commands fails with not ready.
Seems to work just fine if we send a start command first...
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/scsipi/scsipiconf.h
cvs rdiff -u -r1.296 -r1.297 src/sys/dev/scsipi/sd.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/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.264 src/sys/dev/scsipi/scsiconf.c:1.265
--- src/sys/dev/scsipi/scsiconf.c:1.264 Sun Mar 11 22:44:16 2012
+++ src/sys/dev/scsipi/scsiconf.c Fri Apr 6 18:50:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.264 2012/03/12 02:44:16 mrg Exp $ */
+/* $NetBSD: scsiconf.c,v 1.265 2012/04/06 22:50:39 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.264 2012/03/12 02:44:16 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.265 2012/04/06 22:50:39 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -445,6 +445,8 @@ scsibusprint(void *aux, const char *pnp)
}
static const struct scsi_quirk_inquiry_pattern scsi_quirk_patterns[] = {
+ {{T_DIRECT, T_REMOV,
+ Apple , iPod, }, PQUIRK_START},
{{T_CDROM, T_REMOV,
CHINON , CD-ROM CDS-431 , }, PQUIRK_NOLUNS},
{{T_CDROM, T_REMOV,
Index: src/sys/dev/scsipi/scsipiconf.h
diff -u src/sys/dev/scsipi/scsipiconf.h:1.118 src/sys/dev/scsipi/scsipiconf.h:1.119
--- src/sys/dev/scsipi/scsipiconf.h:1.118 Sun Jun 6 21:41:39 2010
+++ src/sys/dev/scsipi/scsipiconf.h Fri Apr 6 18:50:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.118 2010/06/07 01:41:39 pgoyette Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.119 2012/04/06 22:50:39 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -452,6 +452,7 @@ struct scsipi_periph {
#define PQUIRK_CAP_SYNC 0x0008 /* SCSI device with ST sync op*/
#define PQUIRK_CAP_WIDE16 0x0010 /* SCSI device with ST wide op*/
#define PQUIRK_CAP_NODT 0x0020 /* signals DT, but can't. */
+#define PQUIRK_START 0x0040 /* needs start before tur */
/*
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.296 src/sys/dev/scsipi/sd.c:1.297
--- src/sys/dev/scsipi/sd.c:1.296 Thu Feb 2 14:43:06 2012
+++ src/sys/dev/scsipi/sd.c Fri Apr 6 18:50:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.296 2012/02/02 19:43:06 tls Exp $ */
+/* $NetBSD: sd.c,v 1.297 2012/04/06 22:50:39 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.296 2012/02/02 19:43:06 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.297 2012/04/06 22:50:39 christos Exp $);
#include opt_scsi.h
@@ -264,6 +264,9 @@ sdattach(device_t parent, device_t self,
aprint_naive(\n);
aprint_normal(\n);
+ if (periph-periph_quirks PQUIRK_START)
+ (void)scsipi_start(periph, SSS_START, XS_CTL_SILENT);
+
error = scsipi_test_unit_ready(periph,
XS_CTL_DISCOVERY | XS_CTL_IGNORE_ILLEGAL_REQUEST |
XS_CTL_IGNORE_MEDIA_CHANGE | XS_CTL_SILENT_NODEV);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: riz
Date: Fri Apr 6 23:48:54 UTC 2012
Modified Files:
src/distrib/utils/sysinst: Makefile.inc defs.h install.c main.c
menus.mi msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl net.c
target.c util.c
Added Files:
src/distrib/utils/sysinst: checkrc.c configmenu.c
Log Message:
Implement a post-install configuration menu, as proposed on tech-install.
Enables the user to configure a few additional items, including using
pkgin to manage binary packages, in a post-install menu which replaces
the series of questions (Do you want to set a root password? etc).
This is by no means a perfect solution, nor should it discourage anyone
from working on more sweeping changes to sysinst.
Some bug fixes, and .de translation provided by Julian Fagir.
XXX .es, .fr and .pl translations still needed. Please help!
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/distrib/utils/sysinst/checkrc.c \
src/distrib/utils/sysinst/configmenu.c
cvs rdiff -u -r1.161 -r1.162 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/sysinst/install.c
cvs rdiff -u -r1.63 -r1.64 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.44 -r1.45 src/distrib/utils/sysinst/menus.mi
cvs rdiff -u -r1.64 -r1.65 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.171 -r1.172 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.42 -r1.43 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.123 -r1.124 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.82 -r1.83 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.130 -r1.131 src/distrib/utils/sysinst/net.c
cvs rdiff -u -r1.54 -r1.55 src/distrib/utils/sysinst/target.c
cvs rdiff -u -r1.174 -r1.175 src/distrib/utils/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.58 src/distrib/utils/sysinst/Makefile.inc:1.59
--- src/distrib/utils/sysinst/Makefile.inc:1.58 Sun Jan 8 21:20:40 2012
+++ src/distrib/utils/sysinst/Makefile.inc Fri Apr 6 23:48:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.58 2012/01/08 21:20:40 riz Exp $
+# $NetBSD: Makefile.inc,v 1.59 2012/04/06 23:48:53 riz Exp $
#
# Makefile for sysinst
@@ -13,7 +13,7 @@ WARNS= 4
SRCS+= menu_defs.c msg_defs.c main.c install.c upgrade.c \
txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
- label.c target.c md.c sizemultname.c
+ label.c target.c md.c sizemultname.c configmenu.c checkrc.c
SRCS+= ${MD_OPTIONS:MAOUT2ELF:S/AOUT2ELF/aout2elf.c/}
SRCS+= ${MENUS_MD:Mmenus.mbr:S/menus.mbr/mbr.c/}
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.161 src/distrib/utils/sysinst/defs.h:1.162
--- src/distrib/utils/sysinst/defs.h:1.161 Tue Jan 10 21:02:47 2012
+++ src/distrib/utils/sysinst/defs.h Fri Apr 6 23:48:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.161 2012/01/10 21:02:47 gson Exp $ */
+/* $NetBSD: defs.h,v 1.162 2012/04/06 23:48:53 riz Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -133,6 +133,7 @@ enum {
SET_LAST,
SET_GROUP, /* Start of submenu */
SET_GROUP_END, /* End of submenu */
+SET_PKGSRC, /* pkgsrc, not counted as regular set */
};
/* Initialisers to select sets */
@@ -288,26 +289,50 @@ int clean_xfer_dir;
#define SYSINST_FTP_DIR pub/NetBSD/NetBSD- REL
#endif
+#if !defined(SYSINST_PKG_HOST)
+#define SYSINST_PKG_HOST SYSINST_FTP_HOST
+#endif
+
+#if !defined(SYSINST_PKG_DIR)
+#define SYSINST_PKG_DIR pub/pkgsrc/packages/NetBSD
+#endif
+
+#if !defined(SYSINST_PKGSRC_HOST)
+#define SYSINST_PKGSRC_HOST SYSINST_PKG_HOST
+#endif
+
/* Abs. path we extract binary sets from */
char ext_dir_bin[STRSIZE];
/* Abs. path we extract source sets from */
char ext_dir_src[STRSIZE];
+/* Abs. path we extract pkgsrc from */
+char ext_dir_pkgsrc[STRSIZE];
+
/* Place we look for binary sets in all fs types */
char set_dir_bin[STRSIZE];
/* Place we look for source sets in all fs types */
char set_dir_src[STRSIZE];
-struct {
+/* Place we look for pkgs in all fs types */
+char pkg_dir[STRSIZE];
+
+/* Place we look for pkgsrc in all fs types */
+char pkgsrc_dir[STRSIZE];
+
+struct ftpinfo {
char host[STRSIZE];
char dir[STRSIZE] ;
char user[SSTRSIZE];
char pass[STRSIZE];
char proxy[STRSIZE];
const char *xfer_type; /* ftp or http */
-} ftp;
+};
+
+/* use the same struct for sets ftp and to build pkgpath */
+struct ftpinfo ftp, pkg, pkgsrc;
int (*fetch_fn)(const char *);
char nfs_host[STRSIZE];
@@ -393,11 +418,14 @@ int get_geom(const char *, struct diskla
int get_real_geom(const char *, struct disklabel *);
/* from net.c */
+extern int network_up;
extern char net_namesvr6[STRSIZE];
int get_via_ftp(const char *);
int
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: christos
Date: Sat Apr 7 01:39:39 UTC 2012
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
If our raid is now accessed from wedges, adjust the root to be the wedge
that corresponds to partition a. Is there a better way?
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.296 src/sys/dev/raidframe/rf_netbsdkintf.c:1.297
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.296 Thu Feb 16 01:52:03 2012
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Apr 6 21:39:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.296 2012/02/16 06:52:03 buhrow Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.297 2012/04/07 01:39:38 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.296 2012/02/16 06:52:03 buhrow Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.297 2012/04/07 01:39:38 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -479,7 +479,14 @@ rf_buildroothack(RF_ConfigSet_t *config_
/* we found something bootable... */
if (num_root == 1) {
- booted_device = raid_softc[rootID].sc_dev;
+ if (raid_softc[rootID].sc_dkdev.dk_nwedges != 0) {
+ /* XXX: How do we find the real root partition? */
+ char cname[sizeof(cset-ac-devname)];
+ snprintf(cname, sizeof(cname), %s%c,
+ device_xname(raid_softc[rootID].sc_dev), 'a');
+ booted_device = dkwedge_find_by_wname(cname);
+ } else
+ booted_device = raid_softc[rootID].sc_dev;
} else if (num_root 1) {
/*
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: tsutsui Date: Sat Apr 7 01:44:08 UTC 2012 Added Files: src/sys/arch/evbarm/conf: README.evbarm Log Message: Add a supported board list of NetBSD/evbarm with a brief desctiption of each board. Surveyed for NetBSD port presentation at Open Source Conference 2012 Ehime. Thanks to agc@, kiyohara@, and macallan@ for comments. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/README.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/README.evbarm diff -u /dev/null src/sys/arch/evbarm/conf/README.evbarm:1.1 --- /dev/null Sat Apr 7 01:44:08 2012 +++ src/sys/arch/evbarm/conf/README.evbarm Sat Apr 7 01:44:08 2012 @@ -0,0 +1,47 @@ +$NetBSD: README.evbarm,v 1.1 2012/04/07 01:44:08 tsutsui Exp $ + +config date boards +--- +ADI_BRH 2003/01/25 ADI Eng. Big Read Head i80200 eval board +ARMADILLO210 2006/02/06 Atmark Techno Armadillo-210 +ARMADILLO9 2005/11/13 Atmark Techno Armadillo-9 +BEAGLEBOARD 2008/10/22 TI OMAP3530 BeagleBoard +CP3100 2006/11/08 Certance IOP321 CP-3100 +DEVKIT8000 2010/09/08 Embest OMAP3530 DevKit8000 eval Kit +DNS323 2010/10/02 D-Link DNS-323 Marvell SoC based NAS +GEMINI 2008/10/24 Cortina Systems SL3516 eval board +GUMSTIX 2006/10/16 Gumstix Inc. PXA255/270 based boards +HDL_G 2006/04/16 I-O DATA HDL-G Giga LANDISK +HPT5325 2012/03/31 HP t5325 Thin Client +IGEPV2 2010/06/16 IGEPv2 OMAP3530 eval board +IMX31LITE 2008/04/27 Freescale i.M31 DEV LITE KIT +INTEGRATOR 2001/10/27 ARM Integrator board +IQ31244 2003/05/14 Intel IQ31244 reference board +IQ80310 2001/09/05 Intel IQ80310 eval board +IQ80321 2002/03/27 Intel IQ321 eval board +IXDP425 2003/04/08 Intel IXDP425/IXCDP1100 development platform +IXM1200 2002/07/15 Intel IMX1200 eval board +KUROBOX_PRO 2010/10/02 Kuroutoshikou KURO-BOX/PRO +LUBBOCK 2003/06/18 Intel Lubbock DBPXA250 board +MARVELL_NAS 2010/10/02 Generic Marvell SoC based NAS +MINI2440 2012/01/30 FrendlyARM Mini2440 S3C2440 SoC board +MMNET_GENERIC 2011/11/04 Propox MMnet1002 board +MPCSA_GENERIC 2008/07/03 MPCSA Atmel AT91RM9200 based board +MV2120 2011/07/20 HP Media Vault MV2011 Marvell Orion board +NAPPI 2002/07/15 Netwise APlication Platform Board +NETWALKER 2010/11/13 Sharp NetWalker +NSLU2 2006/02/28 Linksys NSLU2 (a.k.a. Slug) +OSK5912 2007/01/06 TI OMAP 5912 OSK board +OVERO 2010/07/10 Gumstix Inc. OMAP3530 based Overo boards +SHEEVAPLUG 2010/10/02 Marvell SheevaPlug +SMDK2410 2003/07/31 Samsung SMDK2410 S3C2410 eval board +SMDK2800 2002/11/20 Samsung SMDK2800 S3C2800 eval board +TEAMASA_NPWR 2002/02/07 Team ASA Npwr IOP310 based server appliance +TEAMASA_NPWR_FC 2003/12/24 Team ASA NPWR-FC i80321 server appliance +TISDP2420 2008/04/27 TI OMAP 2420 eval board +TISDP2430 2008/04/27 TI OMAP 2430 eval board +TOASTER 2005/08/14 NetBSD/toaster based on TS-7200 +TS7200 2004/12/23 Technologic Systems TS-7200 board +TWINTAIL 2005/02/26 Genetec corp. Twintail PXA255 eval board +VIPER 2005/06/06 Arcom Viper PXA255 ARM board +ZAO425 2003/05/23 NOVATEC NTNP425B ZAO425 IXP425 eval board
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: tsutsui
Date: Sat Apr 7 03:08:33 UTC 2012
Modified Files:
src/distrib/utils/sysinst: mbr.c
Log Message:
Use 1MB alignment rather than the default 63 sectors for
fdisk partition boundary for 128GB disks, as fdisk(8) does.
No particular comments for my PR install/45990.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/distrib/utils/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/mbr.c
diff -u src/distrib/utils/sysinst/mbr.c:1.89 src/distrib/utils/sysinst/mbr.c:1.90
--- src/distrib/utils/sysinst/mbr.c:1.89 Thu Jan 5 21:29:24 2012
+++ src/distrib/utils/sysinst/mbr.c Sat Apr 7 03:08:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.89 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: mbr.c,v 1.90 2012/04/07 03:08:33 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -113,6 +113,10 @@ static int get_mapping(struct mbr_partit
daddr_t *);
static void convert_mbr_chs(int, int, int, uint8_t *, uint8_t *,
uint8_t *, uint32_t);
+static void get_ptn_alignment(struct mbr_partition *);
+
+static unsigned int ptn_alignment;
+static unsigned int ptn_0_offset;
/*
* Notes on the extended partition editor.
@@ -462,8 +466,9 @@ set_mbr_type(menudesc *m, void *arg)
return 0;
mbri-extended = ext;
ext-sector = mbrp-mbrp_start;
- ext-mbr.mbr_parts[0].mbrp_start = bsec;
- ext-mbr.mbr_parts[0].mbrp_size = mbrp-mbrp_size - bsec;
+ ext-mbr.mbr_parts[0].mbrp_start = ptn_0_offset;
+ ext-mbr.mbr_parts[0].mbrp_size =
+ mbrp-mbrp_size - ptn_0_offset;
}
mbrp-mbrp_type = type;
@@ -742,14 +747,14 @@ edit_mbr_size(menudesc *m, void *arg)
/* If unchanged, don't re-round size */
new = dflt;
else {
- /* Round end to cylinder boundary */
+ /* Round end to the partition alignment */
if (sizemult != 1) {
new *= sizemult;
-new += rounddown(start, current_cylsize);
-new = roundup(new, current_cylsize);
+new += rounddown(start, ptn_alignment);
+new = roundup(new, ptn_alignment);
new -= start;
while (new = 0)
- new += current_cylsize;
+ new += ptn_alignment;
}
}
if (new max)
@@ -1237,12 +1242,12 @@ mbr_use_wholedisk(mbr_info_t *mbri)
memset(mbri-mbrb, 0, sizeof mbri-mbrb);
#endif
part[0].mbrp_type = MBR_PTYPE_NETBSD;
- part[0].mbrp_size = dlsize - bsec;
- part[0].mbrp_start = bsec;
+ part[0].mbrp_size = dlsize - ptn_0_offset;
+ part[0].mbrp_start = ptn_0_offset;
part[0].mbrp_flag = MBR_PFLAG_ACTIVE;
- ptstart = bsec;
- ptsize = dlsize - bsec;
+ ptstart = ptn_0_offset;
+ ptsize = dlsize - ptn_0_offset;
return 1;
}
@@ -1450,6 +1455,10 @@ read_mbr(const char *disk, mbr_info_t *m
*/
if (bsec == 0)
bsec = dlsec;
+ ptn_0_offset = bsec;
+ /* use 1MB default offset on large disks as fdisk(8) */
+ if (dlsize 2048 * 1024 * 128)
+ ptn_0_offset = 2048;
memset(mbri, 0, sizeof *mbri);
@@ -1467,7 +1476,9 @@ read_mbr(const char *disk, mbr_info_t *m
break;
mbrp = mbrs-mbr_parts[0];
- if (ext_base != 0) {
+ if (ext_base == 0) {
+ get_ptn_alignment(mbrp);
+ } else {
/* sanity check extended chain */
if (MBR_IS_EXTENDED(mbrp[0].mbrp_type))
break;
@@ -1547,9 +1558,9 @@ read_mbr(const char *disk, mbr_info_t *m
ext-sector = base;
ext-mbr.mbr_magic = htole16(MBR_MAGIC);
ext-mbr.mbr_parts[1] = mbrp[1];
-ext-mbr.mbr_parts[0].mbrp_start = bsec;
+ext-mbr.mbr_parts[0].mbrp_start = ptn_0_offset;
ext-mbr.mbr_parts[0].mbrp_size =
-ext_base + limit - base - bsec;
+ext_base + limit - base - ptn_0_offset;
mbrp[1].mbrp_type = MBR_PTYPE_EXT;
mbrp[1].mbrp_start = base - ext_base;
mbrp[1].mbrp_size = limit - mbrp[1].mbrp_start;
@@ -1850,3 +1861,36 @@ get_mapping(struct mbr_partition *parts,
return 0;
}
+
+/*
+ * Determine partition boundary alignment as fdisk(8) does.
+ */
+static void
+get_ptn_alignment(struct mbr_partition *mbrp0)
+{
+ uint32_t ptn_0_base, ptn_0_limit;
+
+ /* Default to using 'traditional' cylinder alignment */
+ ptn_alignment = bhead * bsec;
+ ptn_0_offset = bsec;
+
+ if (mbrp0-mbrp_type != 0) {
+ /* Try to copy offset of first partition */
+ ptn_0_base = le32toh(mbrp0-mbrp_start);
+ ptn_0_limit = ptn_0_base + le32toh(mbrp0-mbrp_size);
+ if (!(ptn_0_limit 2047)) {
+ /* Partition ends on a 1MB boundary, align to 1MB */
+ ptn_alignment = 2048;
+ if (ptn_0_base = 2048
+ !(ptn_0_base (ptn_0_base - 1))) {
+/* ptn_base is a power of 2, use it */
+ptn_0_offset = ptn_0_base;
+ }
+ }
+ } else {
+ /* Use 1MB offset for large (128GB) disks */
+ if (dlsize 2048 * 1024 * 128)
+ ptn_alignment = 2048;
+ ptn_0_offset = 2048;
+ }
+}
CVS commit: src/sbin/mount
Module Name:src
Committed By: christos
Date: Sat Apr 7 03:13:32 UTC 2012
Modified Files:
src/sbin/mount: Makefile mount.c
Log Message:
Accept NAME=label for special so that we can wire down our wedges.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sbin/mount/Makefile
cvs rdiff -u -r1.93 -r1.94 src/sbin/mount/mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount/Makefile
diff -u src/sbin/mount/Makefile:1.29 src/sbin/mount/Makefile:1.30
--- src/sbin/mount/Makefile:1.29 Thu Aug 19 19:02:27 2004
+++ src/sbin/mount/Makefile Fri Apr 6 23:13:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/08/19 23:02:27 christos Exp $
+# $NetBSD: Makefile,v 1.30 2012/04/07 03:13:32 christos Exp $
# @(#)Makefile 8.6 (Berkeley) 5/8/95
.include bsd.own.mk
@@ -6,5 +6,6 @@
PROG= mount
MAN= mount.8
SRCS= mount.c vfslist.c
+LDADD+= -lutil
.include bsd.prog.mk
Index: src/sbin/mount/mount.c
diff -u src/sbin/mount/mount.c:1.93 src/sbin/mount/mount.c:1.94
--- src/sbin/mount/mount.c:1.93 Mon Aug 29 10:35:00 2011
+++ src/sbin/mount/mount.c Fri Apr 6 23:13:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mount.c,v 1.93 2011/08/29 14:35:00 joerg Exp $ */
+/* $NetBSD: mount.c,v 1.94 2012/04/07 03:13:32 christos Exp $ */
/*
* Copyright (c) 1980, 1989, 1993, 1994
@@ -39,13 +39,15 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)mount.c 8.25 (Berkeley) 5/8/95;
#else
-__RCSID($NetBSD: mount.c,v 1.93 2011/08/29 14:35:00 joerg Exp $);
+__RCSID($NetBSD: mount.c,v 1.94 2012/04/07 03:13:32 christos Exp $);
#endif
#endif /* not lint */
#include sys/param.h
#include sys/mount.h
#include sys/wait.h
+#include sys/disk.h
+#include sys/sysctl.h
#include fs/puffs/puffs_msgif.h
@@ -58,6 +60,8 @@ __RCSID($NetBSD: mount.c,v 1.93 2011/08
#include stdlib.h
#include string.h
#include unistd.h
+#include util.h
+#include vis.h
#define MOUNTNAMES
#include fcntl.h
@@ -76,6 +80,8 @@ static const char *
static struct statvfs *
getmntpt(const char *);
static int getmntargs(struct statvfs *, char *, size_t);
+static const char *
+ getspec(char *, size_t, const char *);
static int hasopt(const char *, const char *);
static void mangle(char *, int *, const char ** volatile *, int *);
static int mountfs(const char *, const char *, const char *,
@@ -93,7 +99,7 @@ static const struct opt {
__MNT_FLAGS
};
-static char ffs_fstype[] = ffs;
+static const char ffs_fstype[] = ffs;
int
main(int argc, char *argv[])
@@ -107,7 +113,7 @@ main(int argc, char *argv[])
int all, ch, forceall, i, init_flags, mntsize, rval;
char *options;
const char *mountopts, *fstypename;
- char canonical_path_buf[MAXPATHLEN];
+ char canonical_path_buf[MAXPATHLEN], buf[MAXPATHLEN];
char *canonical_path;
/* started as mount */
@@ -138,8 +144,8 @@ main(int argc, char *argv[])
break;
case 't':
if (vfslist != NULL)
-errx(1,
-only one -t option may be specified.);
+errx(EXIT_FAILURE,
+Only one -t option may be specified.);
vfslist = makevfslist(optarg);
vfstype = optarg;
break;
@@ -176,13 +182,16 @@ main(int argc, char *argv[])
if (hasopt(fs-fs_mntops, noauto))
continue;
if (strcmp(fs-fs_spec, from_mount) == 0) {
- if ((mntbuf = getmntpt(fs-fs_file)) == NULL)
- errx(1,
- unknown file system %s.,
+ if ((mntbuf = getmntpt(fs-fs_file))
+ == NULL)
+ errx(EXIT_FAILURE,
+ Unknown file system %s,
fs-fs_file);
mntfromname = mntbuf-f_mntfromname;
} else
mntfromname = fs-fs_spec;
+mntfromname =
+getspec(buf, sizeof(buf), mntfromname);
if (mountfs(fs-fs_vfstype, mntfromname,
fs-fs_file, init_flags, options,
fs-fs_mntops, !forceall, NULL, 0))
@@ -190,7 +199,7 @@ main(int argc, char *argv[])
}
else {
if ((mntsize = getmntinfo(mntbuf, MNT_NOWAIT)) == 0)
-err(1, getmntinfo);
+err(EXIT_FAILURE, getmntinfo);
for (i = 0; i mntsize; i++) {
if (checkvfsname(mntbuf[i].f_fstypename,
vfslist))
@@ -219,12 +228,11 @@ main(int argc, char *argv[])
* then try exactly what the user entered.
*/
if ((canonical_path == NULL ||
- (mntbuf = getmntpt(canonical_path)) == NULL)
- (mntbuf = getmntpt(*argv)) == NULL
- )
- {
-errx(1,
-unknown special file or file system %s.,
+ (mntbuf = getmntpt(canonical_path)) == NULL)
+ (mntbuf = getmntpt(*argv)) == NULL) {
+out:
+errx(EXIT_FAILURE,
+Unknown special file or file system `%s',
*argv);
}
mntfromname = mntbuf-f_mntfromname;
@@ -247,26 +255,20 @@ main(int argc, char *argv[])
(fs = getfsspec(canonical_path)) == NULL))
{
if ((fs = getfsfile(*argv)) == NULL
-(fs = getfsspec(*argv)) == NULL)
-{
- errx(1,
- %s: unknown special file
CVS commit: src/share/man/man5
Module Name:src Committed By: christos Date: Sat Apr 7 03:14:07 UTC 2012 Modified Files: src/share/man/man5: fstab.5 Log Message: document NAME=label To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/share/man/man5/fstab.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/fstab.5 diff -u src/share/man/man5/fstab.5:1.39 src/share/man/man5/fstab.5:1.40 --- src/share/man/man5/fstab.5:1.39 Mon Feb 13 14:53:25 2012 +++ src/share/man/man5/fstab.5 Fri Apr 6 23:14:06 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: fstab.5,v 1.39 2012/02/13 19:53:25 dholland Exp $ +.\ $NetBSD: fstab.5,v 1.40 2012/04/07 03:14:06 christos Exp $ .\ .\ Copyright (c) 1980, 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)fstab.5 8.1 (Berkeley) 6/5/93 .\ -.Dd March 6, 2011 +.Dd February 10, 2012 .Dt FSTAB 5 .Os .Sh NAME @@ -83,6 +83,14 @@ last .Dq / in the special file name. .Pp +If the first field is of the form +.Dq NAME=value +then all the +.Xr dk 4 +wedge partitions are searched for one that has a wedge name equal to +.Ar value +and the device corresponding to it is selected. +.Pp The second field, .Pq Fa fs_file , describes the mount point for the file system.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: tsutsui Date: Sat Apr 7 03:25:00 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: ADI_BRH ARMADILLO210 ARMADILLO9 BEAGLEBOARD CP3100 GEMINI GEMINI_MASTER GEMINI_SLAVE GUMSTIX HDL_G IMX31LITE INTEGRATOR IQ31244 IQ80310 IQ80321 IXDP425 IXM1200 LUBBOCK MMNET_GENERIC MPCSA_GENERIC NAPPI NETWALKER NSLU2 OSK5912 OVERO SMDK2410 SMDK2800 TEAMASA_NPWR TEAMASA_NPWR_FC TISDP2420 TISDP2430 TS7200 TWINTAIL VIPER ZAO425 Log Message: Remove obsolete SysV semaphores limit options (SEMMNI, SEMMNS, and SEMUME). To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/ADI_BRH cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/ARMADILLO210 cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/ARMADILLO9 cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/BEAGLEBOARD \ src/sys/arch/evbarm/conf/CP3100 cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/GEMINI \ src/sys/arch/evbarm/conf/GEMINI_MASTER \ src/sys/arch/evbarm/conf/GEMINI_SLAVE src/sys/arch/evbarm/conf/TISDP2420 \ src/sys/arch/evbarm/conf/TISDP2430 cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/GUMSTIX \ src/sys/arch/evbarm/conf/INTEGRATOR cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/IMX31LITE cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/conf/IQ31244 cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/conf/IQ80310 cvs rdiff -u -r1.71 -r1.72 src/sys/arch/evbarm/conf/IQ80321 \ src/sys/arch/evbarm/conf/TEAMASA_NPWR cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/IXDP425 \ src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/IXM1200 \ src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/LUBBOCK cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/NAPPI \ src/sys/arch/evbarm/conf/ZAO425 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/NETWALKER cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/NSLU2 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/OSK5912 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/OVERO cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/conf/SMDK2410 \ src/sys/arch/evbarm/conf/SMDK2800 cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/VIPER 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/evbarm/conf/ADI_BRH diff -u src/sys/arch/evbarm/conf/ADI_BRH:1.56 src/sys/arch/evbarm/conf/ADI_BRH:1.57 --- src/sys/arch/evbarm/conf/ADI_BRH:1.56 Sun Dec 18 05:49:25 2011 +++ src/sys/arch/evbarm/conf/ADI_BRH Sat Apr 7 03:25:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ADI_BRH,v 1.56 2011/12/18 05:49:25 dholland Exp $ +# $NetBSD: ADI_BRH,v 1.57 2012/04/07 03:25:00 tsutsui Exp $ # # ADI_BRH -- ADI Engineering Big Red Head i80200 Evaluation Board # @@ -98,10 +98,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p options SYSVMSG # System V-like message queues options SYSVSEM # System V-like semaphores -#options SEMMNI=10 # number of semaphore identifiers -#options SEMMNS=60 # number of semaphores in system -#options SEMUME=10 # max number of undo entries per process -#options SEMMNU=30 # number of undo structures in system options SYSVSHM # System V-like memory sharing # Device options Index: src/sys/arch/evbarm/conf/ARMADILLO210 diff -u src/sys/arch/evbarm/conf/ARMADILLO210:1.21 src/sys/arch/evbarm/conf/ARMADILLO210:1.22 --- src/sys/arch/evbarm/conf/ARMADILLO210:1.21 Sat Mar 10 21:51:51 2012 +++ src/sys/arch/evbarm/conf/ARMADILLO210 Sat Apr 7 03:25:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO210,v 1.21 2012/03/10 21:51:51 joerg Exp $ +# $NetBSD: ARMADILLO210,v 1.22 2012/04/07 03:25:00 tsutsui Exp $ # # ARMADILLO210 -- Atmark Techno, Armadillo-210 # @@ -89,10 +89,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p # Shared memory options #options SYSVMSG # System V-like message queues #options SYSVSEM # System V-like semaphores -#options SEMMNI=10 # number of semaphore identifiers -#options SEMMNS=60 # number of semaphores in system -#options SEMUME=10 # max number of undo entries per process -#options SEMMNU=30 # number of undo structures in system #options SYSVSHM # System V-like memory sharing # Device options Index: src/sys/arch/evbarm/conf/ARMADILLO9 diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.33 src/sys/arch/evbarm/conf/ARMADILLO9:1.34 --- src/sys/arch/evbarm/conf/ARMADILLO9:1.33 Sat Mar 10 21:51:51 2012 +++ src/sys/arch/evbarm/conf/ARMADILLO9 Sat Apr 7 03:25:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO9,v 1.33 2012/03/10 21:51:51 joerg Exp $ +# $NetBSD: ARMADILLO9,v 1.34 2012/04/07 03:25:00 tsutsui Exp $ # #
CVS commit: src/lib/libc/gen
Module Name:src Committed By: christos Date: Sat Apr 7 03:47:31 UTC 2012 Modified Files: src/lib/libc/gen: getfsent.3 Log Message: cross reference getfsspecname To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/gen/getfsent.3 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/gen/getfsent.3 diff -u src/lib/libc/gen/getfsent.3:1.11 src/lib/libc/gen/getfsent.3:1.12 --- src/lib/libc/gen/getfsent.3:1.11 Mon Mar 22 15:30:53 2010 +++ src/lib/libc/gen/getfsent.3 Fri Apr 6 23:47:30 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: getfsent.3,v 1.11 2010/03/22 19:30:53 joerg Exp $ +.\ $NetBSD: getfsent.3,v 1.12 2012/04/07 03:47:30 christos Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)getfsent.3 8.1 (Berkeley) 6/4/93 .\ -.Dd June 4, 1993 +.Dd March 6, 2012 .Dt GETFSENT 3 .Os .Sh NAME @@ -128,6 +128,7 @@ returns nothing. .It Pa /etc/fstab .El .Sh SEE ALSO +.Xr getfsspecname 3 , .Xr fstab 5 .Sh HISTORY The
CVS commit: src/include
Module Name:src Committed By: christos Date: Sat Apr 7 04:04:21 UTC 2012 Modified Files: src/include: util.h Log Message: add getfsspecname To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/include/util.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/util.h diff -u src/include/util.h:1.61 src/include/util.h:1.62 --- src/include/util.h:1.61 Sat Jan 7 13:41:14 2012 +++ src/include/util.h Sat Apr 7 00:04:21 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: util.h,v 1.61 2012/01/07 18:41:14 christos Exp $ */ +/* $NetBSD: util.h,v 1.62 2012/04/07 04:04:21 christos Exp $ */ /*- * Copyright (c) 1995 @@ -74,6 +74,7 @@ int getlabelusesmbr(void); int getmaxpartitions(void); int getrawpartition(void); const char *getfstypename(int); +const char *getfsspecname(char *, size_t, const char *); #ifndef __LIBC12_SOURCE__ void login(const struct utmp *) __RENAME(__login50); void loginx(const struct utmpx *) __RENAME(__loginx50);
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sat Apr 7 04:09:57 UTC 2012 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi Log Message: bump libutil and new getfsspecname To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.162 -r1.163 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.152 -r1.153 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.622 -r1.623 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/comp/ad.mips64eb cvs rdiff -u -r1.75 -r1.76 src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.160 -r1.161 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1749 -r1.1750 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.215 -r1.216 src/distrib/sets/lists/comp/shl.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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.87 src/distrib/sets/lists/base/ad.mips64eb:1.88 --- src/distrib/sets/lists/base/ad.mips64eb:1.87 Fri Apr 6 06:49:27 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Apr 7 00:09:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.87 2012/04/06 10:49:27 spz Exp $ +# $NetBSD: ad.mips64eb,v 1.88 2012/04/07 04:09:54 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -265,7 +265,7 @@ ./usr/lib/64/libusbhid.so.1 base-compat-shlib compat,pic ./usr/lib/64/libusbhid.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libutil.so.7 base-compat-shlib compat,pic -./usr/lib/64/libutil.so.7.19 base-compat-shlib compat,pic +./usr/lib/64/libutil.so.7.20 base-compat-shlib compat,pic ./usr/lib/64/libwind.so.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libwind.so.0.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libwrap.so.1 base-compat-shlib compat,pic @@ -563,7 +563,7 @@ ./usr/lib/o32/libusbhid.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libusbhid.so.1.0 base-compat-shlib compat,pic ./usr/lib/o32/libutil.so.7 base-compat-shlib compat,pic -./usr/lib/o32/libutil.so.7.19 base-compat-shlib compat,pic +./usr/lib/o32/libutil.so.7.20 base-compat-shlib compat,pic ./usr/lib/o32/libwind.so.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libwind.so.0.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libwrap.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.86 src/distrib/sets/lists/base/ad.mips64el:1.87 --- src/distrib/sets/lists/base/ad.mips64el:1.86 Fri Apr 6 06:49:28 2012 +++ src/distrib/sets/lists/base/ad.mips64el Sat Apr 7 00:09:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.86 2012/04/06 10:49:28 spz Exp $ +# $NetBSD: ad.mips64el,v 1.87 2012/04/07 04:09:54 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -265,7 +265,7 @@ ./usr/lib/64/libusbhid.so.1 base-compat-shlib compat,pic ./usr/lib/64/libusbhid.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libutil.so.7 base-compat-shlib compat,pic -./usr/lib/64/libutil.so.7.19 base-compat-shlib compat,pic +./usr/lib/64/libutil.so.7.20 base-compat-shlib compat,pic ./usr/lib/64/libwind.so.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libwind.so.0.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libwrap.so.1 base-compat-shlib compat,pic @@ -563,7 +563,7 @@ ./usr/lib/o32/libusbhid.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libusbhid.so.1.0 base-compat-shlib compat,pic ./usr/lib/o32/libutil.so.7 base-compat-shlib compat,pic -./usr/lib/o32/libutil.so.7.19 base-compat-shlib compat,pic +./usr/lib/o32/libutil.so.7.20 base-compat-shlib compat,pic ./usr/lib/o32/libwind.so.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libwind.so.0.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libwrap.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.162 src/distrib/sets/lists/base/md.amd64:1.163 --- src/distrib/sets/lists/base/md.amd64:1.162 Fri Apr 6 06:49:28 2012 +++ src/distrib/sets/lists/base/md.amd64 Sat Apr 7 00:09:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.162 2012/04/06 10:49:28 spz Exp $ +# $NetBSD: md.amd64,v 1.163 2012/04/07 04:09:54 christos Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete
CVS commit: src/sbin
Module Name:src
Committed By: christos
Date: Sat Apr 7 04:52:21 UTC 2012
Modified Files:
src/sbin/dump: Makefile main.c optr.c
src/sbin/dump_lfs: Makefile
src/sbin/fsck: fsck.c fsutil.c preen.c
src/sbin/swapctl: swapctl.c
src/sbin/tunefs: tunefs.c
Log Message:
use getfsspecname()
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sbin/dump/Makefile
cvs rdiff -u -r1.67 -r1.68 src/sbin/dump/main.c
cvs rdiff -u -r1.36 -r1.37 src/sbin/dump/optr.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/dump_lfs/Makefile
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck/fsck.c
cvs rdiff -u -r1.20 -r1.21 src/sbin/fsck/fsutil.c
cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck/preen.c
cvs rdiff -u -r1.36 -r1.37 src/sbin/swapctl/swapctl.c
cvs rdiff -u -r1.44 -r1.45 src/sbin/tunefs/tunefs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/Makefile
diff -u src/sbin/dump/Makefile:1.37 src/sbin/dump/Makefile:1.38
--- src/sbin/dump/Makefile:1.37 Mon Jun 20 03:43:59 2011
+++ src/sbin/dump/Makefile Sat Apr 7 00:52:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2012/04/07 04:52:20 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# dump.h header file
@@ -32,6 +32,8 @@ SRCS= itime.c main.c optr.c dumprmt.c rc
traverse.c unctime.c ffs_inode.c ffs_bswap.c
MAN= dump.8
MLINKS+=dump.8 rdump.8
+DPADD+= ${LIBUTIL}
+LDADD+= -lutil
.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
Index: src/sbin/dump/main.c
diff -u src/sbin/dump/main.c:1.67 src/sbin/dump/main.c:1.68
--- src/sbin/dump/main.c:1.67 Sun Feb 19 14:49:20 2012
+++ src/sbin/dump/main.c Sat Apr 7 00:52:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.67 2012/02/19 19:49:20 christos Exp $ */
+/* $NetBSD: main.c,v 1.68 2012/04/07 04:52:20 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)main.c 8.6 (Berkeley) 5/1/95;
#else
-__RCSID($NetBSD: main.c,v 1.67 2012/02/19 19:49:20 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.68 2012/04/07 04:52:20 christos Exp $);
#endif
#endif /* not lint */
@@ -65,6 +65,7 @@ __RCSID($NetBSD: main.c,v 1.67 2012/02/
#include string.h
#include time.h
#include unistd.h
+#include util.h
#include dump.h
#include pathnames.h
@@ -85,7 +86,6 @@ int readblksize = 32 * 1024; /* read blo
chardefault_time_string[] = %T %Z; /* default timestamp string */
char*time_string = default_time_string; /* timestamp string */
-int main(int, char *[]);
static long numarg(const char *, long, long);
static void obsolete(int *, char **[]);
static void usage(void);
@@ -108,6 +108,7 @@ main(int argc, char *argv[])
char *mountpoint;
int just_estimate = 0;
char labelstr[LBLSIZE];
+ char buf[MAXPATHLEN];
char *new_time_format;
char *snap_backup = NULL;
@@ -294,7 +295,10 @@ main(int argc, char *argv[])
break;
}
if ((dt = fstabsearch(argv[i])) != NULL) {
- disk = dt-fs_spec;
+ if (getfsspecname(buf, sizeof(buf), dt-fs_spec)
+ == NULL)
+quit(%s (%s), buf, strerror(errno));
+ disk = buf;
mountpoint = xstrdup(dt-fs_file);
goto multicheck;
}
@@ -402,7 +406,9 @@ main(int argc, char *argv[])
mountpoint = NULL;
mntinfo = mntinfosearch(disk);
if ((dt = fstabsearch(disk)) != NULL) {
- disk = rawname(dt-fs_spec);
+ if (getfsspecname(buf, sizeof(buf), dt-fs_spec) == NULL)
+ quit(%s (%s), buf, strerror(errno));
+ disk = rawname(buf);
mountpoint = dt-fs_file;
msg(Found %s on %s in %s\n, disk, mountpoint, _PATH_FSTAB);
} else if (mntinfo != NULL) {
Index: src/sbin/dump/optr.c
diff -u src/sbin/dump/optr.c:1.36 src/sbin/dump/optr.c:1.37
--- src/sbin/dump/optr.c:1.36 Mon Dec 18 15:07:32 2006
+++ src/sbin/dump/optr.c Sat Apr 7 00:52:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: optr.c,v 1.36 2006/12/18 20:07:32 christos Exp $ */
+/* $NetBSD: optr.c,v 1.37 2012/04/07 04:52:20 christos Exp $ */
/*-
* Copyright (c) 1980, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)optr.c 8.2 (Berkeley) 1/6/94;
#else
-__RCSID($NetBSD: optr.c,v 1.36 2006/12/18 20:07:32 christos Exp $);
+__RCSID($NetBSD: optr.c,v 1.37 2012/04/07 04:52:20 christos Exp $);
#endif
#endif /* not lint */
@@ -56,6 +56,7 @@ __RCSID($NetBSD: optr.c,v 1.36 2006/12/
#include time.h
#include tzfile.h
#include unistd.h
+#include util.h
#include ufs/ufs/dinode.h
@@ -321,11 +322,15 @@ struct fstab *
allocfsent(struct fstab *fs)
{
struct fstab *new;
+ char buf[MAXPATHLEN];
- new = (struct fstab *)xmalloc(sizeof (*fs));
+ new = xmalloc(sizeof (*fs));
new-fs_file = xstrdup(fs-fs_file);
new-fs_type = xstrdup(fs-fs_type);
- new-fs_spec = xstrdup(fs-fs_spec);
+
+ if (getfsspecname(buf, sizeof(buf), fs-fs_spec) == NULL)
+ msg(%s (%s), buf, strerror(errno));
+ new-fs_spec = xstrdup(buf);
new-fs_passno =
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: christos
Date: Sat Apr 7 05:09:09 UTC 2012
Modified Files:
src/sys/dev/dkwedge: dkwedge_mbr.c
Log Message:
use the partition sector size.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/dkwedge/dkwedge_mbr.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/dkwedge/dkwedge_mbr.c
diff -u src/sys/dev/dkwedge/dkwedge_mbr.c:1.6 src/sys/dev/dkwedge/dkwedge_mbr.c:1.7
--- src/sys/dev/dkwedge/dkwedge_mbr.c:1.6 Mon Apr 28 16:23:48 2008
+++ src/sys/dev/dkwedge/dkwedge_mbr.c Sat Apr 7 01:09:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_mbr.c,v 1.6 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: dkwedge_mbr.c,v 1.7 2012/04/07 05:09:09 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dkwedge_mbr.c,v 1.6 2008/04/28 20:23:48 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: dkwedge_mbr.c,v 1.7 2012/04/07 05:09:09 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -45,12 +45,14 @@ __KERNEL_RCSID(0, $NetBSD: dkwedge_mbr.
#include sys/malloc.h
#include sys/bootblock.h
+#include sys/disklabel.h
typedef struct mbr_args {
struct disk *pdk;
struct vnode *vp;
void *buf;
int error;
+ uint32_t secsize;
int mbr_count;
} mbr_args_t;
@@ -86,10 +88,10 @@ getparts(mbr_args_t *a, uint32_t off, ui
const char *ptype;
int i, error;
- error = dkwedge_read(a-pdk, a-vp, off, a-buf, DEV_BSIZE);
+ error = dkwedge_read(a-pdk, a-vp, off, a-buf, a-secsize);
if (error) {
- aprint_error(%s: unable to read MBR @ %u,
- error = %d\n, a-pdk-dk_name, off, a-error);
+ aprint_error(%s: unable to read MBR @ %u/%u,
+ error = %d\n, a-pdk-dk_name, off, a-secsize, a-error);
a-error = error;
return;
}
@@ -166,8 +168,9 @@ dkwedge_discover_mbr(struct disk *pdk, s
mbr_args_t a;
a.pdk = pdk;
+ a.secsize = pdk-dk_label-d_secsize;
a.vp = vp;
- a.buf = malloc(DEV_BSIZE, M_DEVBUF, M_WAITOK);
+ a.buf = malloc(a.secsize, M_DEVBUF, M_WAITOK);
a.error = 0;
a.mbr_count = 0;
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Sat Apr 7 05:36:50 UTC 2012 Modified Files: src/sys/conf: files Log Message: Add apple autodiscovery. To generate a diff of this commit: cvs rdiff -u -r1.1046 -r1.1047 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.1046 src/sys/conf/files:1.1047 --- src/sys/conf/files:1.1046 Thu Mar 22 16:34:38 2012 +++ src/sys/conf/files Sat Apr 7 01:36:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1046 2012/03/22 20:34:38 drochner Exp $ +# $NetBSD: files,v 1.1047 2012/04/07 05:36:49 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -87,6 +87,7 @@ defflag opt_dkwedge.h DKWEDGE_AUTODISCO DKWEDGE_METHOD_BSDLABEL DKWEDGE_METHOD_GPT DKWEDGE_METHOD_MBR +DKWEDGE_METHOD_APPLE defflag opt_veriexec.h VERIFIED_EXEC_FP_SHA1 VERIFIED_EXEC_FP_SHA256 @@ -1430,6 +1431,7 @@ file dev/clock_subr.c file dev/clockctl.c clockctl needs-flag file dev/dksubr.c cgd | xbd | ccd | raid | dm file dev/dkwedge/dk.c +file dev/dkwedge/dkwedge_apple.c dkwedge_method_apple file dev/dkwedge/dkwedge_bsdlabel.c dkwedge_method_bsdlabel file dev/dkwedge/dkwedge_gpt.c dkwedge_method_gpt file dev/dkwedge/dkwedge_mbr.c dkwedge_method_mbr
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Sat Apr 7 05:38:49 UTC 2012
Modified Files:
src/sys/kern: init_sysctl.c
Log Message:
remove bogus check.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/kern/init_sysctl.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/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.188 src/sys/kern/init_sysctl.c:1.189
--- src/sys/kern/init_sysctl.c:1.188 Sat Mar 10 16:51:59 2012
+++ src/sys/kern/init_sysctl.c Sat Apr 7 01:38:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.188 2012/03/10 21:51:59 joerg Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.189 2012/04/07 05:38:49 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_sysctl.c,v 1.188 2012/03/10 21:51:59 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_sysctl.c,v 1.189 2012/04/07 05:38:49 christos Exp $);
#include opt_sysv.h
#include opt_compat_netbsd.h
@@ -1640,9 +1640,6 @@ sysctl_kern_drivers(SYSCTLFN_ARGS)
extern struct devsw_conv *devsw_conv;
extern int max_devsw_convs;
- if (newp != NULL || namelen != 0)
- return (EINVAL);
-
start = where = oldp;
buflen = *oldlenp;
if (where == NULL) {
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Apr 7 05:39:56 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: add apple autodiscovery. To generate a diff of this commit: cvs rdiff -u -r1.351 -r1.352 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.351 src/sys/arch/amd64/conf/GENERIC:1.352 --- src/sys/arch/amd64/conf/GENERIC:1.351 Sat Mar 24 20:11:16 2012 +++ src/sys/arch/amd64/conf/GENERIC Sat Apr 7 01:39:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.351 2012/03/25 00:11:16 nonaka Exp $ +# $NetBSD: GENERIC,v 1.352 2012/04/07 05:39:55 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.351 $ +#ident GENERIC-$Revision: 1.352 $ maxusers 64 # estimated number of users @@ -127,9 +127,11 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges -# The following two options can break /etc/fstab, so handle with care +# The following three options can break /etc/fstab, so handle with care #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +#options DKWEDGE_METHOD_APPLE# Support Apple partitions as wedges + file-system FFS # UFS file-system MFS # memory file system @@ -1197,7 +1199,7 @@ pseudo-device gif # IPv[46] over IPv[4 pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging -#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too +options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device agr # IEEE 802.3ad link aggregation #
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Sat Apr 7 05:40:42 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: add apple autodiscovery To generate a diff of this commit: cvs rdiff -u -r1.1068 -r1.1069 src/sys/arch/i386/conf/GENERIC 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/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1068 src/sys/arch/i386/conf/GENERIC:1.1069 --- src/sys/arch/i386/conf/GENERIC:1.1068 Sat Mar 24 20:11:16 2012 +++ src/sys/arch/i386/conf/GENERIC Sat Apr 7 01:40:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1068 2012/03/25 00:11:16 nonaka Exp $ +# $NetBSD: GENERIC,v 1.1069 2012/04/07 05:40:41 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1068 $ +#ident GENERIC-$Revision: 1.1069 $ maxusers 64 # estimated number of users @@ -151,9 +151,10 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges -# The following two options can break /etc/fstab, so handle with care +# The following three options can break /etc/fstab, so handle with care #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +#options DKWEDGE_METHOD_APPLE# Support Apple partitions as wedges file-system FFS # UFS file-system NFS # Network File System client
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Apr 7 05:42:57 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Today's work To generate a diff of this commit: cvs rdiff -u -r1.1693 -r1.1694 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.1693 src/doc/CHANGES:1.1694 --- src/doc/CHANGES:1.1693 Wed Mar 28 06:22:46 2012 +++ src/doc/CHANGES Sat Apr 7 01:42:57 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1693 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1694 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -40,3 +40,10 @@ Changes from NetBSD 6.0 to NetBSD 7.0: pcc: upgrade to 1.1.0.DEVEL 20120325 [plunky 20120325] openresolv(8): Import openresolv-3.5.1 [roy 20120327] dhcpcd(8): Import dhcpcd-5.5.6 [roy 20120328] + apple: Recognize the apple disk partitioning scheme, and auto-discover + wedges. Fix iPod disk mounting, by adding quirk. + [christos 20120306] + fstab: Add NAME=wedgename for fs_spec and routines to parse it. Now + wedges can be used in /etc/fstab, even in dynamic environments + where disks come and go and wedges get renumbered. + [christos 20120306]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Apr 7 05:43:33 UTC 2012 Modified Files: src/doc: CHANGES Log Message: one more. To generate a diff of this commit: cvs rdiff -u -r1.1694 -r1.1695 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.1694 src/doc/CHANGES:1.1695 --- src/doc/CHANGES:1.1694 Sat Apr 7 01:42:57 2012 +++ src/doc/CHANGES Sat Apr 7 01:43:33 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1694 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1695 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -47,3 +47,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: wedges can be used in /etc/fstab, even in dynamic environments where disks come and go and wedges get renumbered. [christos 20120306] + pdisk(8): Make it work for 64 bit hosts, and make it MI. + [christos 20120306]
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sat Apr 7 05:55:00 UTC 2012 Modified Files: src/distrib/sets/lists/base: rescue.mac68k rescue.macppc rescue.mi Log Message: I guess pdisk gets installed everywhere now To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/rescue.mac68k cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/rescue.macppc cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/base/rescue.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/base/rescue.mac68k diff -u src/distrib/sets/lists/base/rescue.mac68k:1.2 src/distrib/sets/lists/base/rescue.mac68k:1.3 --- src/distrib/sets/lists/base/rescue.mac68k:1.2 Sun Jan 11 05:24:59 2004 +++ src/distrib/sets/lists/base/rescue.mac68k Sat Apr 7 01:55:00 2012 @@ -1,2 +1 @@ -# $NetBSD: rescue.mac68k,v 1.2 2004/01/11 10:24:59 lukem Exp $ -./rescue/pdisk base-rescue-root +# $NetBSD: rescue.mac68k,v 1.3 2012/04/07 05:55:00 christos Exp $ Index: src/distrib/sets/lists/base/rescue.macppc diff -u src/distrib/sets/lists/base/rescue.macppc:1.3 src/distrib/sets/lists/base/rescue.macppc:1.4 --- src/distrib/sets/lists/base/rescue.macppc:1.3 Sat May 21 23:45:30 2005 +++ src/distrib/sets/lists/base/rescue.macppc Sat Apr 7 01:55:00 2012 @@ -1,2 +1 @@ -# $NetBSD: rescue.macppc,v 1.3 2005/05/22 03:45:30 lukem Exp $ -./rescue/pdisk base-rescue-root +# $NetBSD: rescue.macppc,v 1.4 2012/04/07 05:55:00 christos Exp $ Index: src/distrib/sets/lists/base/rescue.mi diff -u src/distrib/sets/lists/base/rescue.mi:1.32 src/distrib/sets/lists/base/rescue.mi:1.33 --- src/distrib/sets/lists/base/rescue.mi:1.32 Thu Feb 11 04:06:50 2010 +++ src/distrib/sets/lists/base/rescue.mi Sat Apr 7 01:55:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: rescue.mi,v 1.32 2010/02/11 09:06:50 roy Exp $ +# $NetBSD: rescue.mi,v 1.33 2012/04/07 05:55:00 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -105,6 +105,7 @@ ./rescue/newfs_lfsbase-rescue-root ./rescue/newfs_msdosbase-rescue-root ./rescue/pax base-rescue-root +./rescue/pdisk base-rescue-root ./rescue/ping base-rescue-root ./rescue/ping6 base-rescue-root use_inet6 ./rescue/pppoectlbase-rescue-root
CVS commit: src/sbin/mount
Module Name:src
Committed By: christos
Date: Sat Apr 7 05:58:55 UTC 2012
Modified Files:
src/sbin/mount: Makefile
Log Message:
add missing DPADD
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sbin/mount/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount/Makefile
diff -u src/sbin/mount/Makefile:1.30 src/sbin/mount/Makefile:1.31
--- src/sbin/mount/Makefile:1.30 Fri Apr 6 23:13:32 2012
+++ src/sbin/mount/Makefile Sat Apr 7 01:58:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/04/07 03:13:32 christos Exp $
+# $NetBSD: Makefile,v 1.31 2012/04/07 05:58:55 christos Exp $
# @(#)Makefile 8.6 (Berkeley) 5/8/95
.include bsd.own.mk
@@ -7,5 +7,6 @@ PROG= mount
MAN= mount.8
SRCS= mount.c vfslist.c
LDADD+= -lutil
+DPADD+= ${LIBUTIL}
.include bsd.prog.mk
