CVS commit: [netbsd-6] src/sys/dev/sdmmc
Module Name:src
Committed By: jdc
Date: Wed Aug 8 06:19:00 UTC 2012
Modified Files:
src/sys/dev/sdmmc [netbsd-6]: sdhc.c sdhcreg.h sdmmc_mem.c sdmmcreg.h
Log Message:
Pull up revisions:
src/sys/dev/sdmmc/sdhc.c revisions 1.16,1.20,1.21,1.22,1.23 via patch,1.25
src/sys/dev/sdmmc/sdhcreg.h revision 1.8
src/sys/dev/sdmmc/sdmmc_mem.c revisions 1.21,1.22
src/sys/dev/sdmmc/sdmmcreg.h revisions 1.10,1.11,1.12
(requested by matt in ticket 441).
SDHCI byte swaps the BE response on the wire into LE registers.
As we always want response data in LE, use bus_space_read_stream.
Additonally, read response data in 1 or 4 4-byte chunks, instead of
one 4-byte chunk or 15 1-byte chunks.
bus_space_*_stream_N() functions are not universally available.
Provite alternate implementation for when they are unavailable.
Handle interrupt acknowledgement in the SDHC_FLAG_32BIT_ACCESS case in
the same way as non-SDHC_FLAG_32BIT_ACCESS case.
If there was an error in 32-bit mode, just set ERROR_INTERRUPT otherwise
see if matched anything we care about.
Add use of watermark register when PIO to an ESDHC. After every kill or
drain of watermask words, pause a bit to give time for the fifo to recover.
Always the command response in BE byteorder. Rewrite __bitfield to deal
with this.
Responses are actually in host order (except SCR which is return in
big endian so that's convert to host order).
Fix comments about __bitfield.
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/dev/sdmmc/sdhcreg.h
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/dev/sdmmc/sdmmc_mem.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/sdmmc/sdmmcreg.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.10.2.1 src/sys/dev/sdmmc/sdhc.c:1.10.2.2
--- src/sys/dev/sdmmc/sdhc.c:1.10.2.1 Mon Jun 11 17:45:32 2012
+++ src/sys/dev/sdmmc/sdhc.c Wed Aug 8 06:18:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.10.2.1 2012/06/11 17:45:32 riz Exp $ */
+/* $NetBSD: sdhc.c,v 1.10.2.2 2012/08/08 06:18:59 jdc Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.10.2.1 2012/06/11 17:45:32 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.10.2.2 2012/08/08 06:18:59 jdc Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -987,14 +987,11 @@ sdhc_exec_command(sdmmc_chipset_handle_t
*/
mutex_enter(hp-host_mtx);
if (cmd-c_error == 0 ISSET(cmd-c_flags, SCF_RSP_PRESENT)) {
+ cmd-c_resp[0] = HREAD4(hp, SDHC_RESPONSE + 0);
if (ISSET(cmd-c_flags, SCF_RSP_136)) {
- uint8_t *p = (uint8_t *)cmd-c_resp;
- int i;
-
- for (i = 0; i 15; i++)
-*p++ = HREAD1(hp, SDHC_RESPONSE + i);
- } else {
- cmd-c_resp[0] = HREAD4(hp, SDHC_RESPONSE);
+ cmd-c_resp[1] = HREAD4(hp, SDHC_RESPONSE + 4);
+ cmd-c_resp[2] = HREAD4(hp, SDHC_RESPONSE + 8);
+ cmd-c_resp[3] = HREAD4(hp, SDHC_RESPONSE + 12);
}
}
mutex_exit(hp-host_mtx);
@@ -1379,17 +1376,33 @@ static void
esdhc_read_data_pio(struct sdhc_host *hp, uint8_t *data, u_int datalen)
{
uint16_t status = HREAD2(hp, SDHC_NINTR_STATUS);
+ uint32_t v;
+
+ const size_t watermark = (HREAD4(hp, SDHC_WATERMARK_LEVEL) SDHC_WATERMARK_READ_SHIFT) SDHC_WATERMARK_READ_MASK;
+ size_t count = 0;
+
while (datalen 3 !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = HREAD4(hp, SDHC_DATA);
+ if (count == 0) {
+ /*
+ * If we've drained watermark words, we need to wait
+ * a little bit so the read FIFO can refill.
+ */
+ sdmmc_delay(10);
+ count = watermark;
+ }
+ v = HREAD4(hp, SDHC_DATA);
v = le32toh(v);
*(uint32_t *)data = v;
data += 4;
datalen -= 4;
status = HREAD2(hp, SDHC_NINTR_STATUS);
+ count--;
}
-
if (datalen 0 !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = HREAD4(hp, SDHC_DATA);
+ if (count == 0) {
+ sdmmc_delay(10);
+ }
+ v = HREAD4(hp, SDHC_DATA);
v = le32toh(v);
do {
*data++ = v;
@@ -1402,16 +1415,29 @@ static void
esdhc_write_data_pio(struct sdhc_host *hp, uint8_t *data, u_int datalen)
{
uint16_t status = HREAD2(hp, SDHC_NINTR_STATUS);
+ uint32_t v;
+
+ const size_t watermark = (HREAD4(hp, SDHC_WATERMARK_LEVEL) SDHC_WATERMARK_WRITE_SHIFT) SDHC_WATERMARK_WRITE_MASK;
+ size_t count = watermark;
+
while (datalen 3 !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = *(uint32_t *)data;
+ if (count == 0) {
+ sdmmc_delay(10);
+ count = watermark;
+ }
+ v = *(uint32_t *)data;
v = htole32(v);
HWRITE4(hp, SDHC_DATA, v);
data += 4;
datalen -= 4;
status = HREAD2(hp, SDHC_NINTR_STATUS);
+ count--;
}
if (datalen 0 !ISSET(status, SDHC_TRANSFER_COMPLETE)) {
- uint32_t v = *(uint32_t *)data;
+ if (count == 0) {
+ sdmmc_delay(10);
+ }
+ v = *(uint32_t *)data;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Wed Aug 8 09:02:14 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 441, 447. To generate a diff of this commit: cvs rdiff -u -r1.1.2.167 -r1.1.2.168 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.167 src/doc/CHANGES-6.0:1.1.2.168 --- src/doc/CHANGES-6.0:1.1.2.167 Tue Jul 31 09:27:27 2012 +++ src/doc/CHANGES-6.0 Wed Aug 8 09:02:14 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.167 2012/07/31 09:27:27 martin Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.168 2012/08/08 09:02:14 jdc Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6692,3 +6692,18 @@ share/zoneinfo/zone.tab: 1.1.1.42 Infrastructure changes to accommodate how the tz code and data are released on IANA. [apb, ticket #455] + +sys/dev/sdmmc/sdhc.c 1.16,1.20,1.21,1.22,1.23 via patch,1.25 +sys/dev/sdmmc/sdhcreg.h 1.8 +sys/dev/sdmmc/sdmmc_mem.c 1.21,1.22 +sys/dev/sdmmc/sdmmcreg.h 1.10,1.11,1.12 + Make SDMMC work on both big-endian and little-endian hosts. + [matt, ticket #441] + +libexec/ld.elf_so/headers.c 1.42 +libexec/ld.elf_so/arch/sparc64/mdreloc.c 1.53 + Remove a debug assert that does not hold for PIE (e.g. phdr = 0x40, + but obj has not been mapped at 0, so obj-phdr is 0x100040). + Add special handling needed for OLO10 relocations. PR#46724 + [martin, ticket #447] +
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Wed Aug 8 13:56:14 UTC 2012
Modified Files:
src/share/mk: bsd.README bsd.own.mk bsd.prog.mk
Log Message:
add MKRUMP by popular demand.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/share/mk/bsd.README
cvs rdiff -u -r1.702 -r1.703 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.274 -r1.275 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.297 src/share/mk/bsd.README:1.298
--- src/share/mk/bsd.README:1.297 Sat Jul 14 12:04:06 2012
+++ src/share/mk/bsd.README Wed Aug 8 09:56:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.297 2012/07/14 16:04:06 spz Exp $
+# $NetBSD: bsd.README,v 1.298 2012/08/08 13:56:13 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -362,6 +362,10 @@ MKZFS If no, do not build and install
compatibility kernel modules.
Default: yes on i386/amd64, no elsewhere.
+MKRUMP If no, do not build and install rump related headers,
+ libraries, and programs.
+ Default: yes
+
USE_HESIOD If no, disables building Hesiod support into
various system utilities/libraries that support it.
If ${MKHESIOD} is no, USE_HESIOD will also be
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.702 src/share/mk/bsd.own.mk:1.703
--- src/share/mk/bsd.own.mk:1.702 Sun Aug 5 00:11:35 2012
+++ src/share/mk/bsd.own.mk Wed Aug 8 09:56:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.702 2012/08/05 04:11:35 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.703 2012/08/08 13:56:13 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -825,6 +825,7 @@ _MKVARS.yes= \
MKOBJ \
MKPAM MKPERFUSE \
MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
+ MKRUMP \
MKSHARE MKSKEY MKSTATICLIB \
MKX11FONTS \
MKYP
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.274 src/share/mk/bsd.prog.mk:1.275
--- src/share/mk/bsd.prog.mk:1.274 Wed Feb 29 15:07:57 2012
+++ src/share/mk/bsd.prog.mk Wed Aug 8 09:56:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.274 2012/02/29 20:07:57 tron Exp $
+# $NetBSD: bsd.prog.mk,v 1.275 2012/08/08 13:56:14 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -310,24 +310,34 @@ _CCLINK= ${CXX} ${_CCLINKFLAGS}
.if defined(RUMPPRG)
PROG= ${RUMPPRG}
-.ifndef CRUNCHEDPROG
+. ifndef CRUNCHEDPROG
+. if (${MKRUMP} != no)
PROGS= ${RUMPPRG} rump.${RUMPPRG}
-. if defined(SRCS)
+. else
+PROGS= ${RUMPPRG}
+. endif
+. if defined(SRCS)
+. if (${MKRUMP} != no)
SRCS.rump.${PROG}:= ${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}
+. endif
SRCS+= ${PROG}_hostops.c
-. else
+. else
SRCS= ${PROG}.c ${PROG}_hostops.c
+. if (${MKRUMP} != no)
SRCS.rump.${PROG}= ${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
-. endif
+. endif
+. endif
+. if (${MKRUMP} != no)
DPSRCS+= ${PROG}_rumpops.c ${RUMPSRCS}
LDADD.rump.${PROG}+= -lrumpclient
DPADD.rump.${PROG}+= ${LIBRUMPCLIENT}
MAN.rump.${PROG}= # defined but feeling empty
_RUMPINSTALL.rump.${PROG}=# defined
-.else # CRUNCHEDPROG
+. endif
+. else # CRUNCHEDPROG
PROGS= ${PROG}
CPPFLAGS+= -DCRUNCHOPS
-.endif
+. endif
.endif
.if defined(PROG)
CVS commit: src/tests
Module Name:src
Committed By: christos
Date: Wed Aug 8 13:57:06 UTC 2012
Modified Files:
src/tests: Makefile
src/tests/dev: Makefile
src/tests/include/sys: Makefile
src/tests/kernel: Makefile
src/tests/lib: Makefile
src/tests/lib/libc/sys: Makefile
src/tests/lib/semaphore: Makefile
src/tests/net: Makefile
Log Message:
Exclude tests that use rump
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/tests/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tests/dev/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/include/sys/Makefile
cvs rdiff -u -r1.25 -r1.26 src/tests/kernel/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/lib/Makefile
cvs rdiff -u -r1.26 -r1.27 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/semaphore/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/net/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.37 src/tests/Makefile:1.38
--- src/tests/Makefile:1.37 Fri Mar 23 21:36:50 2012
+++ src/tests/Makefile Wed Aug 8 09:57:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/03/24 01:36:50 matt Exp $
+# $NetBSD: Makefile,v 1.38 2012/08/08 13:57:05 christos Exp $
.include bsd.own.mk
@@ -7,12 +7,16 @@
TESTSDIR= ${TESTSBASE}
ATFFILE= yes
-SUBDIR= bin dev examples fs games include kernel lib libexec net
-SUBDIR+= rump sbin sys usr.bin usr.sbin
+SUBDIR= bin dev examples games include kernel lib libexec net
+SUBDIR+= sbin sys usr.bin usr.sbin
+
+. if (${MKRUMP} != no)
+SUBDIR+= fs rump
. if ${MKKMOD} != no
SUBDIR+= modules
. endif
+. endif
. if ${MKCRYPTO} != no
SUBDIR+= crypto
Index: src/tests/dev/Makefile
diff -u src/tests/dev/Makefile:1.7 src/tests/dev/Makefile:1.8
--- src/tests/dev/Makefile:1.7 Wed Dec 15 15:40:17 2010
+++ src/tests/dev/Makefile Wed Aug 8 09:57:05 2012
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2010/12/15 20:40:17 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/08 13:57:05 christos Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/dev
-TESTS_SUBDIRS+= audio cgd md raidframe scsipi sysmon
+TESTS_SUBDIRS+= cgd raidframe
+.if (${MKRUMP} != no)
+TESTS_SUBDIRS+= audio md scsipi sysmon
+.endif
+
.include bsd.test.mk
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.6 src/tests/include/sys/Makefile:1.7
--- src/tests/include/sys/Makefile:1.6 Sun Mar 18 11:30:59 2012
+++ src/tests/include/sys/Makefile Wed Aug 8 09:57:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/03/18 15:30:59 christos Exp $
+# $NetBSD: Makefile,v 1.7 2012/08/08 13:57:06 christos Exp $
NOMAN= # defined
@@ -6,10 +6,14 @@ NOMAN= # defined
TESTSDIR= ${TESTSBASE}/include/sys
-TESTS_C= t_bitops t_bootblock t_cdefs t_socket t_tree t_types
+TESTS_C= t_bitops t_bootblock t_cdefs t_tree t_types
LDADD.t_bitops+= -lm
+
+.if (${MKRUMP} != no)
+TESTS_C+= t_socket
LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet
LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread
+.endif
.include bsd.test.mk
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.25 src/tests/kernel/Makefile:1.26
--- src/tests/kernel/Makefile:1.25 Sat Mar 17 13:23:34 2012
+++ src/tests/kernel/Makefile Wed Aug 8 09:57:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/03/17 17:23:34 jruoho Exp $
+# $NetBSD: Makefile,v 1.26 2012/08/08 13:57:06 christos Exp $
NOMAN= # defined
@@ -6,13 +6,9 @@ NOMAN= # defined
TESTSDIR= ${TESTSBASE}/kernel
-TESTS_SUBDIRS= kqueue tty
-
+TESTS_SUBDIRS= kqueue
TESTS_C= t_lock
TESTS_C+= t_pty
-TESTS_C+= t_rnd
-TESTS_C+= t_extattrctl
-TESTS_C+= t_filedesc
TESTS_C+= t_subr_prf
TESTS_SH= t_umount
@@ -22,9 +18,19 @@ BINDIR= ${TESTSDIR}
PROGS= h_ps_strings1
PROGS+= h_ps_strings2
-LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
-LDADD.t_filedesc+= ${LDADD.t_rnd}
+
+.if (${MKRUMP} != no)
+TESTS_SUBDIRS+= tty
+
+TESTS_C+= t_extattrctl
+TESTS_C+= t_filedesc
+TESTS_C+= t_rnd
LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_filedesc+= ${LDADD.t_rnd}
+LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
+
+.endif
+
.PATH: ${NETBSDSRCDIR}/sys/kern
TESTS_C+= t_extent
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.19 src/tests/lib/Makefile:1.20
--- src/tests/lib/Makefile:1.19 Sun May 27 15:21:26 2012
+++ src/tests/lib/Makefile Wed Aug 8 09:57:06 2012
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2012/05/27 19:21:26 christos Exp $
+# $NetBSD: Makefile,v 1.20 2012/08/08 13:57:06 christos Exp $
.include bsd.own.mk
TESTS_SUBDIRS= csu libbluetooth libc libcrypt libcurses libevent libexecinfo \
libm libobjc libposix libppath libprop libpthread \
- librt librumpclient librumphijack libtre libutil semaphore
+ librt libtre libutil semaphore
+
+.if (${MKRUMP} !=
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: christos
Date: Wed Aug 8 13:58:56 UTC 2012
Modified Files:
src/sys/rump/include/rump: Makefile
Log Message:
don't install includes if MKRUMP = no
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/Makefile
diff -u src/sys/rump/include/rump/Makefile:1.4 src/sys/rump/include/rump/Makefile:1.5
--- src/sys/rump/include/rump/Makefile:1.4 Tue Aug 24 09:19:04 2010
+++ src/sys/rump/include/rump/Makefile Wed Aug 8 09:58:56 2012
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2010/08/24 13:19:04 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2012/08/08 13:58:56 christos Exp $
+
+.include bsd.own.mk
INCSDIR= /usr/include/rump
+.if (${MKRUMP} != no)
INCS= rump.h rump_namei.h rump_syscalls.h rump_syscalls_compat.h
INCS+= rumpdefs.h rumpuser.h rumpvnode_if.h
INCS+= rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
INCS+= scsitest.h
+.endif
.include bsd.kinc.mk
CVS commit: src
Module Name:src
Committed By: christos
Date: Wed Aug 8 14:00:31 UTC 2012
Modified Files:
src: Makefile
Log Message:
exclude rump targets if MKRUMP = no
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.292 src/Makefile:1.293
--- src/Makefile:1.292 Sat Apr 21 04:28:00 2012
+++ src/Makefile Wed Aug 8 10:00:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.292 2012/04/21 08:28:00 veego Exp $
+# $NetBSD: Makefile,v 1.293 2012/08/08 14:00:31 christos Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -256,8 +256,10 @@ BUILDTARGETS+= do-lib
.if ${MKKMOD} != no
BUILDTARGETS+= do-sys-modules
.endif
+.if ${MKRUMP} != no
BUILDTARGETS+= do-sys-rump-dev-lib do-sys-rump-fs-lib
BUILDTARGETS+= do-sys-rump-kern-lib do-sys-rump-net-lib
+.endif
.if ${MKCOMPAT} != no
BUILDTARGETS+= do-compat-lib-csu
BUILDTARGETS+= do-compat-libgcc
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Wed Aug 8 14:01:16 UTC 2012
Modified Files:
src/lib: Makefile
Log Message:
exclude rump libraries if MKRUMP = no
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.186 src/lib/Makefile:1.187
--- src/lib/Makefile:1.186 Thu Jul 12 16:14:44 2012
+++ src/lib/Makefile Wed Aug 8 10:01:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.186 2012/07/12 20:14:44 christos Exp $
+# $NetBSD: Makefile,v 1.187 2012/08/08 14:01:16 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -36,9 +36,12 @@ SUBDIR+= libarch \
libintl libipsec libisns libkvm libm \
libossaudio libpci libpmc libposix libprop libpthread \
libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
- librumpclient libtelnet libterminfo \
+ libtelnet libterminfo \
libusbhid libutil libwrap liby libz
+.if (${MKRUMP} != no)
+SUBDIR+= librumpclient
+.endif
.if (${MKSKEY} != no)
SUBDIR+= libskey
.endif
@@ -100,8 +103,10 @@ SUBDIR+= libppath # depends on libprop
SUBDIR+= libperfuse # depends on libpuffs
SUBDIR+= libquota # depends on libprop and librpcsvc
SUBDIR+= librefuse # depends on libpuffs
+.if (${MKRUMP} != no)
SUBDIR+= librumpuser # depends on libpthread
SUBDIR+= librumphijack # depends on librumpclient and libpthread
+.endif
.if (${MKNPF} != no)
SUBDIR+= libnpf # depends on libprop
@@ -147,7 +152,9 @@ SUBDIR+= ../external/bsd/atf/lib # depe
SUBDIR+= libform # depends on libcurses
SUBDIR+= libmenu # depends on libcurses
SUBDIR+= libradius # depends on libcrypto if (${MKCRYPTO} != no)
+.if (${MKRUMP} != no)
SUBDIR+= librump # depends on librumpuser
+.endif
.if (${MKKERBEROS} != no)
SUBDIR+= ../crypto/external/bsd/heimdal/lib # depends on libcrypto
@@ -169,9 +176,11 @@ SUBDIR+= ../external/bsd/openldap/lib #
# 3rd library dependency barrier
SUBDIR+= .WAIT
+.if (${MKRUMP} != no)
SUBDIR+= librumpdev # depends on librump
SUBDIR+= librumpnet # depends on librump
SUBDIR+= librumpvfs # depends on librump
+.endif
.if (${MKPAM} != no)
SUBDIR+= libpam # depends on heimdal
@@ -183,6 +192,7 @@ SUBDIR+= ../crypto/external/bsd/libsaslc
SUBDIR+= ../external/bsd/mdocml/lib
+.if (${MKRUMP} != no)
# 4th library dependency barrier
SUBDIR+= .WAIT
@@ -192,6 +202,7 @@ SUBDIR+= libukfs # depends on librumpvf
SUBDIR+= .WAIT
SUBDIR+= libp2k # depends on libukfs, librumpvfs, libpuffs
+.endif
# Lua bindings come last, they might depend on anything
SUBDIR+= lua
CVS commit: src/sbin/route
Module Name:src Committed By: christos Date: Wed Aug 8 14:04:26 UTC 2012 Modified Files: src/sbin/route: route.c Log Message: remove useless rump headers. To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/sbin/route/route.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/route/route.c diff -u src/sbin/route/route.c:1.137 src/sbin/route/route.c:1.138 --- src/sbin/route/route.c:1.137 Fri Mar 16 22:13:44 2012 +++ src/sbin/route/route.c Wed Aug 8 10:04:26 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.137 2012/03/17 02:13:44 christos Exp $ */ +/* $NetBSD: route.c,v 1.138 2012/08/08 14:04:26 christos Exp $ */ /* * Copyright (c) 1983, 1989, 1991, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = @(#)route.c 8.6 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: route.c,v 1.137 2012/03/17 02:13:44 christos Exp $); +__RCSID($NetBSD: route.c,v 1.138 2012/08/08 14:04:26 christos Exp $); #endif #endif /* not lint */ @@ -71,10 +71,6 @@ __RCSID($NetBSD: route.c,v 1.137 2012/0 #include paths.h #include err.h -#include rump/rump.h -#include rump/rump_syscalls.h -#include rump/rumpclient.h - #include keywords.h #include extern.h #include prog_ops.h
CVS commit: src/bin/dd
Module Name:src
Committed By: christos
Date: Wed Aug 8 14:09:14 UTC 2012
Modified Files:
src/bin/dd: Makefile
Log Message:
let the standard rules deal with librumpclient
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/bin/dd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/dd/Makefile
diff -u src/bin/dd/Makefile:1.16 src/bin/dd/Makefile:1.17
--- src/bin/dd/Makefile:1.16 Sun Nov 6 16:22:23 2011
+++ src/bin/dd/Makefile Wed Aug 8 10:09:14 2012
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2011/11/06 21:22:23 jym Exp $
+# $NetBSD: Makefile,v 1.17 2012/08/08 14:09:14 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+.include bsd.own.mk
+
RUMPPRG=dd
SRCS= args.c conv.c dd.c misc.c position.c
@@ -11,10 +13,7 @@ LDADD+= -lutil
CPPFLAGS+= -DNO_CONV -DNO_MSGFMT -DSMALL
.else
SRCS+= conv_tab.c
-.ifndef CRUNCHEDPROG
-DPADD+= ${LIBRUMPCLIENT}
-LDADD+= -lrumpclient
-.else
+.ifdef CRUNCHEDPROG
CPPFLAGS+= -DSMALL
.endif
.endif
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: christos
Date: Wed Aug 8 14:10:39 UTC 2012
Modified Files:
src/sbin/ifconfig: Makefile
Log Message:
don't define RUMP_ACTION if MKRUMP = no
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sbin/ifconfig/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/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.52 src/sbin/ifconfig/Makefile:1.53
--- src/sbin/ifconfig/Makefile:1.52 Sun Aug 14 08:15:15 2011
+++ src/sbin/ifconfig/Makefile Wed Aug 8 10:10:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2011/08/14 12:15:15 christos Exp $
+# $NetBSD: Makefile,v 1.53 2012/08/08 14:10:38 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -21,7 +21,9 @@ SRCS+= af_inet6.c
.PATH: ${.CURDIR}/../../lib/libc/net
RUMPSRCS= getifaddrs.c
+.if (${MKRUMP} != no)
CPPFLAGS+= -DRUMP_ACTION
+.endif
CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/pf/
SRCS+= pfsync.c
CVS commit: src
Module Name:src
Committed By: christos
Date: Wed Aug 8 14:13:46 UTC 2012
Modified Files:
src/usr.bin: Makefile
src/usr.sbin: Makefile
Log Message:
exclude programs for MKRUMP = no
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/usr.bin/Makefile
cvs rdiff -u -r1.265 -r1.266 src/usr.sbin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.209 src/usr.bin/Makefile:1.210
--- src/usr.bin/Makefile:1.209 Sat Aug 4 11:50:16 2012
+++ src/usr.bin/Makefile Wed Aug 8 10:13:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.209 2012/08/04 15:50:16 christos Exp $
+# $NetBSD: Makefile,v 1.210 2012/08/08 14:13:46 christos Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include bsd.own.mk
@@ -22,8 +22,7 @@ SUBDIR= apply asa at audio audiocfg \
pagesize passwd paste patch pathchk pkill pmap pmc pr \
printenv printf progress pwhash qsubst quota radioctl rdist \
renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh \
- rump_allserver rump_dhcpclient rump_halt rump_server rup ruptime \
- rusers rwall rwho \
+ rup ruptime rusers rwall rwho \
script sdiff sdpquery sed seq shar shlock shmif_dumpbus \
showmount shuffle sockstat soelim sort spell split stat su systat \
tabs tail talk tcopy tee telnet tftp tic time tip touch tpfmt tput \
@@ -40,6 +39,10 @@ SUBDIR+= ../external/zlib/pigz/bin/pigz
SUBDIR+= apropos whatis
.endif
+.if (${MKRUMP} != no)
+SUBDIR+= rump_allserver rump_dhcpclient rump_halt rump_server
+.endif
+
.if (${MKBSDGREP} != no)
SUBDIR+= grep
.endif
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.265 src/usr.sbin/Makefile:1.266
--- src/usr.sbin/Makefile:1.265 Fri May 25 21:58:20 2012
+++ src/usr.sbin/Makefile Wed Aug 8 10:13:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.265 2012/05/26 01:58:20 uebayasi Exp $
+# $NetBSD: Makefile,v 1.266 2012/08/08 14:13:46 christos Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include bsd.own.mk
@@ -20,7 +20,7 @@ SUBDIR= ac accton acpitools altq apm apm
ndbootd ndiscvt netgroup_mkdb nfsd \
ofctl \
paxctl pcictl perfused pppd psrset pstat pwd_mkdb postinstall \
- powerd puffs \
+ powerd \
quot quotacheck quotaon quotarestore \
rarpd rbootd rdate repquota rmt rpc.bootparamd rpc.lockd \
rpc.pcnfsd rpc.statd rpcbind rwhod \
@@ -40,6 +40,10 @@ SUBDIR+= makemandb
SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset
.endif
+.if (${MKRUMP} != no)
+SUBDIR+= puffs
+.endif
+
.if ${TOOLCHAIN_MISSING} != no
SUBDIR+= mdsetimage
.endif
CVS commit: [netbsd-6] src
Module Name:src
Committed By: martin
Date: Wed Aug 8 14:26:50 UTC 2012
Modified Files:
src/etc [netbsd-6]: daily
src/etc/defaults [netbsd-6]: daily.conf
src/share/man/man5 [netbsd-6]: daily.5
Log Message:
Pull up following revision(s) (requested by christos in ticket #456):
etc/daily: revision 1.82
etc/defaults/daily.conf: revision 1.17
share/man/man5/daily.5: revision 1.5
PR/46756: Edgar Fu�: Enable ignoring subdirectories in daily's find_core
To generate a diff of this commit:
cvs rdiff -u -r1.80.2.1 -r1.80.2.2 src/etc/daily
cvs rdiff -u -r1.16 -r1.16.2.1 src/etc/defaults/daily.conf
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/share/man/man5/daily.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.80.2.1 src/etc/daily:1.80.2.2
--- src/etc/daily:1.80.2.1 Thu Feb 16 19:56:43 2012
+++ src/etc/daily Wed Aug 8 14:26:49 2012
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.80.2.1 2012/02/16 19:56:43 riz Exp $
+# $NetBSD: daily,v 1.80.2.2 2012/08/08 14:26:49 martin Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -89,7 +89,16 @@ if checkyesno find_core; then
ignfstypes=$(echo $find_core_ignore_fstypes | \
sed -e's/\(!*\)\([^[:space:]]\{1,\}\)/-o \1 -fstype \2/g' \
-e's/^-o //')
+ # Turn foo bar into ( -path foo -o -path bar ) -prune -o
+ # Set ignpaths empty if no find_core_ignore_paths given
+ if [ -n $find_core_ignore_paths ]; then
+ ignpaths=$(printf -o -path %s $find_core_ignore_paths)
+ ignpaths=( ${ignpaths# -o } ) -prune -o
+ else
+ ignpaths=
+ fi
find / \( $ignfstypes \) -prune -o \
+ ${ignpaths} \
-name 'lost+found' -prune -o \
\( -name '*.core' -o -name 'core' \) -type f -print $TMP
# \( -name '[#,]*' -o -name '.#*' -o -name a.out \
Index: src/etc/defaults/daily.conf
diff -u src/etc/defaults/daily.conf:1.16 src/etc/defaults/daily.conf:1.16.2.1
--- src/etc/defaults/daily.conf:1.16 Tue Feb 7 19:13:30 2012
+++ src/etc/defaults/daily.conf Wed Aug 8 14:26:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: daily.conf,v 1.16 2012/02/07 19:13:30 joerg Exp $
+# $NetBSD: daily.conf,v 1.16.2.1 2012/08/08 14:26:49 martin Exp $
#
# /etc/defaults/daily.conf --
# default configuration of /etc/daily.conf
@@ -11,6 +11,7 @@
find_core=YES
find_core_ignore_fstypes=!local rdonly fdesc null kernfs procfs ptyfs
+find_core_ignore_paths=
expire_news=NO
purge_accounting=YES
run_msgs=YES
Index: src/share/man/man5/daily.5
diff -u src/share/man/man5/daily.5:1.3.6.1 src/share/man/man5/daily.5:1.3.6.2
--- src/share/man/man5/daily.5:1.3.6.1 Thu Mar 8 17:51:39 2012
+++ src/share/man/man5/daily.5 Wed Aug 8 14:26:49 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: daily.5,v 1.3.6.1 2012/03/08 17:51:39 riz Exp $
+.\ $NetBSD: daily.5,v 1.3.6.2 2012/08/08 14:26:49 martin Exp $
.\
.\ Copyright (c) 1996 Matthew R. Green
.\ All rights reserved.
@@ -24,7 +24,7 @@
.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\ SUCH DAMAGE.
.\
-.Dd March 6, 2012
+.Dd July 30, 2012
.Dt DAILY 5
.Os
.Sh NAME
@@ -168,6 +168,16 @@ will ignore
.Ql procfs
type filesystems and filesystems that are not
.Ql local .
+.It Sy find_core_ignore_paths
+Lists paths to ignore during the
+.Sy find_core
+phase.
+For example,
+.Ql /export
+will not descend into any directories under the
+.Ql /export
+hierarchy. This, on a file server, allows to skip
+user data while still scanning system files.
.It Sy run_fsck_flags
Extra options to be passed to
.Xr fsck 8
CVS commit: [netbsd-6] src/etc
Module Name:src
Committed By: martin
Date: Wed Aug 8 14:31:33 UTC 2012
Modified Files:
src/etc [netbsd-6]: daily
src/etc/defaults [netbsd-6]: daily.conf
Log Message:
Pull up following revision(s) (requested by christos in ticket #457):
etc/daily: revision 1.83
etc/defaults/daily.conf: revision 1.18
PR/46757: Edgar Fu�: Change default to pkg_vulnerabilities from NO to unset,
and make unset insted of NO to produce warnings, so that setting it to NO does
produce warnings (if it is inappropriate for the machine to warn about this).
To generate a diff of this commit:
cvs rdiff -u -r1.80.2.2 -r1.80.2.3 src/etc/daily
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/etc/defaults/daily.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.80.2.2 src/etc/daily:1.80.2.3
--- src/etc/daily:1.80.2.2 Wed Aug 8 14:26:49 2012
+++ src/etc/daily Wed Aug 8 14:31:33 2012
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.80.2.2 2012/08/08 14:26:49 martin Exp $
+# $NetBSD: daily,v 1.80.2.3 2012/08/08 14:31:33 martin Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -263,9 +263,10 @@ if pkg_info ${_compat_K_flag} -q -E '*';
if checkyesno fetch_pkg_vulnerabilities; then
( umask 022 pkg_admin ${_compat_K_flag} \
fetch-pkg-vulnerabilities -u )
- else
- echo fetch_pkg_vulnerabilities is set to NO in daily.conf(5).
- echo You should set it to YES to enable vulnerability checks.
+ elif [ -z $fetch_pkg_vulnerabilities ]; then
+ echo fetch_pkg_vulnerabilities is not set in daily.conf(5).
+ echo You should set it to YES to enable vulnerability checks
+ echo or set it to NO to get rid of this warning.
fi
fi
Index: src/etc/defaults/daily.conf
diff -u src/etc/defaults/daily.conf:1.16.2.1 src/etc/defaults/daily.conf:1.16.2.2
--- src/etc/defaults/daily.conf:1.16.2.1 Wed Aug 8 14:26:49 2012
+++ src/etc/defaults/daily.conf Wed Aug 8 14:31:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: daily.conf,v 1.16.2.1 2012/08/08 14:26:49 martin Exp $
+# $NetBSD: daily.conf,v 1.16.2.2 2012/08/08 14:31:33 martin Exp $
#
# /etc/defaults/daily.conf --
# default configuration of /etc/daily.conf
@@ -31,6 +31,6 @@ run_rdist=YES
run_security=YES
separate_security_email=YES
run_skeyaudit=YES
-fetch_pkg_vulnerabilities=NO
+fetch_pkg_vulnerabilities= # set to NO to disable and not be warned about
send_empty_security=NO
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: martin Date: Wed Aug 8 14:36:55 UTC 2012 Modified Files: src/etc [netbsd-6]: daily weekly Log Message: Pull up following revision(s) (requested by jdf in ticket #458): etc/weekly: revision 1.28 etc/daily: revision 1.84 Call `makemandb -f -q` instead of `makemandb -f`, as Edgar Fuss proposed for daily. Call `makemandb -q` instead of `makemandb`, as proposed by Edgar Fuss on tech-userlevel on 20th of July 2012, 12:38. To generate a diff of this commit: cvs rdiff -u -r1.80.2.3 -r1.80.2.4 src/etc/daily cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/etc/weekly Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/daily diff -u src/etc/daily:1.80.2.3 src/etc/daily:1.80.2.4 --- src/etc/daily:1.80.2.3 Wed Aug 8 14:31:33 2012 +++ src/etc/daily Wed Aug 8 14:36:55 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: daily,v 1.80.2.3 2012/08/08 14:31:33 martin Exp $ +# $NetBSD: daily,v 1.80.2.4 2012/08/08 14:36:55 martin Exp $ # @(#)daily 8.2 (Berkeley) 1/25/94 # @@ -304,7 +304,7 @@ if checkyesno run_makemandb; then if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then echo echo Updating man page index: - (umask 022; nice -n 5 /usr/sbin/makemandb) + (umask 022; nice -n 5 /usr/sbin/makemandb -q) fi fi Index: src/etc/weekly diff -u src/etc/weekly:1.25.2.1 src/etc/weekly:1.25.2.2 --- src/etc/weekly:1.25.2.1 Thu Feb 16 19:56:43 2012 +++ src/etc/weekly Wed Aug 8 14:36:55 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: weekly,v 1.25.2.1 2012/02/16 19:56:43 riz Exp $ +# $NetBSD: weekly,v 1.25.2.2 2012/08/08 14:36:55 martin Exp $ # from: @(#)weekly 8.2 (Berkeley) 1/2/94 # @@ -94,7 +94,7 @@ if checkyesno rebuild_mandb; then echo if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then echo Rebuilding man page index: - (umask 022; nice -n 5 /usr/sbin/makemandb -f) + (umask 022; nice -n 5 /usr/sbin/makemandb -f -q) else echo Not rebuilding man page index fi
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed Aug 8 14:39:20 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 456, 457, 458 To generate a diff of this commit: cvs rdiff -u -r1.1.2.168 -r1.1.2.169 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.168 src/doc/CHANGES-6.0:1.1.2.169 --- src/doc/CHANGES-6.0:1.1.2.168 Wed Aug 8 09:02:14 2012 +++ src/doc/CHANGES-6.0 Wed Aug 8 14:39:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.168 2012/08/08 09:02:14 jdc Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.169 2012/08/08 14:39:20 martin Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6707,3 +6707,30 @@ libexec/ld.elf_so/arch/sparc64/mdreloc.c Add special handling needed for OLO10 relocations. PR#46724 [martin, ticket #447] +etc/daily 1.82 +etc/defaults/daily.conf1.17 +share/man/man5/daily.51.5 + + PR/46756: Edgar Fuß: Enable ignoring subdirectories in daily's + find_core + [christos, ticket #456] + +etc/daily 1.83 +etc/defaults/daily.conf1.18 + + PR/46757: Edgar Fuß: Change default to pkg_vulnerabilities from NO to + unset, and make unset insted of NO to produce warnings, so that + setting it to NO does produce warnings (if it is inappropriate for + the machine to warn about this). + [christos, ticket #457] + +etc/daily 1.84 +etc/weekly 1.28 + + Call `makemandb -f -q` instead of `makemandb -f`, as Edgar Fuss + proposed for daily. + Call `makemandb -q` instead of `makemandb`, as proposed by Edgar + Fuss on tech-userlevel on 20th of July 2012, 12:38. + [jdf, ticket #458] + +
CVS commit: [netbsd-6] src/etc
Module Name:src
Committed By: martin
Date: Wed Aug 8 14:49:24 UTC 2012
Modified Files:
src/etc [netbsd-6]: daily
Log Message:
Include rev 1.86 in the pullup of ticket 457 as well: only print fetching
message, if we actually try to fetch the package vulnerabilities file.
To generate a diff of this commit:
cvs rdiff -u -r1.80.2.4 -r1.80.2.5 src/etc/daily
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.80.2.4 src/etc/daily:1.80.2.5
--- src/etc/daily:1.80.2.4 Wed Aug 8 14:36:55 2012
+++ src/etc/daily Wed Aug 8 14:49:24 2012
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.80.2.4 2012/08/08 14:36:55 martin Exp $
+# $NetBSD: daily,v 1.80.2.5 2012/08/08 14:49:24 martin Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -246,8 +246,8 @@ if checkyesno run_fsck; then
fsck -n -f ${run_fsck_flags} | grep -v '^\*\* Phase'
fi
-echo
if checkyesno run_rdist [ -f /etc/Distfile ]; then
+ echo
echo Running rdist:
if [ -d /var/log/rdist ]; then
logf=$(date +%Y.%b.%d)
@@ -258,15 +258,15 @@ if checkyesno run_rdist [ -f /etc/Dis
fi
if pkg_info ${_compat_K_flag} -q -E '*'; then
- echo
- echo Fetching package vulnerabilities database:
- if checkyesno fetch_pkg_vulnerabilities; then
- ( umask 022 pkg_admin ${_compat_K_flag} \
- fetch-pkg-vulnerabilities -u )
- elif [ -z $fetch_pkg_vulnerabilities ]; then
+ if [ -z fetch_pkg_vulnerabilities ]; then
echo fetch_pkg_vulnerabilities is not set in daily.conf(5).
echo You should set it to YES to enable vulnerability checks
echo or set it to NO to get rid of this warning.
+ elif checkyesno fetch_pkg_vulnerabilities; then
+ echo
+ echo Fetching package vulnerabilities database:
+ ( umask 022 pkg_admin ${_compat_K_flag} \
+ fetch-pkg-vulnerabilities -u )
fi
fi
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed Aug 8 14:50:55 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Fix entry for ticket #457 for additional revisions To generate a diff of this commit: cvs rdiff -u -r1.1.2.169 -r1.1.2.170 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.169 src/doc/CHANGES-6.0:1.1.2.170 --- src/doc/CHANGES-6.0:1.1.2.169 Wed Aug 8 14:39:20 2012 +++ src/doc/CHANGES-6.0 Wed Aug 8 14:50:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.169 2012/08/08 14:39:20 martin Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.170 2012/08/08 14:50:55 martin Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6715,7 +6715,7 @@ share/man/man5/daily.51.5 find_core [christos, ticket #456] -etc/daily 1.83 +etc/daily 1.83,1.85,1.86 etc/defaults/daily.conf1.18 PR/46757: Edgar Fuß: Change default to pkg_vulnerabilities from NO to
CVS commit: [netbsd-6] src/sys/arch/usermode/usermode
Module Name:src
Committed By: martin
Date: Wed Aug 8 15:32:25 UTC 2012
Modified Files:
src/sys/arch/usermode/usermode [netbsd-6]: trap.c
Log Message:
Pull up following revision(s) (requested by reinoud in ticket #463):
sys/arch/usermode/usermode/trap.c: revision 1.66
Fix IO lockups in NetBSD/usermode.
1) Don't block IO signals since the return path is not garanteed to enable the
signal again.
2) Since signals can get dropped, do a 2nd pass over the routines.
To generate a diff of this commit:
cvs rdiff -u -r1.63.2.2 -r1.63.2.3 src/sys/arch/usermode/usermode/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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.63.2.2 src/sys/arch/usermode/usermode/trap.c:1.63.2.3
--- src/sys/arch/usermode/usermode/trap.c:1.63.2.2 Thu Mar 8 17:21:20 2012
+++ src/sys/arch/usermode/usermode/trap.c Wed Aug 8 15:32:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.63.2.2 2012/03/08 17:21:20 riz Exp $ */
+/* $NetBSD: trap.c,v 1.63.2.3 2012/08/08 15:32:25 martin Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.63.2.2 2012/03/08 17:21:20 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.63.2.3 2012/08/08 15:32:25 martin Exp $);
#include sys/types.h
#include sys/param.h
@@ -364,10 +364,6 @@ handle_signal(int sig, siginfo_t *info,
thunk_sigemptyset(jump_ucp.uc_sigmask);
jump_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK;
- /* prevent recursive IO signals */
- if (sig == SIGIO)
- thunk_sigaddset(jump_ucp.uc_sigmask, SIGIO);
-
thunk_makecontext(jump_ucp,
(void (*)(void)) f,
4, info, (void *) from_userland, (void *) pc, (void *) va);
@@ -612,13 +608,15 @@ sigio(siginfo_t *info, vaddr_t from_user
struct lwp *l = curlwp;
struct pcb *pcb = lwp_getpcb(l); KASSERT(pcb);
struct intr_handler *sih;
- unsigned int n;
+ unsigned int n, pass;
// thunk_printf(%s: l %p, pcb %p\n, __func__, l, pcb);
- for (n = 0; n SIGIO_MAX_HANDLERS; n++) {
- sih = sigio_intr_handler[n];
- if (sih-func)
- sih-func(sih-arg);
+ for (pass = 0; pass 2; pass++) {
+ for (n = 0; n SIGIO_MAX_HANDLERS; n++) {
+ sih = sigio_intr_handler[n];
+ if (sih-func)
+sih-func(sih-arg);
+ }
}
KASSERT(l == curlwp);
CVS commit: [netbsd-6] src/sys/net
Module Name:src Committed By: martin Date: Wed Aug 8 15:35:15 UTC 2012 Modified Files: src/sys/net [netbsd-6]: if_types.h Log Message: Pull up following revision(s) (requested by wiz in ticket #464): sys/net/if_types.h: revision 1.26 Avoid ambiguity by having only one comment close mark. PR 46771 by bsiegert. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.104.1 src/sys/net/if_types.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/net/if_types.h diff -u src/sys/net/if_types.h:1.25 src/sys/net/if_types.h:1.25.104.1 --- src/sys/net/if_types.h:1.25 Thu May 18 09:05:51 2006 +++ src/sys/net/if_types.h Wed Aug 8 15:35:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_types.h,v 1.25 2006/05/18 09:05:51 liamjfoy Exp $ */ +/* $NetBSD: if_types.h,v 1.25.104.1 2012/08/08 15:35:14 martin Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -249,7 +249,7 @@ #define IFT_DOCSCABLEUPSTREAMCHANNEL 0xcd /* CATV Upstream Channel */ #define IFT_ECONET 0xce /* Acorn Econet */ #define IFT_PON155 0xcf /* FSAN 155Mb Symetrical PON interface */ -#define IFT_PON622 0xd0 /* FSAN 622Mb Symetrical PON interface */*/ +#define IFT_PON622 0xd0 /* FSAN 622Mb Symetrical PON interface */ #define IFT_BRIDGE 0xd1 /* Transparent bridge interface */ #define IFT_LINEGROUP 0xd2 /* Interface common to multiple lines */ #define IFT_VOICEEMFGD 0xd3 /* voice EM Feature Group D */
CVS commit: [netbsd-6] src/usr.sbin/rtadvd
Module Name:src
Committed By: martin
Date: Wed Aug 8 15:37:49 UTC 2012
Modified Files:
src/usr.sbin/rtadvd [netbsd-6]: config.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #465):
usr.sbin/rtadvd/config.c: revision 1.28
Fix a bug that incorrect RA packet is sent if rtadvd.conf exists.
Fixes PR#46580 reported by Takahiro HAYASHI.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.2.1 src/usr.sbin/rtadvd/config.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rtadvd/config.c
diff -u src/usr.sbin/rtadvd/config.c:1.27 src/usr.sbin/rtadvd/config.c:1.27.2.1
--- src/usr.sbin/rtadvd/config.c:1.27 Sun Dec 11 20:44:44 2011
+++ src/usr.sbin/rtadvd/config.c Wed Aug 8 15:37:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.27 2011/12/11 20:44:44 christos Exp $ */
+/* $NetBSD: config.c,v 1.27.2.1 2012/08/08 15:37:49 martin Exp $ */
/* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -290,7 +290,7 @@ getconfig(const char *intface)
MAYHAVE(val, clockskew, 0);
tmp-clockskew = val;
- tmp-pfxs++;
+ tmp-pfxs = 0;
TAILQ_INIT(tmp-prefix);
for (i = -1; i MAXPREFIX; i++) {
struct prefix *pfx;
@@ -763,6 +763,7 @@ get_prefix(struct rainfo *rai)
/* link into chain */
TAILQ_INSERT_TAIL(rai-prefix, pp, next);
+ rai-pfxs++;
}
freeifaddrs(ifap);
CVS commit: [netbsd-6] src/sys/arch/hp300/stand/common
Module Name:src
Committed By: martin
Date: Wed Aug 8 15:55:43 UTC 2012
Modified Files:
src/sys/arch/hp300/stand/common [netbsd-6]: if_lereg.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #468):
sys/arch/hp300/stand/common/if_lereg.h: revision 1.6
Remove '__attribute__((__packed__))' from structure definisions
for Am7990 LANCE registers where no implicit padding is expected.
gcc 4.5.3 seems to generate strange and wrong instructions
(four moveb insns against u_short members) if packed attribute
is specified in this case, then netboot fails immediately.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.118.1 src/sys/arch/hp300/stand/common/if_lereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/if_lereg.h
diff -u src/sys/arch/hp300/stand/common/if_lereg.h:1.5 src/sys/arch/hp300/stand/common/if_lereg.h:1.5.118.1
--- src/sys/arch/hp300/stand/common/if_lereg.h:1.5 Sun Dec 11 12:17:19 2005
+++ src/sys/arch/hp300/stand/common/if_lereg.h Wed Aug 8 15:55:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lereg.h,v 1.5 2005/12/11 12:17:19 christos Exp $ */
+/* $NetBSD: if_lereg.h,v 1.5.118.1 2012/08/08 15:55:43 martin Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -50,7 +50,7 @@ struct lereg0 {
vu_char ler0_id; /* ID */
u_char ler0_pad1;
vu_char ler0_status; /* interrupt enable/status */
-} __attribute__((__packed__));
+};
/*
* Control and status bits -- lereg0
@@ -65,7 +65,7 @@ struct lereg0 {
struct lereg1 {
vu_short ler1_rdp; /* data port */
vu_short ler1_rap; /* register select port */
-} __attribute__((__packed__));
+};
/*
* Control and status bits -- lereg1
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed Aug 8 15:58:17 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 463, 464, 465, 466, 468 To generate a diff of this commit: cvs rdiff -u -r1.1.2.170 -r1.1.2.171 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.170 src/doc/CHANGES-6.0:1.1.2.171 --- src/doc/CHANGES-6.0:1.1.2.170 Wed Aug 8 14:50:55 2012 +++ src/doc/CHANGES-6.0 Wed Aug 8 15:58:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.170 2012/08/08 14:50:55 martin Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.171 2012/08/08 15:58:17 martin Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6733,4 +6733,123 @@ etc/weekly 1.28 Fuss on tech-userlevel on 20th of July 2012, 12:38. [jdf, ticket #458] +sys/arch/usermode/usermode/trap.c 1.66 + + Fix IO lockups in NetBSD/usermode. + + 1) Don't block IO signals since the return path is not garanteed to + enable the signal again. + 2) Since signals can get dropped, do a 2nd pass over the routines. + [reinoud, ticket #463] + +sys/net/if_types.h1.26 + + Avoid ambiguity by having only one comment close mark. + PR 46771 by bsiegert. + [wiz, ticket #464] + +usr.sbin/rtadvd/config.c 1.28 + + Fix a bug that incorrect RA packet is sent if rtadvd.conf exists. + Fixes PR#46580 reported by Takahiro HAYASHI. + [msaitoh, ticket #465] + +distrib/sets/lists/comp/mi 1.1771 +share/man/man9/Makefile1.367 +share/man/man9/cpu_rootconf.9 1.7 +sys/arch/acorn26/acorn26/autoconf.c 1.9 +sys/arch/acorn32/acorn32/autoconf.c 1.18 +sys/arch/algor/algor/autoconf.c 1.21 +sys/arch/alpha/alpha/autoconf.c 1.52 +sys/arch/amiga/amiga/autoconf.c 1.113 +sys/arch/amigappc/amigappc/autoconf.c 1.5 +sys/arch/arc/arc/autoconf.c 1.34 +sys/arch/atari/atari/autoconf.c 1.63 +sys/arch/bebox/bebox/autoconf.c 1.25 +sys/arch/cats/cats/autoconf.c 1.17 +sys/arch/cesfic/cesfic/autoconf.c 1.26 +sys/arch/cobalt/cobalt/autoconf.c 1.30 +sys/arch/dreamcast/dreamcast/autoconf.c 1.10 +sys/arch/emips/emips/autoconf.c 1.6 +sys/arch/evbarm/evbarm/autoconf.c 1.13 +sys/arch/evbmips/adm5120/autoconf.c 1.5 +sys/arch/evbmips/alchemy/autoconf.c 1.18 +sys/arch/evbmips/atheros/autoconf.c 1.11 +sys/arch/evbmips/gdium/autoconf.c 1.5 +sys/arch/evbmips/loongson/autoconf.c 1.3 +sys/arch/evbmips/malta/autoconf.c 1.16 +sys/arch/evbmips/rasoc/autoconf.c 1.3 +sys/arch/evbmips/rmixl/autoconf.c 1.6 +sys/arch/evbppc/ev64260/autoconf.c 1.17 +sys/arch/evbppc/explora/autoconf.c 1.13 +sys/arch/evbppc/mpc85xx/autoconf.c 1.6 +sys/arch/evbppc/obs405/obs405_autoconf.c 1.6 +sys/arch/evbppc/pmppc/autoconf.c 1.7 +sys/arch/evbppc/virtex/autoconf.c 1.5 +sys/arch/evbppc/walnut/autoconf.c 1.21 +sys/arch/evbsh3/evbsh3/autoconf.c 1.11 +sys/arch/ews4800mips/ews4800mips/autoconf.c 1.9 +sys/arch/hp300/hp300/autoconf.c 1.100 +sys/arch/hp700/hp700/autoconf.c 1.48 +sys/arch/hpcarm/hpcarm/autoconf.c 1.20 +sys/arch/hpcmips/hpcmips/autoconf.c 1.25 +sys/arch/hpcsh/hpcsh/autoconf.c 1.26 +sys/arch/ia64/ia64/autoconf.c 1.6 +sys/arch/ibmnws/ibmnws/autoconf.c 1.12 +sys/arch/iyonix/iyonix/autoconf.c 1.14 +sys/arch/landisk/landisk/autoconf.c 1.6 +sys/arch/luna68k/luna68k/autoconf.c 1.13 +sys/arch/mac68k/mac68k/autoconf.c 1.73 +sys/arch/mipsco/mipsco/autoconf.c 1.25 +sys/arch/mmeye/mmeye/autoconf.c 1.9 +sys/arch/mvme68k/mvme68k/autoconf.c 1.46 +sys/arch/mvmeppc/mvmeppc/autoconf.c 1.13 +sys/arch/netwinder/netwinder/autoconf.c 1.11 +sys/arch/news68k/news68k/autoconf.c 1.21 +sys/arch/newsmips/newsmips/autoconf.c 1.36 +sys/arch/next68k/next68k/autoconf.c 1.26 +sys/arch/pmax/pmax/autoconf.c 1.79 +sys/arch/powerpc/oea/ofw_autoconf.c 1.17 +sys/arch/prep/prep/autoconf.c 1.25 +sys/arch/rs6000/rs6000/autoconf.c 1.4 +sys/arch/sandpoint/sandpoint/autoconf.c 1.27 +sys/arch/sbmips/sbmips/autoconf.c 1.8 +sys/arch/sgimips/sgimips/autoconf.c 1.43 +sys/arch/shark/shark/autoconf.c 1.18 +sys/arch/sparc/sparc/autoconf.c 1.244 +sys/arch/sparc64/sparc64/autoconf.c 1.188 +sys/arch/sun3/sun3/autoconf.c 1.76 +sys/arch/sun3/sun3/autoconf.c 1.77 +sys/arch/sun68k/sun68k/autoconf.c 1.29 +sys/arch/usermode/dev/cpu.c 1.72 +sys/arch/vax/vax/autoconf.c 1.94 +sys/arch/x68k/x68k/autoconf.c 1.67 +sys/arch/x86/x86/x86_autoconf.c 1.65 +sys/arch/xen/x86/autoconf.c 1.15 +sys/arch/zaurus/zaurus/autoconf.c 1.12 +sys/kern/init_main.c1.445 +sys/sys/conf.h 1.143 + + Do not call setroot() from MD code and from MI code, which has + unwanted sideeffects in the RB_ASKNAME case. This fixes PR/46732. + + No longer wrap MD cpu_rootconf(), as hp300 port stores reboot + information as a side effect. Instead call MI rootconf() from MD + code which makes rootconf() now a wrapper to setroot(). + + Adjust several MD routines to set the
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: skrll
Date: Wed Aug 8 16:09:42 UTC 2012
Modified Files:
src/sys/arch/arm/include: pcb.h
Log Message:
Update comment.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/include/pcb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/pcb.h
diff -u src/sys/arch/arm/include/pcb.h:1.20 src/sys/arch/arm/include/pcb.h:1.21
--- src/sys/arch/arm/include/pcb.h:1.20 Thu Apr 7 11:01:49 2011
+++ src/sys/arch/arm/include/pcb.h Wed Aug 8 16:09:42 2012
@@ -47,7 +47,7 @@ struct trapframe;
struct pcb_arm32 {
/*
* WARNING!
- * cpuswitch.S relies on pcb32_r8 being quad-aligned in struct pcb
+ * cpuswitchto.S relies on pcb32_r8 being quad-aligned in struct pcb
* (due to the use of strd when compiled for XSCALE)
*/
u_int pcb32_r8 __aligned(8); /* used */
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Wed Aug 8 16:23:32 UTC 2012 Modified Files: src/distrib/sets/lists/tests: mi Log Message: fix pasto To generate a diff of this commit: cvs rdiff -u -r1.482 -r1.483 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.482 src/distrib/sets/lists/tests/mi:1.483 --- src/distrib/sets/lists/tests/mi:1.482 Wed Aug 8 10:15:03 2012 +++ src/distrib/sets/lists/tests/mi Wed Aug 8 12:23:31 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.482 2012/08/08 14:15:03 christos Exp $ +# $NetBSD: mi,v 1.483 2012/08/08 16:23:31 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1628,7 +1628,7 @@ ./usr/tests/include/sys/t_bitops tests-include-tests atf ./usr/tests/include/sys/t_bootblock tests-include-tests atf ./usr/tests/include/sys/t_cdefs tests-include-tests atf -./usr/tests/include/sys/t_socket tests-include-tests atf,debug,rump +./usr/tests/include/sys/t_socket tests-include-tests atf,rump ./usr/tests/include/sys/t_tree tests-include-tests atf ./usr/tests/include/sys/t_types tests-include-tests atf ./usr/tests/include/t_bitstring tests-include-tests atf
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: drochner Date: Wed Aug 8 16:29:50 UTC 2012 Modified Files: src/sys/arch/cesfic/cesfic: machdep.c Log Message: build fix for gcc -fno-common, from Radoslaw Kujawa To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/cesfic/cesfic/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/machdep.c diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.63 src/sys/arch/cesfic/cesfic/machdep.c:1.64 --- src/sys/arch/cesfic/cesfic/machdep.c:1.63 Fri Jul 27 05:36:10 2012 +++ src/sys/arch/cesfic/cesfic/machdep.c Wed Aug 8 16:29:50 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.63 2012/07/27 05:36:10 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.64 2012/08/08 16:29:50 drochner Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.63 2012/07/27 05:36:10 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.64 2012/08/08 16:29:50 drochner Exp $); #include opt_bufcache.h #include opt_ddb.h @@ -119,7 +119,7 @@ struct vm_map *phys_map = NULL; * Declare these as initialized data so we can patch them. */ /*int maxmem;*/ /* max memory per process */ -int physmem = MAXMEM; /* max supported memory, changes to actual */ +extern int physmem; /* max supported memory, changes to actual */ extern u_int lowram;
CVS commit: src/sys/sys
Module Name:src
Committed By: matt
Date: Wed Aug 8 16:56:53 UTC 2012
Modified Files:
src/sys/sys: ieee754.h
Log Message:
Add sngu_* and dblu_* access macros.
XXX sng* and ext* should be renamed to flt* and ldbl*
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/ieee754.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/sys/ieee754.h
diff -u src/sys/sys/ieee754.h:1.7 src/sys/sys/ieee754.h:1.8
--- src/sys/sys/ieee754.h:1.7 Fri Feb 2 23:08:22 2007
+++ src/sys/sys/ieee754.h Wed Aug 8 16:56:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee754.h,v 1.7 2007/02/02 23:08:22 christos Exp $ */
+/* $NetBSD: ieee754.h,v 1.8 2012/08/08 16:56:53 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -145,8 +145,17 @@ union ieee_single_u {
struct ieee_single sngu_sng;
};
+#define sngu_sign sngu_sng.sng_sign
+#define sngu_exp sngu_sng.sng_exp
+#define sngu_frac sngu_sng.sng_frac
+
union ieee_double_u {
double dblu_d;
struct ieee_double dblu_dbl;
};
+
+#define dblu_sign dblu_dbl.dbl_sign
+#define dblu_exp dblu_dbl.dbl_exp
+#define dblu_frach dblu_dbl.dbl_frach
+#define dblu_fracl dblu_dbl.dbl_fracl
#endif /* _SYS_IEEE754_H_ */
CVS commit: src/lib/libm/src
Module Name:src
Committed By: matt
Date: Wed Aug 8 16:57:24 UTC 2012
Added Files:
src/lib/libm/src: s_truncl.c
Log Message:
Add a long double version of trunc.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/lib/libm/src/s_truncl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/libm/src/s_truncl.c
diff -u /dev/null src/lib/libm/src/s_truncl.c:1.1
--- /dev/null Wed Aug 8 16:57:24 2012
+++ src/lib/libm/src/s_truncl.c Wed Aug 8 16:57:24 2012
@@ -0,0 +1,133 @@
+/* @(#)s_floor.c 5.1 93/09/24 */
+/*
+ *
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ *
+ */
+
+#include sys/cdefs.h
+#if 0
+__FBSDID($FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp $);
+#endif
+#if defined(LIBM_SCCS) !defined(lint)
+__RCSID($NetBSD: s_truncl.c,v 1.1 2012/08/08 16:57:24 matt Exp $);
+#endif
+
+/*
+ * trunc(x)
+ * Return x rounded toward 0 to integral value
+ * Method:
+ * Bit twiddling.
+ * Exception:
+ * Inexact flag raised if x was not equal to trunc(x).
+ */
+
+#include machine/ieee.h
+#include float.h
+#include math.h
+#include math_private.h
+
+#ifdef __HAVE_LONG_DOUBLE
+
+static const long double huge = LDBL_MAX;
+
+long double
+truncl(long double x)
+{
+ struct ieee_ext_u ux = { .extu_ld = x, };
+ int32_t exponent = ux.extu_exp - EXT_EXP_BIAS;
+#ifdef LDBL_MANT_DIG == EXT_FRACBITS
+ /*
+ * If there is no hidden bit, don't count it
+ */
+ const u_int frach_bits = EXT_FRACHBITS - 1;
+ const u_int frac_bits = EXT_FRACBITS - 1;
+#else
+ const u_int frach_bits = EXT_FRACHBITS;
+ const u_int frac_bits = EXT_FRACBITS;
+#endif
+
+ /*
+ * If this number is big enough to have no fractional digits...
+ * (or is an inf or nan).
+ */
+ if (exponent = frac_bits) {
+ if (exponent == EXT_EXP_NAN - EXT_EXP_BIAS)
+ return x+x; /* x is inf or nan */
+ return x; /* x is integral */
+ }
+
+ /*
+ * If this number is too small enough to have any integral digits...
+ */
+ if (exponent 0 (huge - x 0.0 || true)) {
+ /* set inexact if x != 0 */
+ /* |x|1, so return 0*sign(x) */
+ return ux.extu_sign ? -0.0 : 0.0;
+ }
+
+ uint32_t frach_mask = __BIT(frach_bits) - 1;
+#ifdef EXT_FRACHMBITS
+ uint32_t frachm_mask = __BIT(EXT_FRACHMBITS) - 1;
+#endif
+#ifdef EXT_FRACHMBITS
+ uint32_t frachl_mask = __BIT(EXT_FRACLMBITS) - 1;
+#endif
+ uint32_t fracl_mask = __BIT(EXT_FRACLBITS) - 1;
+
+ if (exponent frach_bits) {
+ frach_mask = exponent;
+#ifdef EXT_FRACHMBITS
+ } else if (exponent frach_bits + EXT_FRACHM_BITS) {
+ frach_mask = 0; exponent -= frach_bits;
+ frachm_mask = exponent;
+#endif
+#ifdef EXT_FRACLMBITS
+ } else if (exponent frach_bits + EXT_FRACHM_BITS + EXT_FRACLMBITS) {
+ frach_mask = 0; exponent -= frach_bits;
+ frachm_mask = 0; exponent -= EXT_FRACHMBITS;
+ fraclm_mask = exponent;
+#endif
+ } else {
+ frach_mask = 0; exponent -= frach_bits;
+#ifdef EXT_FRACHMBITS
+ frachm_mask = 0; exponent -= EXT_FRACHMBITS;
+#endif
+#ifdef EXT_FRACLMBITS
+ fraclm_mask = 0; exponent -= EXT_FRACLMBITS;
+#endif
+ fraclm_mask = exponent;
+ }
+
+ if ((ux.extu_frach frach_mask) == 0
+#ifdef EXT_FRACHMBITS
+ (ux.extu_frachm frachm_mask) == 0
+#endif
+#ifdef EXT_FRACLMBITS
+ (ux.extu_fraclm frachm_mask) == 0
+#endif
+ (ux.extu_fracl fracl_mask) == 0)
+ return x; /* x is integral */
+
+ if (huge - x 0.0 || true) { /* set inexact flag */
+ /*
+ * Clear any fractional bits...
+ */
+ ux.extu_frach = ~frach_mask;
+#ifdef EXT_FRACHMBITS
+ ux.extu_frachm = ~frachm_mask;
+#endif
+#ifdef EXT_FRACLMBITS
+ ux.extu_fraclm = ~fraclm_mask;
+#endif
+ ux.extu_fracl = ~fracl_mask;
+ return ux.extu_ld;
+ }
+}
+
+#endif /* __HAVE_LONG_DOUBLE */
CVS commit: src/lib/libm/src
Module Name:src Committed By: matt Date: Wed Aug 8 16:58:28 UTC 2012 Modified Files: src/lib/libm/src: s_truncl.c Log Message: Fix copyright. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_truncl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/src/s_truncl.c diff -u src/lib/libm/src/s_truncl.c:1.1 src/lib/libm/src/s_truncl.c:1.2 --- src/lib/libm/src/s_truncl.c:1.1 Wed Aug 8 16:57:24 2012 +++ src/lib/libm/src/s_truncl.c Wed Aug 8 16:58:28 2012 @@ -1,21 +1,35 @@ -/* @(#)s_floor.c 5.1 93/09/24 */ -/* - * - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. +/*- + * Copyright (c) 2012 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -#if 0 -__FBSDID($FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp $); -#endif #if defined(LIBM_SCCS) !defined(lint) -__RCSID($NetBSD: s_truncl.c,v 1.1 2012/08/08 16:57:24 matt Exp $); +__RCSID($NetBSD: s_truncl.c,v 1.2 2012/08/08 16:58:28 matt Exp $); #endif /*
CVS commit: src
Module Name:src Committed By: drochner Date: Wed Aug 8 18:37:52 UTC 2012 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 src/sys/arch/amd64/include: Makefile src/sys/arch/i386/include: Makefile Log Message: on x86, machine/cpufunc.h only pulls in x86/cpufunc.h. The latter is not installed to userland and noone missed it, so the former ones can not be useful either. Don't install them. To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.125 -r1.126 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/Makefile cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.173 src/distrib/sets/lists/comp/md.amd64:1.174 --- src/distrib/sets/lists/comp/md.amd64:1.173 Wed Aug 8 14:08:02 2012 +++ src/distrib/sets/lists/comp/md.amd64 Wed Aug 8 18:37:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.173 2012/08/08 14:08:02 christos Exp $ +# $NetBSD: md.amd64,v 1.174 2012/08/08 18:37:51 drochner Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -11,7 +11,7 @@ ./usr/include/amd64/byte_swap.h comp-c-include ./usr/include/amd64/cdefs.h comp-c-include ./usr/include/amd64/cpu.h comp-c-include -./usr/include/amd64/cpufunc.h comp-c-include +./usr/include/amd64/cpufunc.h comp-c-obsolete obsolete ./usr/include/amd64/disklabel.h comp-c-include ./usr/include/amd64/elf_machdep.h comp-c-include ./usr/include/amd64/endian.h comp-c-include @@ -155,7 +155,7 @@ ./usr/include/i386/byte_swap.h comp-c-include ./usr/include/i386/cdefs.h comp-c-include ./usr/include/i386/cpu.h comp-c-include -./usr/include/i386/cpufunc.h comp-c-include +./usr/include/i386/cpufunc.h comp-c-obsolete obsolete ./usr/include/i386/cputypes.h comp-c-include ./usr/include/i386/disklabel.h comp-c-include ./usr/include/i386/elf_machdep.h comp-c-include Index: src/distrib/sets/lists/comp/md.i386 diff -u src/distrib/sets/lists/comp/md.i386:1.125 src/distrib/sets/lists/comp/md.i386:1.126 --- src/distrib/sets/lists/comp/md.i386:1.125 Sat Jun 16 17:01:03 2012 +++ src/distrib/sets/lists/comp/md.i386 Wed Aug 8 18:37:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.125 2012/06/16 17:01:03 joerg Exp $ +# $NetBSD: md.i386,v 1.126 2012/08/08 18:37:51 drochner Exp $ ./usr/include/clang-3.0/avxintrin.h comp-obsolete obsolete ./usr/include/clang-3.0/avx2intrin.h comp-obsolete obsolete ./usr/include/clang-3.0/bmi2intrin.h comp-obsolete obsolete @@ -91,7 +91,7 @@ ./usr/include/i386/cdefs.h comp-c-include ./usr/include/i386/conf.h comp-obsolete obsolete ./usr/include/i386/cpu.h comp-c-include -./usr/include/i386/cpufunc.h comp-c-include +./usr/include/i386/cpufunc.h comp-c-obsolete obsolete ./usr/include/i386/cputypes.h comp-c-include ./usr/include/i386/db_machdep.h comp-obsolete obsolete ./usr/include/i386/disklabel.h comp-c-include Index: src/sys/arch/amd64/include/Makefile diff -u src/sys/arch/amd64/include/Makefile:1.13 src/sys/arch/amd64/include/Makefile:1.14 --- src/sys/arch/amd64/include/Makefile:1.13 Sun Jul 17 20:54:36 2011 +++ src/sys/arch/amd64/include/Makefile Wed Aug 8 18:37:52 2012 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2011/07/17 20:54:36 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2012/08/08 18:37:52 drochner Exp $ INCSDIR= /usr/include/amd64 INCS= ansi.h aout_machdep.h asm.h \ bootinfo.h bswap.h byte_swap.h \ - cdefs.h cpu.h cpufunc.h \ + cdefs.h cpu.h \ disklabel.h \ elf_machdep.h endian.h endian_machdep.h \ float.h fpu.h frame.h frame_regs.h \ Index: src/sys/arch/i386/include/Makefile diff -u src/sys/arch/i386/include/Makefile:1.39 src/sys/arch/i386/include/Makefile:1.40 --- src/sys/arch/i386/include/Makefile:1.39 Sun Jul 17 20:54:41 2011 +++ src/sys/arch/i386/include/Makefile Wed Aug 8 18:37:52 2012 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.39 2011/07/17 20:54:41 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2012/08/08 18:37:52 drochner Exp $ INCSDIR= /usr/include/i386 INCS= ansi.h aout_machdep.h apmvar.h asm.h \ bioscall.h bootinfo.h bswap.h byte_swap.h \ - cdefs.h cpu.h cpufunc.h cputypes.h \ + cdefs.h cpu.h cputypes.h \ disklabel.h \ elf_machdep.h endian.h endian_machdep.h \ fenv.h float.h frame.h freebsd_machdep.h \
CVS commit: src/share/locale/ctype
Module Name:src Committed By: tnozaki Date: Wed Aug 8 18:40:37 UTC 2012 Modified Files: src/share/locale/ctype: en_US.UTF-8.src Log Message: fix PR lib/46772 wcwidth of combining characters. patch probyted by yamt@, thanks. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/locale/ctype/en_US.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/locale/ctype/en_US.UTF-8.src diff -u src/share/locale/ctype/en_US.UTF-8.src:1.4 src/share/locale/ctype/en_US.UTF-8.src:1.5 --- src/share/locale/ctype/en_US.UTF-8.src:1.4 Thu Feb 10 18:12:42 2005 +++ src/share/locale/ctype/en_US.UTF-8.src Wed Aug 8 18:40:37 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: en_US.UTF-8.src,v 1.4 2005/02/10 18:12:42 tnozaki Exp $ */ +/* $NetBSD: en_US.UTF-8.src,v 1.5 2012/08/08 18:40:37 tnozaki Exp $ */ /* $FreeBSD: /repoman/r/ncvs/src/share/mklocale/UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $ */ /* @@ -493,7 +493,7 @@ SWIDTH1 0x02b0 - 0x02ee GRAPH 0x0300 - 0x034f 0x0360 - 0x036f PRINT 0x0300 - 0x034f 0x0360 - 0x036f -SWIDTH1 0x0300 - 0x034f 0x0360 - 0x036f +SWIDTH0 0x0300 - 0x034f 0x0360 - 0x036f MAPUPPER 0x0345 0x0399
CVS commit: src/lib/libc/locale
Module Name:src
Committed By: tnozaki
Date: Wed Aug 8 18:37:26 UTC 2012
Modified Files:
src/lib/libc/locale: rune.c
Log Message:
fix PR lib/46781 statically compiled bash makes locale loading fail.
analyzed and patch provided by enami@ nonaka@ obache@ soda@, thanks.
patch modified by me.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/locale/rune.c
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/locale/rune.c
diff -u src/lib/libc/locale/rune.c:1.43 src/lib/libc/locale/rune.c:1.44
--- src/lib/libc/locale/rune.c:1.43 Fri Jan 20 16:31:30 2012
+++ src/lib/libc/locale/rune.c Wed Aug 8 18:37:26 2012
@@ -1,5 +1,3 @@
-/* $NetBSD: rune.c,v 1.43 2012/01/20 16:31:30 joerg Exp $ */
-
/*-
* Copyright (c)2010 Citrus Project,
* All rights reserved.
@@ -162,7 +160,7 @@ _rune_read_file(const char * __restrict
variable_len = be32toh((uint32_t)frl-frl_variable_len);
- n = (len * sizeof(*fre)) + variable_len;
+ n = len * sizeof(*fre);
if (lenvar n)
return EFTYPE;
lenvar -= n;
@@ -219,15 +217,15 @@ do { \
READ_RANGE(maplower);
READ_RANGE(mapupper);
- memcpy((void *)rune, (void const *)frune, variable_len);
- rl-rl_variable_len = variable_len;
- rl-rl_variable = (void *)rune;
-
- if (lenvar 0) {
+ if (lenvar variable_len) {
ret = EFTYPE;
goto err;
}
+ memcpy((void *)rune, (void const *)frune, variable_len);
+ rl-rl_variable_len = variable_len;
+ rl-rl_variable = (void *)rune;
+
_rune_find_codeset(rlp-rlp_codeset, sizeof(rlp-rlp_codeset),
(char *)rl-rl_variable, rl-rl_variable_len);
CVS commit: src/lib/libc/locale
Module Name:src Committed By: wiz Date: Wed Aug 8 20:16:51 UTC 2012 Modified Files: src/lib/libc/locale: rune.c Log Message: Restore RCS Id lost in previous. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/lib/libc/locale/rune.c 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/locale/rune.c diff -u src/lib/libc/locale/rune.c:1.44 src/lib/libc/locale/rune.c:1.45 --- src/lib/libc/locale/rune.c:1.44 Wed Aug 8 18:37:26 2012 +++ src/lib/libc/locale/rune.c Wed Aug 8 20:16:50 2012 @@ -1,3 +1,4 @@ +/* $NetBSD: rune.c,v 1.45 2012/08/08 20:16:50 wiz Exp $ */ /*- * Copyright (c)2010 Citrus Project, * All rights reserved.
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Wed Aug 8 20:19:08 UTC 2012 Update of /cvsroot/src/share/zoneinfo In directory ivanova.netbsd.org:/tmp/cvs-serv7742 Log Message: Import tzdata2012e from ftp://ftp.iana.org/tz/releases/tzdata2012e.tar.gz Majo changes from tzdata2012d to tzdata2012e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. Status: Vendor Tag: ADO Release Tags: TZDATA2012E U src/share/zoneinfo/antarctica U src/share/zoneinfo/africa C src/share/zoneinfo/australasia U src/share/zoneinfo/asia U src/share/zoneinfo/northamerica U src/share/zoneinfo/europe U src/share/zoneinfo/yearistype.sh U src/share/zoneinfo/southamerica U src/share/zoneinfo/pacificnew U src/share/zoneinfo/etcetera U src/share/zoneinfo/backward U src/share/zoneinfo/systemv U src/share/zoneinfo/factory U src/share/zoneinfo/solar87 U src/share/zoneinfo/solar88 U src/share/zoneinfo/solar89 U src/share/zoneinfo/iso3166.tab U src/share/zoneinfo/zone.tab U src/share/zoneinfo/leapseconds 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jADO:yesterday -jADO src/share/zoneinfo
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Wed Aug 8 20:21:03 UTC 2012 Modified Files: src/share/zoneinfo: australasia Log Message: Merge tzdata2012e from ftp://ftp.iana.org/tz/releases/tzdata2012e.tar.gz Major changes from tzdata2012d to tzdata2012e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.25 src/share/zoneinfo/australasia:1.26 --- src/share/zoneinfo/australasia:1.25 Sun Jul 22 10:40:29 2012 +++ src/share/zoneinfo/australasia Wed Aug 8 20:21:03 2012 @@ -283,9 +283,9 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # /a # From Alexander Krivenyshev (2010-10-24): -# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 +# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 # weeks earlier than expected - on March 6, 2011, not March 27, 2011... -# Here is confirmation from Government of the Republic of the Fiji Islands, +# Here is confirmation from Government of the Republic of the Fiji Islands, # Ministry of Information (fiji.gov.fj) web site: # a href=http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=2608:daylight-savingscatid=71:press-releasesItemid=155; # http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=2608:daylight-savingscatid=71:press-releasesItemid=155 @@ -296,15 +296,15 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # /a # From Steffen Thorsen (2011-10-03): -# Now the dates have been confirmed, and at least our start date +# Now the dates have been confirmed, and at least our start date # assumption was correct (end date was one week wrong). # # a href=http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=4966:daylight-saving-starts-in-fijicatid=71:press-releasesItemid=155; # www.fiji.gov.fj/index.php?option=com_contentview=articleid=4966:daylight-saving-starts-in-fijicatid=71:press-releasesItemid=155 # /a # which says -# Members of the public are reminded to change their time to one hour in -# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to +# Members of the public are reminded to change their time to one hour in +# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to # 2am on February 26 next year. # From Ken Rylander (2011-10-24) @@ -558,7 +558,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # From David Zuelke (2011-05-09): # Subject: Samoa to move timezone from east to west of international date line -# +# # a href=http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963; # http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963 # /a @@ -640,25 +640,25 @@ Zone Pacific/Guadalcanal 10:39:48 - LMT # # From Gwillim Law (2011-12-29) # A correspondent informed me that Tokelau, like Samoa, will be skipping -# December 31 this year, thereby changing its time zone from UTC-10 to -# UTC+14. When I tried to verify this statement, I found a confirming -# article in Time magazine online -# a href=http://www.time.com/time/world/article/0,8599,2103243,00.html; -# (http://www.time.com/time/world/article/0,8599,2103243,00.html). -# /a -# -# From Jonathan Leffler (2011-12-29) -# Information from the BBC to the same effect: -# a href=http://www.bbc.co.uk/news/world-asia-16351377; -# http://www.bbc.co.uk/news/world-asia-16351377 -# /a +# December 31 this year ... # -# Patch supplied by Tim Parenti (2011-12-29) +# From Steffen Thorsen (2012-07-25) +# ... we double checked by calling hotels and offices based in Tokelau asking +# about the time there, and they all told a time that agrees with UTC+13 +# Shanks says UTC-10 from 1901 [but] ... there is a good chance the change +# actually was to UTC-11 back then. +# +# From Paul Eggert (2012-07-25) +# A Google Books snippet of Appendix to the Journals of the House of +# Representatives of New Zealand, Session 1948, +# http://books.google.com/books?id=ZaVCAQAAIAAJ, page 65, says Tokelau +# was 11 hours slow on G.M.T. Go with Thorsen and assume Shanks Pottenger +# are off by an hour starting in 1901. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fakaofo -11:24:56 - LMT 1901 - -10:00 - TKT 2011 Dec 30 # Tokelau Time - 14:00 - TKT + -11:00 - TKT 2011 Dec 30 # Tokelau Time + 13:00 - TKT # Tonga # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1339,22 +1339,22 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # See southeast Australia above for 2008 and later. # From Steffen Thorsen (2009-04-28): -# According to the official press release, South Australia's extended daylight -# saving period will continue with the same rules as used
CVS commit: src/include/ssp
Module Name:src Committed By: joerg Date: Wed Aug 8 20:23:33 UTC 2012 Modified Files: src/include/ssp: ssp.h Log Message: SSP mostly works with Clang, even if optimisation is disabled. Explicitly disable it for Lint though. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/include/ssp/ssp.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/ssp/ssp.h diff -u src/include/ssp/ssp.h:1.9 src/include/ssp/ssp.h:1.10 --- src/include/ssp/ssp.h:1.9 Mon Feb 21 00:40:08 2011 +++ src/include/ssp/ssp.h Wed Aug 8 20:23:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ssp.h,v 1.9 2011/02/21 00:40:08 joerg Exp $ */ +/* $NetBSD: ssp.h,v 1.10 2012/08/08 20:23:32 joerg Exp $ */ /*- * Copyright (c) 2006, 2011 The NetBSD Foundation, Inc. @@ -34,7 +34,8 @@ #include sys/cdefs.h #if !defined(__cplusplus) -# if _FORTIFY_SOURCE 0 __OPTIMIZE__ 0 __GNUC_PREREQ__(4, 1) +# if _FORTIFY_SOURCE 0 !defined(__lint__) \ + (__OPTIMIZE__ 0 || defined(__clang__)) __GNUC_PREREQ__(4, 1) # if _FORTIFY_SOURCE 1 # define __SSP_FORTIFY_LEVEL 2 # else
CVS commit: src/doc
Module Name:src Committed By: apb Date: Wed Aug 8 20:26:56 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: tzcode2012e and tzdata2012e have been released. We have updated to tzdata2012e, but we still have tzcode2011i. Also add a note to beware of .gitignore files in future. To generate a diff of this commit: cvs rdiff -u -r1.954 -r1.955 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.954 src/doc/3RDPARTY:1.955 --- src/doc/3RDPARTY:1.954 Wed Aug 1 01:49:01 2012 +++ src/doc/3RDPARTY Wed Aug 8 20:26:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.954 2012/08/01 01:49:01 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.955 2012/08/08 20:26:56 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1173,8 +1173,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2011i / tzdata2012d -Current Vers: tzcode2012c / tzdata2012d +Version: tzcode2011i / tzdata2012e +Current Vers: tzcode2012e / tzdata2012e Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://elsie.nci.nih.gov/pub/ @@ -1188,7 +1188,8 @@ Notes: Use src/lib/libc/time/tzcode2netbsd to prepare the source tree for import. The tzcode2009k - 2011i patch was applied by hand, since we have too many diffs (re-entrant tzcode) to apply. The diffs have been submitted -upstream but there is too much inertia to apply them. +upstream but there is too much inertia to apply them. Check for .gitignore +files. Package: wpa_supplicant/hostapd Version: 0.7.3
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src
Committed By: matt
Date: Wed Aug 8 22:10:21 UTC 2012
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: pmap.h
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap_segtab.c trap.c
Log Message:
Fix some LP64 bugs
To generate a diff of this commit:
cvs rdiff -u -r1.54.26.27 -r1.54.26.28 src/sys/arch/mips/include/pmap.h
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/sys/arch/mips/mips/pmap_segtab.c
cvs rdiff -u -r1.217.12.45 -r1.217.12.46 src/sys/arch/mips/mips/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/mips/include/pmap.h
diff -u src/sys/arch/mips/include/pmap.h:1.54.26.27 src/sys/arch/mips/include/pmap.h:1.54.26.28
--- src/sys/arch/mips/include/pmap.h:1.54.26.27 Sat Aug 4 07:20:31 2012
+++ src/sys/arch/mips/include/pmap.h Wed Aug 8 22:10:21 2012
@@ -113,7 +113,7 @@ union pt_entry;
typedef union pmap_segtab {
union pmap_segtab * seg_seg[NSEGPG];
- union pt_entry * seg_tab[NPTEPG];
+ union pt_entry * seg_tab[NSEGPG];
} pmap_segtab_t;
#else
/*
Index: src/sys/arch/mips/mips/pmap_segtab.c
diff -u src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.18 src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.19
--- src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.18 Sat Aug 4 07:20:31 2012
+++ src/sys/arch/mips/mips/pmap_segtab.c Wed Aug 8 22:10:21 2012
@@ -130,6 +130,7 @@ __KERNEL_RCSID(0, pmap_segtab.c,v 1.1.2
#include mips/pte.h
CTASSERT(NBPG = sizeof(pmap_segtab_t));
+
#define PMAP_PTP_CACHE
struct pmap_segtab_info {
Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.217.12.45 src/sys/arch/mips/mips/trap.c:1.217.12.46
--- src/sys/arch/mips/mips/trap.c:1.217.12.45 Sat Aug 4 07:20:31 2012
+++ src/sys/arch/mips/mips/trap.c Wed Aug 8 22:10:21 2012
@@ -378,9 +378,9 @@ trap(uint32_t status, uint32_t cause, va
*/
struct cpu_info * const ci = curcpu();
if ((va XSEGSHIFT) == 0
- __predict_false(ci-ci_pmap_seg0tab == NULL
- ci-ci_pmap_segtab-seg_seg[0] != NULL)) {
- ci-ci_pmap_seg0tab = ci-ci_pmap_segtab-seg_seg[0];
+ __predict_false(ci-ci_pmap_seg0tab[0] == NULL
+ ci-ci_pmap_segtab[0]-seg_seg[0] != NULL)) {
+ ci-ci_pmap_seg0tab[0] = ci-ci_pmap_segtab[0]-seg_seg[0];
kpreempt_enable();
if (type T_USER) {
userret(l);
CVS commit: src/doc
Module Name:src Committed By: jym Date: Wed Aug 8 23:24:40 UTC 2012 Modified Files: src/doc: CHANGES.prev Log Message: Document virtio(4) addition in CHANGES. Noticed by Emmanuel Kasper on tech-kern@. virtio(4) is the VirtIO protocol used by KVM to drastically improve the performance of virtualized peripherals. virtio(4) originally written by minoura@; imported in src by hannken@ around 2011-10-30. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/doc/CHANGES.prev 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.prev diff -u src/doc/CHANGES.prev:1.109 src/doc/CHANGES.prev:1.110 --- src/doc/CHANGES.prev:1.109 Wed Jun 20 07:42:27 2012 +++ src/doc/CHANGES.prev Wed Aug 8 23:24:40 2012 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: $Revision: 1.109 $ +LIST OF CHANGES FROM PREVIOUS RELEASES: $Revision: 1.110 $ Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -11062,6 +11062,8 @@ Changes from NetBSD 5.0 to NetBSD 6.0: powerpc: Switch to GDB 7.3.1. [mrg 20111024] efa(4): Add driver for ELBOX FastATA 1200. [rkujawa 20111028] postfix(1): Import version 2.8.6 [tron 20111028] + virtio(4): Add virtio driver. Speeds up I/O under KVM platform. + [hannken 20111030] zoneinfo: Import tzdata2011n. [apb 2002] tre: Incorporate library. Adds agrep. This library provides regcomp/regexec/regerror/regfree as a binary compatible
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: macallan
Date: Thu Aug 9 00:48:07 UTC 2012
Modified Files:
src/sys/arch/sparc64/dev: ffb.c ffbreg.h
Log Message:
split ffb_putchar() into a version for mono fonts and one for anti-aliased
ones. While there use the blitter to draw the cursor and remove some waits
that are unnecessary now that characters are drawn by hardware.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/ffbreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.51 src/sys/arch/sparc64/dev/ffb.c:1.52
--- src/sys/arch/sparc64/dev/ffb.c:1.51 Thu Apr 12 19:09:18 2012
+++ src/sys/arch/sparc64/dev/ffb.c Thu Aug 9 00:48:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.51 2012/04/12 19:09:18 macallan Exp $ */
+/* $NetBSD: ffb.c,v 1.52 2012/08/09 00:48:06 macallan Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.51 2012/04/12 19:09:18 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.52 2012/08/09 00:48:06 macallan Exp $);
#include sys/types.h
#include sys/param.h
@@ -127,6 +127,7 @@ void ffb_ras_erasecols(void *, int, int,
void ffb_ras_eraserows(void *, int, int, long int);
void ffb_ras_do_cursor(struct rasops_info *);
void ffb_ras_fill(struct ffb_softc *);
+void ffb_ras_invert(struct ffb_softc *);
static void ffb_ras_setfg(struct ffb_softc *, int32_t);
static void ffb_ras_setbg(struct ffb_softc *, int32_t);
@@ -135,7 +136,8 @@ int ffb_load_font(void *, void *, struct
void ffb_init_screen(void *, struct vcons_screen *, int,
long *);
int ffb_allocattr(void *, int, int, int, long *);
-void ffb_putchar(void *, int, int, u_int, long);
+void ffb_putchar_mono(void *, int, int, u_int, long);
+void ffb_putchar_aa(void *, int, int, u_int, long);
void ffb_cursor(void *, int, int, int);
/* frame buffer generic driver */
@@ -738,6 +740,19 @@ ffb_ras_fill(struct ffb_softc *sc)
}
void
+ffb_ras_invert(struct ffb_softc *sc)
+{
+ ffb_ras_fifo_wait(sc, 3);
+ FBC_WRITE(sc, FFB_FBC_PPC,
+ FBC_PPC_VCE_DIS | FBC_PPC_TBE_OPAQUE | FBC_PPC_ACE_DIS |
+ FBC_PPC_APE_DIS | FBC_PPC_DCE_DIS | FBC_PPC_CS_CONST |
+ FBC_PPC_ABE_DIS | FBC_PPC_XS_WID);
+ FBC_WRITE(sc, FFB_FBC_ROP, FBC_ROP_INVERT);
+ FBC_WRITE(sc, FFB_FBC_DRAWOP, FBC_DRAWOP_RECTANGLE);
+ SYNC;
+}
+
+void
ffb_ras_copyrows(void *cookie, int src, int dst, int n)
{
struct rasops_info *ri = cookie;
@@ -966,7 +981,7 @@ ffb_cursor(void *cookie, int on, int row
struct rasops_info *ri = cookie;
struct vcons_screen *scr;
struct ffb_softc *sc;
- int x, y, wi, he, coffset;
+ int x, y, wi, he;
if (cookie != NULL) {
scr = ri-ri_hw;
@@ -976,43 +991,36 @@ ffb_cursor(void *cookie, int on, int row
he = ri-ri_font-fontheight;
if (sc-sc_mode == WSDISPLAYIO_MODE_EMUL) {
- x = ri-ri_ccol * wi + ri-ri_xorigin;
- y = ri-ri_crow * he + ri-ri_yorigin;
if (ri-ri_flg RI_CURSOR) {
+
/* remove cursor */
-coffset = ri-ri_ccol + (ri-ri_crow *
-ri-ri_cols);
-#ifdef WSDISPLAY_SCROLLSUPPORT
-coffset += scr-scr_offset_to_zero;
-#endif
-ffb_ras_wait(sc);
-ffb_putchar(cookie, ri-ri_crow,
-ri-ri_ccol, scr-scr_chars[coffset],
-scr-scr_attrs[coffset]);
+x = ri-ri_ccol * wi + ri-ri_xorigin;
+y = ri-ri_crow * he + ri-ri_yorigin;
+
+ffb_ras_invert(sc);
+ffb_ras_fifo_wait(sc, 4);
+FBC_WRITE(sc, FFB_FBC_BY, y);
+FBC_WRITE(sc, FFB_FBC_BX, x);
+FBC_WRITE(sc, FFB_FBC_BH, he);
+FBC_WRITE(sc, FFB_FBC_BW, wi);
+
ri-ri_flg = ~RI_CURSOR;
}
ri-ri_crow = row;
ri-ri_ccol = col;
if (on)
{
-long attr, revattr;
x = ri-ri_ccol * wi + ri-ri_xorigin;
y = ri-ri_crow * he + ri-ri_yorigin;
-coffset = col + (row * ri-ri_cols);
-#ifdef WSDISPLAY_SCROLLSUPPORT
-coffset += scr-scr_offset_to_zero;
-#endif
-attr = scr-scr_attrs[coffset];
-#ifdef FFB_CURSOR_SWAP_COLOURS
-revattr=((attr 8 ) 0x000f) | ((attr
-0x000f)8) | (attr 0x);
-#else
-revattr = attr ^ 0x;
-#endif
-ffb_ras_wait(sc);
-ffb_putchar(cookie, ri-ri_crow, ri-ri_ccol,
-scr-scr_chars[coffset], revattr);
+
+ffb_ras_invert(sc);
+ffb_ras_fifo_wait(sc, 4);
+FBC_WRITE(sc, FFB_FBC_BY, y);
+FBC_WRITE(sc, FFB_FBC_BX, x);
+FBC_WRITE(sc, FFB_FBC_BH, he);
+FBC_WRITE(sc, FFB_FBC_BW, wi);
+
ri-ri_flg |= RI_CURSOR;
}
} else {
@@ -1023,8 +1031,9 @@ ffb_cursor(void *cookie, int on, int row
}
}
+/* mono bitmap font */
void
-ffb_putchar(void *cookie, int row, int col, u_int c, long attr)
+ffb_putchar_mono(void *cookie, int row, int col, u_int c, long attr)
{
struct rasops_info *ri = cookie;
struct
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: macallan Date: Thu Aug 9 01:41:48 UTC 2012 Modified Files: src/sys/dev/wsfont: DejaVu_Sans_Mono_12x22.h Log Message: remove some stray pixels in the R glyph To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.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/wsfont/DejaVu_Sans_Mono_12x22.h diff -u src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h:1.2 src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h:1.3 --- src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h:1.2 Tue May 1 07:46:47 2012 +++ src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h Thu Aug 9 01:41:47 2012 @@ -2003,8 +2003,8 @@ static u_char DejaVu_Sans_Mono_12x22_dat 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0xf7, 0xfe, 0x31, /* XX XX. */ 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0xff, 0xb4, /* XX oXa */ 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xf2, 0xff, /* XX XX */ -0x39, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xff, /* .XX oX */ -0xbd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a*/ +0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xff, /* XX oX */ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Aug 9 04:16:37 UTC 2012
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Add workaround for QEMU and the variants.
This problem was discovered a few years ago, but some variants and
cloud services still have the bug. This problem is not NetBSD's bug
but qemus's bug. For NetBSD users, existence of buggy virtual machines
s sad thing, so we add a workaroud.
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.229 src/sys/dev/pci/if_wm.c:1.230
--- src/sys/dev/pci/if_wm.c:1.229 Sun Jul 22 14:33:04 2012
+++ src/sys/dev/pci/if_wm.c Thu Aug 9 04:16:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.229 2012/07/22 14:33:04 matt Exp $ */
+/* $NetBSD: if_wm.c,v 1.230 2012/08/09 04:16:37 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.229 2012/07/22 14:33:04 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.230 2012/08/09 04:16:37 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -4628,6 +4628,22 @@ wm_read_eeprom_uwire(struct wm_softc *sc
reg = CSR_READ(sc, WMREG_EECD) ~(EECD_SK | EECD_DI);
CSR_WRITE(sc, WMREG_EECD, reg);
+ /*
+ * XXX: workaround for a bug in qemu-0.12.x and prior
+ * and Xen.
+ *
+ * We use this workaround only for 82540 because qemu's
+ * e1000 act as 82540.
+ */
+ if (sc-sc_type = WM_T_82540) {
+ reg |= EECD_SK;
+ CSR_WRITE(sc, WMREG_EECD, reg);
+ reg = ~EECD_SK;
+ CSR_WRITE(sc, WMREG_EECD, reg);
+ delay(2);
+ }
+ /* XXX: end of workaround */
+
/* Set CHIP SELECT. */
reg |= EECD_CS;
CSR_WRITE(sc, WMREG_EECD, reg);
CVS commit: [netbsd-6] src/sys/dev/sdmmc
Module Name:src Committed By: jdc Date: Wed Aug 8 06:19:00 UTC 2012 Modified Files: src/sys/dev/sdmmc [netbsd-6]: sdhc.c sdhcreg.h sdmmc_mem.c sdmmcreg.h Log Message: Pull up revisions: src/sys/dev/sdmmc/sdhc.c revisions 1.16,1.20,1.21,1.22,1.23 via patch,1.25 src/sys/dev/sdmmc/sdhcreg.h revision 1.8 src/sys/dev/sdmmc/sdmmc_mem.c revisions 1.21,1.22 src/sys/dev/sdmmc/sdmmcreg.h revisions 1.10,1.11,1.12 (requested by matt in ticket 441). SDHCI byte swaps the BE response on the wire into LE registers. As we always want response data in LE, use bus_space_read_stream. Additonally, read response data in 1 or 4 4-byte chunks, instead of one 4-byte chunk or 15 1-byte chunks. bus_space_*_stream_N() functions are not universally available. Provite alternate implementation for when they are unavailable. Handle interrupt acknowledgement in the SDHC_FLAG_32BIT_ACCESS case in the same way as non-SDHC_FLAG_32BIT_ACCESS case. If there was an error in 32-bit mode, just set ERROR_INTERRUPT otherwise see if matched anything we care about. Add use of watermark register when PIO to an ESDHC. After every kill or drain of watermask words, pause a bit to give time for the fifo to recover. Always the command response in BE byteorder. Rewrite __bitfield to deal with this. Responses are actually in host order (except SCR which is return in big endian so that's convert to host order). Fix comments about __bitfield. To generate a diff of this commit: cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/dev/sdmmc/sdhc.c cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/dev/sdmmc/sdhcreg.h cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/dev/sdmmc/sdmmc_mem.c cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/sdmmc/sdmmcreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/libexec/ld.elf_so
Module Name:src Committed By: jdc Date: Wed Aug 8 06:24:51 UTC 2012 Modified Files: src/libexec/ld.elf_so [netbsd-6]: headers.c src/libexec/ld.elf_so/arch/sparc64 [netbsd-6]: mdreloc.c Log Message: Pull up revisions: src/libexec/ld.elf_so/headers.c revision 1.42 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c revision 1.53 (requested by martin in ticket #447). Remove a debug assert that does not hold for PIE (e.g. phdr = 0x40, but obj has not been mapped at 0, so obj-phdr is 0x100040). OK: skrll Add special handling needed for OLO10 relocations. First part of fixing PR port-sparc64/46724. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.4.1 src/libexec/ld.elf_so/headers.c cvs rdiff -u -r1.52 -r1.52.6.1 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Wed Aug 8 09:02:14 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 441, 447. To generate a diff of this commit: cvs rdiff -u -r1.1.2.167 -r1.1.2.168 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ews4800mips/ews4800mips
Module Name:src Committed By: martin Date: Wed Aug 8 09:02:49 UTC 2012 Modified Files: src/sys/arch/ews4800mips/ews4800mips: cons_machdep.c Log Message: Remove unneeded cn_tab definition (and NULL initialization) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ews4800mips/ews4800mips/cons_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Wed Aug 8 13:56:14 UTC 2012 Modified Files: src/share/mk: bsd.README bsd.own.mk bsd.prog.mk Log Message: add MKRUMP by popular demand. To generate a diff of this commit: cvs rdiff -u -r1.297 -r1.298 src/share/mk/bsd.README cvs rdiff -u -r1.702 -r1.703 src/share/mk/bsd.own.mk cvs rdiff -u -r1.274 -r1.275 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests
Module Name:src Committed By: christos Date: Wed Aug 8 13:57:06 UTC 2012 Modified Files: src/tests: Makefile src/tests/dev: Makefile src/tests/include/sys: Makefile src/tests/kernel: Makefile src/tests/lib: Makefile src/tests/lib/libc/sys: Makefile src/tests/lib/semaphore: Makefile src/tests/net: Makefile Log Message: Exclude tests that use rump To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/tests/Makefile cvs rdiff -u -r1.7 -r1.8 src/tests/dev/Makefile cvs rdiff -u -r1.6 -r1.7 src/tests/include/sys/Makefile cvs rdiff -u -r1.25 -r1.26 src/tests/kernel/Makefile cvs rdiff -u -r1.19 -r1.20 src/tests/lib/Makefile cvs rdiff -u -r1.26 -r1.27 src/tests/lib/libc/sys/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/lib/semaphore/Makefile cvs rdiff -u -r1.9 -r1.10 src/tests/net/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: christos Date: Wed Aug 8 13:58:56 UTC 2012 Modified Files: src/sys/rump/include/rump: Makefile Log Message: don't install includes if MKRUMP = no To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Wed Aug 8 14:00:31 UTC 2012 Modified Files: src: Makefile Log Message: exclude rump targets if MKRUMP = no To generate a diff of this commit: cvs rdiff -u -r1.292 -r1.293 src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib
Module Name:src Committed By: christos Date: Wed Aug 8 14:01:16 UTC 2012 Modified Files: src/lib: Makefile Log Message: exclude rump libraries if MKRUMP = no To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/route
Module Name:src Committed By: christos Date: Wed Aug 8 14:04:26 UTC 2012 Modified Files: src/sbin/route: route.c Log Message: remove useless rump headers. To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/sbin/route/route.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/dd
Module Name:src Committed By: christos Date: Wed Aug 8 14:09:14 UTC 2012 Modified Files: src/bin/dd: Makefile Log Message: let the standard rules deal with librumpclient To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/bin/dd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: christos Date: Wed Aug 8 14:10:39 UTC 2012 Modified Files: src/sbin/ifconfig: Makefile Log Message: don't define RUMP_ACTION if MKRUMP = no To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sbin/ifconfig/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Wed Aug 8 14:13:46 UTC 2012 Modified Files: src/usr.bin: Makefile src/usr.sbin: Makefile Log Message: exclude programs for MKRUMP = no To generate a diff of this commit: cvs rdiff -u -r1.209 -r1.210 src/usr.bin/Makefile cvs rdiff -u -r1.265 -r1.266 src/usr.sbin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src Committed By: christos Date: Wed Aug 8 14:15:03 UTC 2012 Modified Files: src/distrib/sets: sets.subr src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi module.mi Log Message: adjust for MKRUMP = no To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/sets.subr cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.163 -r1.164 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.999 -r1.1000 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.634 -r1.635 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/comp/ad.mips64eb cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.154 -r1.155 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1773 -r1.1774 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.230 -r1.231 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1401 -r1.1402 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.481 -r1.482 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/tests/module.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: martin Date: Wed Aug 8 14:26:50 UTC 2012 Modified Files: src/etc [netbsd-6]: daily src/etc/defaults [netbsd-6]: daily.conf src/share/man/man5 [netbsd-6]: daily.5 Log Message: Pull up following revision(s) (requested by christos in ticket #456): etc/daily: revision 1.82 etc/defaults/daily.conf: revision 1.17 share/man/man5/daily.5: revision 1.5 PR/46756: Edgar Fu�: Enable ignoring subdirectories in daily's find_core To generate a diff of this commit: cvs rdiff -u -r1.80.2.1 -r1.80.2.2 src/etc/daily cvs rdiff -u -r1.16 -r1.16.2.1 src/etc/defaults/daily.conf cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/share/man/man5/daily.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: martin Date: Wed Aug 8 14:31:33 UTC 2012 Modified Files: src/etc [netbsd-6]: daily src/etc/defaults [netbsd-6]: daily.conf Log Message: Pull up following revision(s) (requested by christos in ticket #457): etc/daily: revision 1.83 etc/defaults/daily.conf: revision 1.18 PR/46757: Edgar Fu�: Change default to pkg_vulnerabilities from NO to unset, and make unset insted of NO to produce warnings, so that setting it to NO does produce warnings (if it is inappropriate for the machine to warn about this). To generate a diff of this commit: cvs rdiff -u -r1.80.2.2 -r1.80.2.3 src/etc/daily cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/etc/defaults/daily.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: martin Date: Wed Aug 8 14:36:55 UTC 2012 Modified Files: src/etc [netbsd-6]: daily weekly Log Message: Pull up following revision(s) (requested by jdf in ticket #458): etc/weekly: revision 1.28 etc/daily: revision 1.84 Call `makemandb -f -q` instead of `makemandb -f`, as Edgar Fuss proposed for daily. Call `makemandb -q` instead of `makemandb`, as proposed by Edgar Fuss on tech-userlevel on 20th of July 2012, 12:38. To generate a diff of this commit: cvs rdiff -u -r1.80.2.3 -r1.80.2.4 src/etc/daily cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/etc/weekly Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed Aug 8 14:39:20 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 456, 457, 458 To generate a diff of this commit: cvs rdiff -u -r1.1.2.168 -r1.1.2.169 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: martin Date: Wed Aug 8 14:49:24 UTC 2012 Modified Files: src/etc [netbsd-6]: daily Log Message: Include rev 1.86 in the pullup of ticket 457 as well: only print fetching message, if we actually try to fetch the package vulnerabilities file. To generate a diff of this commit: cvs rdiff -u -r1.80.2.4 -r1.80.2.5 src/etc/daily Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed Aug 8 14:50:55 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Fix entry for ticket #457 for additional revisions To generate a diff of this commit: cvs rdiff -u -r1.1.2.169 -r1.1.2.170 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/usermode/usermode
Module Name:src Committed By: martin Date: Wed Aug 8 15:32:25 UTC 2012 Modified Files: src/sys/arch/usermode/usermode [netbsd-6]: trap.c Log Message: Pull up following revision(s) (requested by reinoud in ticket #463): sys/arch/usermode/usermode/trap.c: revision 1.66 Fix IO lockups in NetBSD/usermode. 1) Don't block IO signals since the return path is not garanteed to enable the signal again. 2) Since signals can get dropped, do a 2nd pass over the routines. To generate a diff of this commit: cvs rdiff -u -r1.63.2.2 -r1.63.2.3 src/sys/arch/usermode/usermode/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/net
Module Name:src Committed By: martin Date: Wed Aug 8 15:35:15 UTC 2012 Modified Files: src/sys/net [netbsd-6]: if_types.h Log Message: Pull up following revision(s) (requested by wiz in ticket #464): sys/net/if_types.h: revision 1.26 Avoid ambiguity by having only one comment close mark. PR 46771 by bsiegert. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.104.1 src/sys/net/if_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/usr.sbin/rtadvd
Module Name:src Committed By: martin Date: Wed Aug 8 15:37:49 UTC 2012 Modified Files: src/usr.sbin/rtadvd [netbsd-6]: config.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #465): usr.sbin/rtadvd/config.c: revision 1.28 Fix a bug that incorrect RA packet is sent if rtadvd.conf exists. Fixes PR#46580 reported by Takahiro HAYASHI. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.2.1 src/usr.sbin/rtadvd/config.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: martin Date: Wed Aug 8 15:51:14 UTC 2012 Modified Files: src/distrib/sets/lists/comp [netbsd-6]: mi src/share/man/man9 [netbsd-6]: Makefile cpu_rootconf.9 src/sys/arch/acorn26/acorn26 [netbsd-6]: autoconf.c src/sys/arch/acorn32/acorn32 [netbsd-6]: autoconf.c src/sys/arch/algor/algor [netbsd-6]: autoconf.c src/sys/arch/alpha/alpha [netbsd-6]: autoconf.c src/sys/arch/amiga/amiga [netbsd-6]: autoconf.c src/sys/arch/amigappc/amigappc [netbsd-6]: autoconf.c src/sys/arch/arc/arc [netbsd-6]: autoconf.c src/sys/arch/atari/atari [netbsd-6]: autoconf.c src/sys/arch/bebox/bebox [netbsd-6]: autoconf.c src/sys/arch/cats/cats [netbsd-6]: autoconf.c src/sys/arch/cesfic/cesfic [netbsd-6]: autoconf.c src/sys/arch/cobalt/cobalt [netbsd-6]: autoconf.c src/sys/arch/dreamcast/dreamcast [netbsd-6]: autoconf.c src/sys/arch/emips/emips [netbsd-6]: autoconf.c src/sys/arch/evbarm/evbarm [netbsd-6]: autoconf.c src/sys/arch/evbmips/adm5120 [netbsd-6]: autoconf.c src/sys/arch/evbmips/alchemy [netbsd-6]: autoconf.c src/sys/arch/evbmips/atheros [netbsd-6]: autoconf.c src/sys/arch/evbmips/gdium [netbsd-6]: autoconf.c src/sys/arch/evbmips/loongson [netbsd-6]: autoconf.c src/sys/arch/evbmips/malta [netbsd-6]: autoconf.c src/sys/arch/evbmips/rasoc [netbsd-6]: autoconf.c src/sys/arch/evbmips/rmixl [netbsd-6]: autoconf.c src/sys/arch/evbppc/ev64260 [netbsd-6]: autoconf.c src/sys/arch/evbppc/explora [netbsd-6]: autoconf.c src/sys/arch/evbppc/mpc85xx [netbsd-6]: autoconf.c src/sys/arch/evbppc/obs405 [netbsd-6]: obs405_autoconf.c src/sys/arch/evbppc/pmppc [netbsd-6]: autoconf.c src/sys/arch/evbppc/virtex [netbsd-6]: autoconf.c src/sys/arch/evbppc/walnut [netbsd-6]: autoconf.c src/sys/arch/evbsh3/evbsh3 [netbsd-6]: autoconf.c src/sys/arch/ews4800mips/ews4800mips [netbsd-6]: autoconf.c src/sys/arch/hp300/hp300 [netbsd-6]: autoconf.c src/sys/arch/hp700/hp700 [netbsd-6]: autoconf.c src/sys/arch/hpcarm/hpcarm [netbsd-6]: autoconf.c src/sys/arch/hpcmips/hpcmips [netbsd-6]: autoconf.c src/sys/arch/hpcsh/hpcsh [netbsd-6]: autoconf.c src/sys/arch/ia64/ia64 [netbsd-6]: autoconf.c src/sys/arch/ibmnws/ibmnws [netbsd-6]: autoconf.c src/sys/arch/iyonix/iyonix [netbsd-6]: autoconf.c src/sys/arch/landisk/landisk [netbsd-6]: autoconf.c src/sys/arch/luna68k/luna68k [netbsd-6]: autoconf.c src/sys/arch/mac68k/mac68k [netbsd-6]: autoconf.c src/sys/arch/mipsco/mipsco [netbsd-6]: autoconf.c src/sys/arch/mmeye/mmeye [netbsd-6]: autoconf.c src/sys/arch/mvme68k/mvme68k [netbsd-6]: autoconf.c src/sys/arch/mvmeppc/mvmeppc [netbsd-6]: autoconf.c src/sys/arch/netwinder/netwinder [netbsd-6]: autoconf.c src/sys/arch/news68k/news68k [netbsd-6]: autoconf.c src/sys/arch/newsmips/newsmips [netbsd-6]: autoconf.c src/sys/arch/next68k/next68k [netbsd-6]: autoconf.c src/sys/arch/pmax/pmax [netbsd-6]: autoconf.c src/sys/arch/powerpc/oea [netbsd-6]: ofw_autoconf.c src/sys/arch/prep/prep [netbsd-6]: autoconf.c src/sys/arch/rs6000/rs6000 [netbsd-6]: autoconf.c src/sys/arch/sandpoint/sandpoint [netbsd-6]: autoconf.c src/sys/arch/sbmips/sbmips [netbsd-6]: autoconf.c src/sys/arch/sgimips/sgimips [netbsd-6]: autoconf.c src/sys/arch/shark/shark [netbsd-6]: autoconf.c src/sys/arch/sparc/sparc [netbsd-6]: autoconf.c src/sys/arch/sparc64/sparc64 [netbsd-6]: autoconf.c src/sys/arch/sun3/sun3 [netbsd-6]: autoconf.c src/sys/arch/sun68k/sun68k [netbsd-6]: autoconf.c src/sys/arch/usermode/dev [netbsd-6]: cpu.c src/sys/arch/vax/vax [netbsd-6]: autoconf.c src/sys/arch/x68k/x68k [netbsd-6]: autoconf.c src/sys/arch/x86/x86 [netbsd-6]: x86_autoconf.c src/sys/arch/xen/x86 [netbsd-6]: autoconf.c src/sys/arch/zaurus/zaurus [netbsd-6]: autoconf.c src/sys/kern [netbsd-6]: init_main.c src/sys/sys [netbsd-6]: conf.h Log Message: Pull up following revision(s) (requested by mlelstv in ticket #466): sys/arch/amiga/amiga/autoconf.c: revision 1.113 sys/arch/rs6000/rs6000/autoconf.c: revision 1.4 sys/arch/emips/emips/autoconf.c: revision 1.6 sys/arch/sandpoint/sandpoint/autoconf.c: revision 1.27 sys/arch/evbmips/alchemy/autoconf.c: revision 1.18 sys/arch/sgimips/sgimips/autoconf.c: revision 1.43 sys/arch/atari/atari/autoconf.c: revision 1.63 sys/arch/powerpc/oea/ofw_autoconf.c: revision 1.17 sys/arch/mmeye/mmeye/autoconf.c: revision 1.9 distrib/sets/lists/comp/mi: revision 1.1771
CVS commit: [netbsd-6] src/sys/arch/hp300/stand/common
Module Name:src Committed By: martin Date: Wed Aug 8 15:55:43 UTC 2012 Modified Files: src/sys/arch/hp300/stand/common [netbsd-6]: if_lereg.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #468): sys/arch/hp300/stand/common/if_lereg.h: revision 1.6 Remove '__attribute__((__packed__))' from structure definisions for Am7990 LANCE registers where no implicit padding is expected. gcc 4.5.3 seems to generate strange and wrong instructions (four moveb insns against u_short members) if packed attribute is specified in this case, then netboot fails immediately. Should be pulled up to netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.118.1 src/sys/arch/hp300/stand/common/if_lereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Wed Aug 8 15:58:17 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 463, 464, 465, 466, 468 To generate a diff of this commit: cvs rdiff -u -r1.1.2.170 -r1.1.2.171 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: skrll Date: Wed Aug 8 16:09:42 UTC 2012 Modified Files: src/sys/arch/arm/include: pcb.h Log Message: Update comment. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/include/pcb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Wed Aug 8 16:23:32 UTC 2012 Modified Files: src/distrib/sets/lists/tests: mi Log Message: fix pasto To generate a diff of this commit: cvs rdiff -u -r1.482 -r1.483 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: drochner Date: Wed Aug 8 16:29:50 UTC 2012 Modified Files: src/sys/arch/cesfic/cesfic: machdep.c Log Message: build fix for gcc -fno-common, from Radoslaw Kujawa To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/cesfic/cesfic/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Wed Aug 8 16:56:53 UTC 2012 Modified Files: src/sys/sys: ieee754.h Log Message: Add sngu_* and dblu_* access macros. XXX sng* and ext* should be renamed to flt* and ldbl* To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/sys/ieee754.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src Committed By: matt Date: Wed Aug 8 16:57:24 UTC 2012 Added Files: src/lib/libm/src: s_truncl.c Log Message: Add a long double version of trunc. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/lib/libm/src/s_truncl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src Committed By: matt Date: Wed Aug 8 16:58:28 UTC 2012 Modified Files: src/lib/libm/src: s_truncl.c Log Message: Fix copyright. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_truncl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/locale
Module Name:src Committed By: tnozaki Date: Wed Aug 8 18:37:26 UTC 2012 Modified Files: src/lib/libc/locale: rune.c Log Message: fix PR lib/46781 statically compiled bash makes locale loading fail. analyzed and patch provided by enami@ nonaka@ obache@ soda@, thanks. patch modified by me. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/lib/libc/locale/rune.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: drochner Date: Wed Aug 8 18:37:52 UTC 2012 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 src/sys/arch/amd64/include: Makefile src/sys/arch/i386/include: Makefile Log Message: on x86, machine/cpufunc.h only pulls in x86/cpufunc.h. The latter is not installed to userland and noone missed it, so the former ones can not be useful either. Don't install them. To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.125 -r1.126 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/Makefile cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/locale/ctype
Module Name:src Committed By: tnozaki Date: Wed Aug 8 18:40:37 UTC 2012 Modified Files: src/share/locale/ctype: en_US.UTF-8.src Log Message: fix PR lib/46772 wcwidth of combining characters. patch probyted by yamt@, thanks. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/locale/ctype/en_US.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/locale
Module Name:src Committed By: wiz Date: Wed Aug 8 20:16:51 UTC 2012 Modified Files: src/lib/libc/locale: rune.c Log Message: Restore RCS Id lost in previous. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/lib/libc/locale/rune.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Wed Aug 8 20:19:08 UTC 2012 Update of /cvsroot/src/share/zoneinfo In directory ivanova.netbsd.org:/tmp/cvs-serv7742 Log Message: Import tzdata2012e from ftp://ftp.iana.org/tz/releases/tzdata2012e.tar.gz Majo changes from tzdata2012d to tzdata2012e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. Status: Vendor Tag: ADO Release Tags: TZDATA2012E U src/share/zoneinfo/antarctica U src/share/zoneinfo/africa C src/share/zoneinfo/australasia U src/share/zoneinfo/asia U src/share/zoneinfo/northamerica U src/share/zoneinfo/europe U src/share/zoneinfo/yearistype.sh U src/share/zoneinfo/southamerica U src/share/zoneinfo/pacificnew U src/share/zoneinfo/etcetera U src/share/zoneinfo/backward U src/share/zoneinfo/systemv U src/share/zoneinfo/factory U src/share/zoneinfo/solar87 U src/share/zoneinfo/solar88 U src/share/zoneinfo/solar89 U src/share/zoneinfo/iso3166.tab U src/share/zoneinfo/zone.tab U src/share/zoneinfo/leapseconds 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jADO:yesterday -jADO src/share/zoneinfo
CVS commit: src/include/ssp
Module Name:src Committed By: joerg Date: Wed Aug 8 20:23:33 UTC 2012 Modified Files: src/include/ssp: ssp.h Log Message: SSP mostly works with Clang, even if optimisation is disabled. Explicitly disable it for Lint though. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/include/ssp/ssp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Wed Aug 8 20:26:56 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: tzcode2012e and tzdata2012e have been released. We have updated to tzdata2012e, but we still have tzcode2011i. Also add a note to beware of .gitignore files in future. To generate a diff of this commit: cvs rdiff -u -r1.954 -r1.955 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src Committed By: matt Date: Wed Aug 8 22:10:21 UTC 2012 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: pmap.h src/sys/arch/mips/mips [matt-nb5-mips64]: pmap_segtab.c trap.c Log Message: Fix some LP64 bugs To generate a diff of this commit: cvs rdiff -u -r1.54.26.27 -r1.54.26.28 src/sys/arch/mips/include/pmap.h cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/sys/arch/mips/mips/pmap_segtab.c cvs rdiff -u -r1.217.12.45 -r1.217.12.46 src/sys/arch/mips/mips/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: macallan Date: Thu Aug 9 00:48:07 UTC 2012 Modified Files: src/sys/arch/sparc64/dev: ffb.c ffbreg.h Log Message: split ffb_putchar() into a version for mono fonts and one for anti-aliased ones. While there use the blitter to draw the cursor and remove some waits that are unnecessary now that characters are drawn by hardware. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/dev/ffb.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/ffbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: macallan Date: Thu Aug 9 01:41:48 UTC 2012 Modified Files: src/sys/dev/wsfont: DejaVu_Sans_Mono_12x22.h Log Message: remove some stray pixels in the R glyph To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Aug 9 04:16:37 UTC 2012 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Add workaround for QEMU and the variants. This problem was discovered a few years ago, but some variants and cloud services still have the bug. This problem is not NetBSD's bug but qemus's bug. For NetBSD users, existence of buggy virtual machines s sad thing, so we add a workaroud. To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
