CVS commit: src/crypto/external/bsd/netpgp
Module Name:src
Committed By: agc
Date: Thu Nov 22 04:05:57 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
Log Message:
link libz and libbz2 into the netpgpverify library, rather than into the
executable, via LIBDPLIBS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/lib/verify/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.2 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.3
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.2 Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Thu Nov 22 04:05:57 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/11/20 05:26:25 agc Exp $
+# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
.include
@@ -15,9 +15,6 @@ LIBNETPGPVERIFYDIR!= cd ${.CURDIR}/../
LDADD+= -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
DPADD+= ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
-LDADD+= -lz -lbz2
-DPADD+= ${LIBZ} ${LIBBZ2}
-
EXTDIST= ${.CURDIR}/../../dist/src
.PATH: ${EXTDIST}/netpgpverify
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.2 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.3
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.2 Tue Nov 20 05:26:26 2012
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Thu Nov 22 04:05:57 2012
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/11/20 05:26:26 agc Exp $
+# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
+
+.include
LIB=netpgpverify
SRCS=libverify.c b64.c pgpsum.c
@@ -13,6 +15,9 @@ WARNS=5
EXTDIST=${.CURDIR}/../../dist
.PATH: ${EXTDIST}/src/libverify ${EXTDIST}/src/libdigest ${EXTDIST}/src/libbn ${EXTDIST}/src/librsa
+LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+
INCS=verify.h
INCSDIR=/usr/include/netpgp
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Nov 22 00:44:31 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 680-685. To generate a diff of this commit: cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-6.1 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.1 diff -u src/doc/CHANGES-6.1:1.1.2.32 src/doc/CHANGES-6.1:1.1.2.33 --- src/doc/CHANGES-6.1:1.1.2.32 Wed Nov 21 15:57:20 2012 +++ src/doc/CHANGES-6.1 Thu Nov 22 00:44:31 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.32 2012/11/21 15:57:20 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.33 2012/11/22 00:44:31 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -774,3 +774,47 @@ share/zoneinfo/southamerica patch Various fixes to documentation and commentary. [apb, ticket #677] +sys/arch/amiga/conf/files.amiga 1.162 +sys/arch/amiga/dev/grf_cv3d.c 1.27 + + CV3DONZORRO2 option is no longer needed. + [phx, ticket #680] + +sys/arch/amiga/conf/files.amiga 1.161 +sys/arch/amiga/dev/if_ed.c delete +sys/arch/amiga/dev/if_ed_zbus.c 1.1-1.2 +sys/arch/amiga/dev/if_edreg.h delete +sys/dev/ic/dp8390reg.h1.9 + + New ed(4) device driver for Hydra and ASDG Zorro2 bus network cards. + This driver is based on the MI dp8390 backend. + [phx, ticket #681] + +sys/dev/acpi/acpi_pci_link.c 1.19 + + Fix PCI interrupts on some systems. + [chs, ticket #682] + +sys/arch/ia64/acpi/acpi_machdep.c 1.6 +sys/arch/ia64/include/acpi_machdep.h 1.6 +sys/arch/x86/acpi/acpi_machdep.c 1.4 +sys/arch/x86/include/acpi_machdep.h 1.11 +sys/arch/x86/x86/mpacpi.c 1.95-1.96 +sys/dev/acpi/acpi.c1.255 + + Simplify the ACPI/PCI glue, improve detection of PCI buses, and + fix some panics. PR#47016. + [chs, ticket #683] + +sys/arch/i386/conf/kern.ldscript 1.9 +sys/arch/i386/conf/kern.ldscript.4MB 1.10 +sys/arch/i386/conf/kern.ldscript.Xen 1.4 + + Improve CPU cache usage slightly for some kernel configs. + [chs, ticket #684] + +sys/dev/pci/if_nfe.c1.57 + + Improve nfe(4) performance by avoiding bounce-buffering. + [chs, ticket #685] +
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src Committed By: riz Date: Thu Nov 22 00:43:00 UTC 2012 Modified Files: src/sys/dev/pci [netbsd-6]: if_nfe.c Log Message: Pull up following revision(s) (requested by chs in ticket #685): sys/dev/pci/if_nfe.c: revision 1.57 use 64-bit DMA where possible. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/dev/pci/if_nfe.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_nfe.c diff -u src/sys/dev/pci/if_nfe.c:1.55 src/sys/dev/pci/if_nfe.c:1.55.2.1 --- src/sys/dev/pci/if_nfe.c:1.55 Mon Jan 30 19:41:20 2012 +++ src/sys/dev/pci/if_nfe.c Thu Nov 22 00:42:59 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_nfe.c,v 1.55 2012/01/30 19:41:20 drochner Exp $ */ +/* $NetBSD: if_nfe.c,v 1.55.2.1 2012/11/22 00:42:59 riz Exp $ */ /* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */ /*- @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include -__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.55 2012/01/30 19:41:20 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.55.2.1 2012/11/22 00:42:59 riz Exp $"); #include "opt_inet.h" #include "vlan.h" @@ -255,8 +255,6 @@ nfe_attach(device_t parent, device_t sel } aprint_normal_dev(self, "interrupting at %s\n", intrstr); - sc->sc_dmat = pa->pa_dmat; - csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); csr |= PCI_COMMAND_MASTER_ENABLE; pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr); @@ -324,6 +322,11 @@ nfe_attach(device_t parent, device_t sel break; } + if (pci_dma64_available(pa) && (sc->sc_flags & NFE_40BIT_ADDR) != 0) + sc->sc_dmat = pa->pa_dmat64; + else + sc->sc_dmat = pa->pa_dmat; + nfe_poweron(self); #ifndef NFE_NO_JUMBO
CVS commit: [netbsd-6] src/sys/arch/i386/conf
Module Name:src
Committed By: riz
Date: Thu Nov 22 00:40:51 UTC 2012
Modified Files:
src/sys/arch/i386/conf [netbsd-6]: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen
Log Message:
Pull up following revision(s) (requested by chs in ticket #684):
sys/arch/i386/conf/kern.ldscript.Xen: revision 1.4
sys/arch/i386/conf/kern.ldscript: revision 1.9
sys/arch/i386/conf/kern.ldscript.4MB: revision 1.10
sync ldscripts; add cacheline_aligned and read_mostly handling
to the non-default ones.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.14.1 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.9 -r1.9.60.1 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.3 -r1.3.60.1 src/sys/arch/i386/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.8 src/sys/arch/i386/conf/kern.ldscript:1.8.14.1
--- src/sys/arch/i386/conf/kern.ldscript:1.8 Tue Jun 1 22:13:30 2010
+++ src/sys/arch/i386/conf/kern.ldscript Thu Nov 22 00:40:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.8 2010/06/01 22:13:30 mjf Exp $ */
+/* $NetBSD: kern.ldscript,v 1.8.14.1 2012/11/22 00:40:51 riz Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -23,7 +23,7 @@ SECTIONS
*(.rodata)
*(.rodata.*)
}
-
+
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
. = ALIGN(0x1000) + (. & (0x1000 - 1));
@@ -39,7 +39,6 @@ SECTIONS
{
*(.data.cacheline_aligned)
}
-
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.9 src/sys/arch/i386/conf/kern.ldscript.4MB:1.9.60.1
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.9 Thu Oct 18 15:28:34 2007
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Thu Nov 22 00:40:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.9 2007/10/18 15:28:34 yamt Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.9.60.1 2012/11/22 00:40:51 riz Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -33,8 +33,20 @@ SECTIONS
AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
- *(.data.*)
}
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.cacheline_aligned :
+ AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.read_mostly :
+ AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.3 src/sys/arch/i386/conf/kern.ldscript.Xen:1.3.60.1
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.3 Thu Oct 18 15:28:34 2007
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Thu Nov 22 00:40:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.3 2007/10/18 15:28:34 yamt Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.3.60.1 2012/11/22 00:40:51 riz Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -28,8 +28,20 @@ SECTIONS
.data :
{
*(.data)
- *(.data.*)
}
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.cacheline_aligned :
+ AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.read_mostly :
+ AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Thu Nov 22 00:39:01 UTC 2012
Modified Files:
src/sys/arch/ia64/acpi [netbsd-6]: acpi_machdep.c
src/sys/arch/ia64/include [netbsd-6]: acpi_machdep.h
src/sys/arch/x86/acpi [netbsd-6]: acpi_machdep.c
src/sys/arch/x86/include [netbsd-6]: acpi_machdep.h
src/sys/arch/x86/x86 [netbsd-6]: mpacpi.c
src/sys/dev/acpi [netbsd-6]: acpi.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #683):
sys/arch/ia64/include/acpi_machdep.h: revision 1.6
sys/arch/x86/include/acpi_machdep.h: revision 1.11
sys/dev/acpi/acpi.c: revision 1.255
sys/arch/x86/acpi/acpi_machdep.c: revision 1.4
sys/arch/x86/x86/mpacpi.c: revision 1.95
sys/arch/x86/x86/mpacpi.c: revision 1.96
sys/arch/ia64/acpi/acpi_machdep.c: revision 1.6
locate PCI buses and determine their bus numbers using the info
previously extracted from ACPICA rather than trying to figure it out again.
allow PCI buses that don't have a _PRT method.
as a workaround for PR 47016, call ioapic_reenable() at the end of
ACPI interrupt routing to fix the settings for the SCI interrupt.
the problem is that after my recent changes, the SCI handler is
installed before the MADT info is parsed, so we don't know what
polarity it should have. the real fix for this will be to rearrange
the ACPI initialization so that everything is done in a more sensible
order, but that will take some more time.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/ia64/acpi/acpi_machdep.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/ia64/include/acpi_machdep.h
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/arch/x86/acpi/acpi_machdep.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/x86/include/acpi_machdep.h
cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.252 -r1.252.6.1 src/sys/dev/acpi/acpi.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/ia64/acpi/acpi_machdep.c
diff -u src/sys/arch/ia64/acpi/acpi_machdep.c:1.5 src/sys/arch/ia64/acpi/acpi_machdep.c:1.5.8.1
--- src/sys/arch/ia64/acpi/acpi_machdep.c:1.5 Sun Jun 12 11:31:30 2011
+++ src/sys/arch/ia64/acpi/acpi_machdep.c Thu Nov 22 00:39:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.5 2011/06/12 11:31:30 jruoho Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.5.8.1 2012/11/22 00:39:01 riz Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
* All rights reserved.
@@ -28,7 +28,7 @@
* Machine-dependent routines for ACPICA.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.5 2011/06/12 11:31:30 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.5.8.1 2012/11/22 00:39:01 riz Exp $");
#include
@@ -189,7 +189,7 @@ acpi_md_ncpus(void)
}
void
-acpi_md_callback(void)
+acpi_md_callback(struct acpi_softc *sc)
{
/* Nothing. */
}
Index: src/sys/arch/ia64/include/acpi_machdep.h
diff -u src/sys/arch/ia64/include/acpi_machdep.h:1.5 src/sys/arch/ia64/include/acpi_machdep.h:1.5.8.1
--- src/sys/arch/ia64/include/acpi_machdep.h:1.5 Sun Jun 12 11:31:30 2011
+++ src/sys/arch/ia64/include/acpi_machdep.h Thu Nov 22 00:39:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.h,v 1.5 2011/06/12 11:31:30 jruoho Exp $ */
+/* $NetBSD: acpi_machdep.h,v 1.5.8.1 2012/11/22 00:39:00 riz Exp $ */
ACPI_STATUS acpi_md_OsInitialize(void);
ACPI_PHYSICAL_ADDRESS acpi_md_OsGetRootPointer(void);
@@ -28,4 +28,5 @@ void acpi_md_OsDisableInterrupt(void);
int acpi_md_sleep(int);
uint32_t acpi_md_pdc(void);
uint32_t acpi_md_ncpus(void);
-void acpi_md_callback(void);
+struct acpi_softc;
+void acpi_md_callback(struct acpi_softc *);
Index: src/sys/arch/x86/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.3 src/sys/arch/x86/acpi/acpi_machdep.c:1.3.2.1
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.3 Mon Jan 30 21:47:24 2012
+++ src/sys/arch/x86/acpi/acpi_machdep.c Thu Nov 22 00:39:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.3 2012/01/30 21:47:24 rmind Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.3.2.1 2012/11/22 00:39:00 riz Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.3 2012/01/30 21:47:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.3.2.1 2012/11/22 00:39:00 riz Exp $");
#include
#include
@@ -283,12 +283,12 @@ acpi_md_ncpus(void)
}
void
-acpi_md_callback(void)
+acpi_md_callback(struct acpi_softc *sc)
{
#ifdef MPBIOS
if (!mpbios_scanned)
#endif
- mpacpi_find_interrupts(acpi_softc);
+ mpacpi_find_interrupts(sc);
#ifndef XEN
acpi_md_sleep_init();
Index: src/sys/arch/x86/include/acpi_machdep.h
diff -u src/sys/arch/x86/include/acpi_machdep.h:1.10 src/sys/arch/x86/include/acpi_machdep.h:1.10.8.1
--- src/sys/arch/x86/include/acpi_machdep.h:1.10 Sun Jun 12 11:31:31 2011
+++ src/sys/arch/x86/
CVS commit: src/crypto/external/bsd/netpgp/dist/src/libverify
Module Name:src
Committed By: agc
Date: Thu Nov 22 00:38:45 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libverify: pgpsum.c
Log Message:
Fix some lint
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c:1.2 src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c:1.2 Tue Nov 20 05:26:26 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/pgpsum.c Thu Nov 22 00:38:45 2012
@@ -36,6 +36,10 @@
#include "digest.h"
#include "pgpsum.h"
+#ifndef USE_ARG
+#define USE_ARG(x) /*LINTED*/(void)&(x)
+#endif
+
/* add the ascii armor line endings (except for last line) */
static size_t
don_armor(digest_t *hash, uint8_t *in, size_t insize, int doarmor)
@@ -103,7 +107,7 @@ already_armored(uint8_t *in, size_t insi
/* calculate the checksum for the data we have */
static int
-calcsum(uint8_t *out, size_t size, const char *name, uint8_t *mem, size_t cc, const uint8_t *hashed, size_t hashsize, int doarmor)
+calcsum(uint8_t *out, size_t size, uint8_t *mem, size_t cc, const uint8_t *hashed, size_t hashsize, int doarmor)
{
digest_t hash;
uint32_t len32;
@@ -111,6 +115,7 @@ calcsum(uint8_t *out, size_t size, const
uint8_t hashalg;
uint8_t trailer[6];
+ USE_ARG(size);
/* hashed data is non-null (previously checked) */
hashalg = hashed[3];
memcpy(&len16, &hashed[4], sizeof(len16));
@@ -122,7 +127,7 @@ calcsum(uint8_t *out, size_t size, const
#ifdef NETPGPV_DEBUG
writefile(mem, cc);
#endif
- digest_init(&hash, hashalg);
+ digest_init(&hash, (const unsigned)hashalg);
if (strchr("tw", doarmor) != NULL && !already_armored(mem, cc)) {
/* this took me ages to find - something causes gpg to truncate its input */
don_armor(&hash, mem, cc - 1, doarmor);
@@ -166,7 +171,7 @@ pgpv_digest_file(uint8_t *data, size_t s
warn("%s - can't mmap", name);
goto done;
}
- ret = calcsum(data, size, name, mem, cc, hashed, hashsize, doarmor);
+ ret = calcsum(data, size, mem, cc, hashed, hashsize, doarmor);
done:
if (data) {
munmap(mem, cc);
@@ -183,5 +188,5 @@ pgpv_digest_memory(uint8_t *data, size_t
fprintf(stderr, "no hashed data provided\n");
return 0;
}
- return calcsum(data, size, "[memory]", mem, cc, hashed, hashsize, doarmor);
+ return calcsum(data, size, mem, cc, hashed, hashsize, doarmor);
}
CVS commit: src/crypto/external/bsd/netpgp/dist/src/libbn
Module Name:src
Committed By: agc
Date: Thu Nov 22 00:37:56 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libbn: bignum.c
Log Message:
Fix some lint - from Havard Eidnes
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.3 src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.4
--- src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c:1.3 Tue Nov 20 17:57:40 2012
+++ src/crypto/external/bsd/netpgp/dist/src/libbn/bignum.c Thu Nov 22 00:37:55 2012
@@ -500,7 +500,7 @@ mp_clear (mp_int * a)
}
/* free ram */
-netpgp_deallocate(a->dp, a->alloc);
+netpgp_deallocate(a->dp, (size_t)a->alloc);
/* reset members to make debugging easier */
a->dp= NULL;
@@ -4789,6 +4789,7 @@ mp_cnt_lsb(mp_int *a)
if ((q & 1) == 0) {
do {
qq = q & 15;
+ /* LINTED previous op ensures range of qq */
x += lnz[qq];
q >>= 4;
} while (qq == 0);
@@ -5064,6 +5065,7 @@ mp_toradix_n(mp_int * a, char *str, int
mp_clear (&t);
return res;
}
+/* LINTED -- radix' range is checked above, limits d's range */
*str++ = mp_s_rmap[d];
++digs;
}
@@ -5089,9 +5091,9 @@ formatbn(const BIGNUM *a, const int radi
if (mp_radix_size(__UNCONST(a), radix, &len) != MP_OKAY) {
return NULL;
}
- if ((s = netpgp_allocate(1, len)) != NULL) {
+ if ((s = netpgp_allocate(1, (size_t)len)) != NULL) {
if (mp_toradix_n(__UNCONST(a), s, radix, len) != MP_OKAY) {
- netpgp_deallocate(s, len);
+ netpgp_deallocate(s, (size_t)len);
return NULL;
}
}
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Nov 22 00:34:59 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 682. To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-6.0.1 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.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.16 src/doc/CHANGES-6.0.1:1.1.2.17 --- src/doc/CHANGES-6.0.1:1.1.2.16 Tue Nov 20 23:30:33 2012 +++ src/doc/CHANGES-6.0.1 Thu Nov 22 00:34:59 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.16 2012/11/20 23:30:33 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.17 2012/11/22 00:34:59 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -146,3 +146,8 @@ share/zoneinfo/southamerica patch Various fixes to documentation and commentary. [apb, ticket #677] +sys/dev/acpi/acpi_pci_link.c 1.19 + + Fix PCI interrupts on some systems. + [chs, ticket #682] +
CVS commit: [netbsd-6-0] src/sys/dev/acpi
Module Name:src Committed By: riz Date: Thu Nov 22 00:34:44 UTC 2012 Modified Files: src/sys/dev/acpi [netbsd-6-0]: acpi_pci_link.c Log Message: Pull up following revision(s) (requested by chs in ticket #682): sys/dev/acpi/acpi_pci_link.c: revision 1.19 re-enable the code to disable link devices at startup, ie. revert rev 1.3. this fixes PCI interrupts on some systems (eg. HP XW9400) and we suspect that the problems which led to the original change were caused by buggy early implementations of ACPI, which are now ignored by date. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/dev/acpi/acpi_pci_link.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/acpi/acpi_pci_link.c diff -u src/sys/dev/acpi/acpi_pci_link.c:1.18 src/sys/dev/acpi/acpi_pci_link.c:1.18.20.1 --- src/sys/dev/acpi/acpi_pci_link.c:1.18 Fri Apr 23 15:52:26 2010 +++ src/sys/dev/acpi/acpi_pci_link.c Thu Nov 22 00:34:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $ */ +/* $NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $ */ /*- * Copyright (c) 2002 Mitsuru IWASAKI @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $"); #include #include @@ -533,13 +533,11 @@ acpi_pci_link_attach(struct acpi_pci_lin * run _DIS (i.e., the method doesn't exist), assume the initial * IRQ was routed by the BIOS. */ -#if 0 /* XXX causes spontaneaous resets on some systems. Disabled for now. */ if (ACPI_SUCCESS(AcpiEvaluateObject(sc->pl_handle, "_DIS", NULL, NULL))) for (i = 0; i < sc->pl_num_links; i++) sc->pl_links[i].l_irq = PCI_INVALID_IRQ; else -#endif for (i = 0; i < sc->pl_num_links; i++) if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq)) sc->pl_links[i].l_routed = TRUE;
CVS commit: [netbsd-6] src/sys/dev/acpi
Module Name:src Committed By: riz Date: Thu Nov 22 00:34:25 UTC 2012 Modified Files: src/sys/dev/acpi [netbsd-6]: acpi_pci_link.c Log Message: Pull up following revision(s) (requested by chs in ticket #682): sys/dev/acpi/acpi_pci_link.c: revision 1.19 re-enable the code to disable link devices at startup, ie. revert rev 1.3. this fixes PCI interrupts on some systems (eg. HP XW9400) and we suspect that the problems which led to the original change were caused by buggy early implementations of ACPI, which are now ignored by date. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.14.1 src/sys/dev/acpi/acpi_pci_link.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/acpi/acpi_pci_link.c diff -u src/sys/dev/acpi/acpi_pci_link.c:1.18 src/sys/dev/acpi/acpi_pci_link.c:1.18.14.1 --- src/sys/dev/acpi/acpi_pci_link.c:1.18 Fri Apr 23 15:52:26 2010 +++ src/sys/dev/acpi/acpi_pci_link.c Thu Nov 22 00:34:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $ */ +/* $NetBSD: acpi_pci_link.c,v 1.18.14.1 2012/11/22 00:34:25 riz Exp $ */ /*- * Copyright (c) 2002 Mitsuru IWASAKI @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18.14.1 2012/11/22 00:34:25 riz Exp $"); #include #include @@ -533,13 +533,11 @@ acpi_pci_link_attach(struct acpi_pci_lin * run _DIS (i.e., the method doesn't exist), assume the initial * IRQ was routed by the BIOS. */ -#if 0 /* XXX causes spontaneaous resets on some systems. Disabled for now. */ if (ACPI_SUCCESS(AcpiEvaluateObject(sc->pl_handle, "_DIS", NULL, NULL))) for (i = 0; i < sc->pl_num_links; i++) sc->pl_links[i].l_irq = PCI_INVALID_IRQ; else -#endif for (i = 0; i < sc->pl_num_links; i++) if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq)) sc->pl_links[i].l_routed = TRUE;
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Thu Nov 22 00:27:55 UTC 2012
Modified Files:
src/sys/arch/amiga/conf [netbsd-6]: files.amiga
src/sys/dev/ic [netbsd-6]: dp8390reg.h
Added Files:
src/sys/arch/amiga/dev [netbsd-6]: if_ed_zbus.c
Removed Files:
src/sys/arch/amiga/dev [netbsd-6]: if_ed.c if_edreg.h
Log Message:
Pull up following revision(s) (requested by phx in ticket #681):
sys/arch/amiga/dev/if_edreg.h: file removal
sys/dev/ic/dp8390reg.h: revision 1.9
sys/arch/amiga/conf/files.amiga: revision 1.161
sys/arch/amiga/dev/if_ed_zbus.c: revision 1.1
sys/arch/amiga/dev/if_ed_zbus.c: revision 1.2
sys/arch/amiga/dev/if_ed.c: file removal
New ed(4) device driver for Hydra and ASDG Zorro2 bus network cards.
This driver is based on the MI dp8390 backend.
Fixed receiving of odd-length packets. Driver works now perfectly.
Thanks to Harald Meinzer for providing me with a Hydra for a few days.
ed_ring structure is no longer needed for compatibility, as the last
device driver using it (amiga/ed(4)) has been converted now.
To generate a diff of this commit:
cvs rdiff -u -r1.154.2.1 -r1.154.2.2 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r1.62 -r0 src/sys/arch/amiga/dev/if_ed.c
cvs rdiff -u -r0 -r1.2.6.2 src/sys/arch/amiga/dev/if_ed_zbus.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/amiga/dev/if_edreg.h
cvs rdiff -u -r1.8 -r1.8.116.1 src/sys/dev/ic/dp8390reg.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/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.154.2.1 src/sys/arch/amiga/conf/files.amiga:1.154.2.2
--- src/sys/arch/amiga/conf/files.amiga:1.154.2.1 Thu Nov 22 00:23:35 2012
+++ src/sys/arch/amiga/conf/files.amiga Thu Nov 22 00:27:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.154.2.1 2012/11/22 00:23:35 riz Exp $
+# $NetBSD: files.amiga,v 1.154.2.2 2012/11/22 00:27:54 riz Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -221,8 +221,8 @@ file arch/amiga/dev/if_ne_zbus.c ne_zbus
# Hydra ethernet card
device ed: ifnet, ether, arp
-attach ed at zbus with ed_zbus
-file arch/amiga/dev/if_ed.c ed_zbus needs-flag
+attach ed at zbus with ed_zbus: dp8390nic
+file arch/amiga/dev/if_ed_zbus.c ed_zbus needs-flag
# C=/Ameristar A2060 / 560
attach bah at zbus with bah_zbus
Index: src/sys/dev/ic/dp8390reg.h
diff -u src/sys/dev/ic/dp8390reg.h:1.8 src/sys/dev/ic/dp8390reg.h:1.8.116.1
--- src/sys/dev/ic/dp8390reg.h:1.8 Sun Dec 11 12:21:26 2005
+++ src/sys/dev/ic/dp8390reg.h Thu Nov 22 00:27:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390reg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ */
+/* $NetBSD: dp8390reg.h,v 1.8.116.1 2012/11/22 00:27:54 riz Exp $ */
/*
* National Semiconductor DS8390 NIC register definitions.
@@ -542,21 +542,6 @@ struct dp8390_ring {
};
/*
- * XXX For compatibility only! This needs to die when all drivers have
- * been converted to be front ends to the MI driver.
- */
-struct ed_ring {
-#if BYTE_ORDER == BIG_ENDIAN
- u_char next_packet; /* pointer to next packet */
- u_char rsr; /* receiver status */
-#else
- u_char rsr; /* receiver status */
- u_char next_packet; /* pointer to next packet */
-#endif
- u_short count; /* bytes in packet (length + 4) */
-};
-
-/*
* Common constants
*/
#define ED_PAGE_SIZE 256 /* Size of RAM pages in bytes */
Added files:
Index: src/sys/arch/amiga/dev/if_ed_zbus.c
diff -u /dev/null src/sys/arch/amiga/dev/if_ed_zbus.c:1.2.6.2
--- /dev/null Thu Nov 22 00:27:55 2012
+++ src/sys/arch/amiga/dev/if_ed_zbus.c Thu Nov 22 00:27:54 2012
@@ -0,0 +1,343 @@
+/* $NetBSD: if_ed_zbus.c,v 1.2.6.2 2012/11/22 00:27:54 riz Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Frank Wille.
+ *
+ * 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, PROCUREM
CVS commit: [netbsd-6] src/sys/arch/amiga
Module Name:src
Committed By: riz
Date: Thu Nov 22 00:23:35 UTC 2012
Modified Files:
src/sys/arch/amiga/conf [netbsd-6]: files.amiga
src/sys/arch/amiga/dev [netbsd-6]: grf_cv3d.c
Log Message:
Pull up following revision(s) (requested by phx in ticket #680):
sys/arch/amiga/dev/grf_cv3d.c: revision 1.27
sys/arch/amiga/conf/files.amiga: revision 1.162
CV3DONZORRO2 option is no longer needed.
grf_cv3d.c was successfully tested running in a Zorro2 slot.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.154.2.1 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/amiga/dev/grf_cv3d.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.154 src/sys/arch/amiga/conf/files.amiga:1.154.2.1
--- src/sys/arch/amiga/conf/files.amiga:1.154 Tue Jan 24 00:19:39 2012
+++ src/sys/arch/amiga/conf/files.amiga Thu Nov 22 00:23:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.154 2012/01/24 00:19:39 rkujawa Exp $
+# $NetBSD: files.amiga,v 1.154.2.1 2012/11/22 00:23:35 riz Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -18,7 +18,6 @@ defflag opt_amigaccgrf.h USE_C_BFOPS
defflag opt_amigacons.h RETINACONSOLE ULOWELLCONSOLE CL5426CONSOLE
defflag opt_amigacons.h CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
-defflag opt_amigacons.h CV3DONZORRO2
defflag opt_amigacons.h SERCONSOLE
defflag opt_kfont.h KFONT_CONS_ISO8859_1
Index: src/sys/arch/amiga/dev/grf_cv3d.c
diff -u src/sys/arch/amiga/dev/grf_cv3d.c:1.26 src/sys/arch/amiga/dev/grf_cv3d.c:1.26.2.1
--- src/sys/arch/amiga/dev/grf_cv3d.c:1.26 Thu Dec 15 14:25:13 2011
+++ src/sys/arch/amiga/dev/grf_cv3d.c Thu Nov 22 00:23:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cv3d.c,v 1.26 2011/12/15 14:25:13 phx Exp $ */
+/* $NetBSD: grf_cv3d.c,v 1.26.2.1 2012/11/22 00:23:35 riz Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.26 2011/12/15 14:25:13 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.26.2.1 2012/11/22 00:23:35 riz Exp $");
#include "ite.h"
#include "wsdisplay.h"
@@ -406,12 +406,6 @@ grfcv3dmatch(struct device *pdp, struct
if (zap->manid != 8512 || zap->prodid != 67)
return (0);
-#ifndef CV3DONZORRO2
- if (!cv3d_zorroIII) {
- return (0);
- }
-#endif
-
cv3d_boardaddr = zap->va;
#ifdef CV3DCONSOLE
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: jakllsch
Date: Wed Nov 21 23:11:24 UTC 2012
Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_alloc.c ext2fs_balloc.c
ext2fs_extern.h ext2fs_inode.c ext2fs_readwrite.c ext2fs_vfsops.c
ext2fs_vnops.c
Log Message:
Write support for the Ext4 Read-only Compatible Feature "huge_file".
Primarily, this feature extends the inode block count field to 48 bits.
Additionally, this feature allows this field to be represented in file
system block size units rather than DEV_BSIZE units.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.42 -r1.43 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.34 -r1.35 src/sys/ufs/ext2fs/ext2fs_balloc.c
cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.75 -r1.76 src/sys/ufs/ext2fs/ext2fs_inode.c
cvs rdiff -u -r1.61 -r1.62 src/sys/ufs/ext2fs/ext2fs_readwrite.c
cvs rdiff -u -r1.166 -r1.167 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.104 -r1.105 src/sys/ufs/ext2fs/ext2fs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.32 src/sys/ufs/ext2fs/ext2fs.h:1.33
--- src/sys/ufs/ext2fs/ext2fs.h:1.32 Wed Nov 21 20:45:35 2012
+++ src/sys/ufs/ext2fs/ext2fs.h Wed Nov 21 23:11:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.h,v 1.32 2012/11/21 20:45:35 jakllsch Exp $ */
+/* $NetBSD: ext2fs.h,v 1.33 2012/11/21 23:11:23 jakllsch Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -265,7 +265,8 @@ struct m_ext2fs {
*/
#define EXT2F_COMPAT_SUPP 0x
#define EXT2F_ROCOMPAT_SUPP (EXT2F_ROCOMPAT_SPARSESUPER \
- | EXT2F_ROCOMPAT_LARGEFILE)
+ | EXT2F_ROCOMPAT_LARGEFILE \
+ | EXT2F_ROCOMPAT_HUGE_FILE)
#define EXT2F_INCOMPAT_SUPP EXT2F_INCOMPAT_FTYPE
/*
Index: src/sys/ufs/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.42 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.43
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.42 Sun Mar 6 04:46:26 2011
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c Wed Nov 21 23:11:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_alloc.c,v 1.42 2011/03/06 04:46:26 rmind Exp $ */
+/* $NetBSD: ext2fs_alloc.c,v 1.43 2012/11/21 23:11:23 jakllsch Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.42 2011/03/06 04:46:26 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.43 2012/11/21 23:11:23 jakllsch Exp $");
#include
#include
@@ -135,7 +135,7 @@ ext2fs_alloc(struct inode *ip, daddr_t l
bno = (daddr_t)ext2fs_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
ext2fs_alloccg);
if (bno > 0) {
- ip->i_e2fs_nblock += btodb(fs->e2fs_bsize);
+ ext2fs_setnblock(ip, ext2fs_nblock(ip) + btodb(fs->e2fs_bsize));
ip->i_flag |= IN_CHANGE | IN_UPDATE;
*bnp = bno;
return (0);
Index: src/sys/ufs/ext2fs/ext2fs_balloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_balloc.c:1.34 src/sys/ufs/ext2fs/ext2fs_balloc.c:1.35
--- src/sys/ufs/ext2fs/ext2fs_balloc.c:1.34 Mon Oct 19 18:41:17 2009
+++ src/sys/ufs/ext2fs/ext2fs_balloc.c Wed Nov 21 23:11:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_balloc.c,v 1.34 2009/10/19 18:41:17 bouyer Exp $ */
+/* $NetBSD: ext2fs_balloc.c,v 1.35 2012/11/21 23:11:23 jakllsch Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_balloc.c,v 1.34 2009/10/19 18:41:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_balloc.c,v 1.35 2012/11/21 23:11:23 jakllsch Exp $");
#if defined(_KERNEL_OPT)
#include "opt_uvmhist.h"
@@ -343,7 +343,7 @@ fail:
}
}
if (deallocated) {
- ip->i_e2fs_nblock -= btodb(deallocated);
+ ext2fs_setnblock(ip, ext2fs_nblock(ip) - btodb(deallocated));
ip->i_e2fs_flags |= IN_CHANGE | IN_UPDATE;
}
return error;
Index: src/sys/ufs/ext2fs/ext2fs_extern.h
diff -u src/sys/ufs/ext2fs/ext2fs_extern.h:1.45 src/sys/ufs/ext2fs/ext2fs_extern.h:1.46
--- src/sys/ufs/ext2fs/ext2fs_extern.h:1.45 Sat Nov 17 16:03:48 2012
+++ src/sys/ufs/ext2fs/ext2fs_extern.h Wed Nov 21 23:11:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_extern.h,v 1.45 2012/11/17 16:03:48 jakllsch Exp $ */
+/* $NetBSD: ext2fs_extern.h,v 1.46 2012/11/21 23:11:23 jakllsch Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -110,6 +110,8 @@ int ext2fs_bmap(void *);
/* ext2fs_inode.c */
uint64_t ext2fs_size(struct inode *);
int ext2fs_setsize(struct inode *, uint64_t);
+uint64_t ext2fs_nblock(struct inode *);
+int ext2fs_setnblock(struct inode *, uint64_t);
int ext2fs_update(struct vnode *, const struct timespec *,
const struct timespec *, int);
int ext2fs_truncate(struct vnode *, off_t, int, kauth_cred_t);
Index: src/sys/ufs/ext2fs/ext2fs_inode.c
diff -u src/sys/ufs/ext2fs/ext2fs_inode.c:1.75 src/sys/ufs/ext2fs/ext2fs_inode.c:1.76
--- src/sys/ufs/ext2fs/ext2fs_inode
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: rkujawa Date: Wed Nov 21 22:37:03 UTC 2012 Modified Files: src/sys/arch/amiga/dev: wdc_xsurf.c Log Message: Remove confusing comment, misc style. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/wdc_xsurf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/dev/wdc_xsurf.c diff -u src/sys/arch/amiga/dev/wdc_xsurf.c:1.1 src/sys/arch/amiga/dev/wdc_xsurf.c:1.2 --- src/sys/arch/amiga/dev/wdc_xsurf.c:1.1 Mon Nov 19 22:36:11 2012 +++ src/sys/arch/amiga/dev/wdc_xsurf.c Wed Nov 21 22:37:03 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: wdc_xsurf.c,v 1.1 2012/11/19 22:36:11 rkujawa Exp $ */ +/* $NetBSD: wdc_xsurf.c,v 1.2 2012/11/21 22:37:03 rkujawa Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -135,9 +135,7 @@ wdc_xsurf_attach(device_t parent, device sc->sc_wdcdev.sc_atac.atac_channels = sc->sc_chanarray; sc->sc_wdcdev.sc_atac.atac_cap = ATAC_CAP_DATA16; sc->sc_wdcdev.wdc_maxdrives = 2; - /* This controller has no aux control registers! - But just pretenting that they don't exist might not work, - consider using WDC_NO_IDS and turning it into flag... */ + /* this controller has no aux control registers */ sc->sc_wdcdev.cap = WDC_CAPABILITY_NO_AUXCTL; /* attach the channels */
CVS commit: src/sys/arch/amiga/conf
Module Name:src Committed By: rkujawa Date: Wed Nov 21 22:35:19 UTC 2012 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC INSTALL Log Message: Regen kernel configs. To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.291 -r1.292 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.111 -r1.112 src/sys/arch/amiga/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.160 src/sys/arch/amiga/conf/DRACO:1.161 --- src/sys/arch/amiga/conf/DRACO:1.160 Mon Nov 19 22:40:24 2012 +++ src/sys/arch/amiga/conf/DRACO Wed Nov 21 22:35:19 2012 @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.160 2012/11/19 22:40:24 rkujawa Exp $ +# $NetBSD: DRACO,v 1.161 2012/11/21 22:35:19 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.105 2012/11/19 22:39:47 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.106 2012/11/21 22:33:50 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.160 $" +#ident "GENERIC-$Revision: 1.161 $" maxusers 8 @@ -306,8 +306,7 @@ qn* at zbus0 # Quicknet xsurf* at zbus0 # X-Surf ne* at xsurfbus? # NE2000 chip on X-Surf gencp* at xsurfbus? # clockports on X-Surf -#wdc* at xsurfbus? # IDE on X-Surf -#options WDC_NO_IDS +wdc* at xsurfbus? # IDE on X-Surf clockport* at gencp? # Arcnet Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.291 src/sys/arch/amiga/conf/GENERIC:1.292 --- src/sys/arch/amiga/conf/GENERIC:1.291 Mon Nov 19 22:40:24 2012 +++ src/sys/arch/amiga/conf/GENERIC Wed Nov 21 22:35:19 2012 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.291 2012/11/19 22:40:24 rkujawa Exp $ +# $NetBSD: GENERIC,v 1.292 2012/11/21 22:35:19 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.105 2012/11/19 22:39:47 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.106 2012/11/21 22:33:50 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.291 $" +#ident "GENERIC-$Revision: 1.292 $" maxusers 8 @@ -386,8 +386,7 @@ qn* at zbus0 # Quicknet xsurf* at zbus0 # X-Surf ne* at xsurfbus? # NE2000 chip on X-Surf gencp* at xsurfbus? # clockports on X-Surf -#wdc* at xsurfbus? # IDE on X-Surf -#options WDC_NO_IDS +wdc* at xsurfbus? # IDE on X-Surf clockport* at gencp? # Arcnet Index: src/sys/arch/amiga/conf/INSTALL diff -u src/sys/arch/amiga/conf/INSTALL:1.111 src/sys/arch/amiga/conf/INSTALL:1.112 --- src/sys/arch/amiga/conf/INSTALL:1.111 Mon Nov 19 22:40:24 2012 +++ src/sys/arch/amiga/conf/INSTALL Wed Nov 21 22:35:19 2012 @@ -1,9 +1,9 @@ -# $NetBSD: INSTALL,v 1.111 2012/11/19 22:40:24 rkujawa Exp $ +# $NetBSD: INSTALL,v 1.112 2012/11/21 22:35:19 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.105 2012/11/19 22:39:47 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.106 2012/11/21 22:33:50 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.111 $" +#ident "GENERIC-$Revision: 1.112 $" makeoptions COPTS="-Os" @@ -327,8 +327,7 @@ qn* at zbus0 # Quicknet xsurf* at zbus0 # X-Surf ne* at xsurfbus? # NE2000 chip on X-Surf gencp* at xsurfbus? # clockports on X-Surf -#wdc* at xsurfbus? # IDE on X-Surf -#options WDC_NO_IDS +wdc* at xsurfbus? # IDE on X-Surf clockport* at gencp? # Arcnet
CVS commit: src/sys/arch/amiga/conf
Module Name:src Committed By: rkujawa Date: Wed Nov 21 22:33:50 UTC 2012 Modified Files: src/sys/arch/amiga/conf: GENERIC.in Log Message: Enable wdc at xsurf, remove WDC_NO_IDS (phx@ confirmed it's not needed). To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/arch/amiga/conf/GENERIC.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.105 src/sys/arch/amiga/conf/GENERIC.in:1.106 --- src/sys/arch/amiga/conf/GENERIC.in:1.105 Mon Nov 19 22:39:47 2012 +++ src/sys/arch/amiga/conf/GENERIC.in Wed Nov 21 22:33:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.105 2012/11/19 22:39:47 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.106 2012/11/21 22:33:50 rkujawa Exp $ # ## # GENERIC machine description file @@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.105 $" +#ident "GENERIC-$Revision: 1.106 $" m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS="-Os" @@ -466,8 +466,7 @@ qn* at zbus0 # Quicknet xsurf* at zbus0 # X-Surf ne* at xsurfbus? # NE2000 chip on X-Surf gencp* at xsurfbus? # clockports on X-Surf -#wdc* at xsurfbus? # IDE on X-Surf -#options WDC_NO_IDS +wdc* at xsurfbus? # IDE on X-Surf clockport* at gencp? # Arcnet
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: jakllsch
Date: Wed Nov 21 20:45:36 UTC 2012
Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_dinode.h
Log Message:
Add various newer Ext2 superblock feature bits and inode flag bits.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.24 -r1.25 src/sys/ufs/ext2fs/ext2fs_dinode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.31 src/sys/ufs/ext2fs/ext2fs.h:1.32
--- src/sys/ufs/ext2fs/ext2fs.h:1.31 Mon Nov 19 03:04:23 2012
+++ src/sys/ufs/ext2fs/ext2fs.h Wed Nov 21 20:45:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.h,v 1.31 2012/11/19 03:04:23 jakllsch Exp $ */
+/* $NetBSD: ext2fs.h,v 1.32 2012/11/21 20:45:35 jakllsch Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -205,7 +205,7 @@ struct m_ext2fs {
#define EXT2F_COMPAT_DIRHASHINDEX 0x0020
#define EXT2F_COMPAT_BITS \
"\20" \
-"\06COMPAT_DIRHASHINDEX" \
+ "\06COMPAT_DIRHASHINDEX" \
"\05COMPAT_RESIZE" \
"\04COMPAT_EXTATTR" \
"\03COMPAT_HASJOURNAL" \
@@ -215,8 +215,16 @@ struct m_ext2fs {
#define EXT2F_ROCOMPAT_SPARSESUPER 0x0001
#define EXT2F_ROCOMPAT_LARGEFILE 0x0002
#define EXT2F_ROCOMPAT_BTREE_DIR 0x0004
+#define EXT2F_ROCOMPAT_HUGE_FILE 0x0008
+#define EXT2F_ROCOMPAT_GDT_CSUM 0x0010
+#define EXT2F_ROCOMPAT_DIR_NLINK 0x0020
+#define EXT2F_ROCOMPAT_EXTRA_ISIZE 0x0040
#define EXT2F_ROCOMPAT_BITS \
"\20" \
+ "\07ROCOMPAT_EXTRA_ISIZE" \
+ "\06ROCOMPAT_DIR_NLINK" \
+ "\05ROCOMPAT_GDT_CSUM" \
+ "\04ROCOMPAT_HUGE_FILE" \
"\03ROCOMPAT_BTREE_DIR" \
"\02ROCOMPAT_LARGEFILE" \
"\01ROCOMPAT_SPARSESUPER"
@@ -225,8 +233,18 @@ struct m_ext2fs {
#define EXT2F_INCOMPAT_FTYPE 0x0002
#define EXT2F_INCOMPAT_REPLAY_JOURNAL 0x0004
#define EXT2F_INCOMPAT_USES_JOURNAL 0x0008
+#define EXT2F_INCOMPAT_META_BG 0x0010
+#define EXT2F_INCOMPAT_EXTENTS 0x0040
+#define EXT2F_INCOMPAT_64BIT 0x0080
+#define EXT2F_INCOMPAT_MMP 0x0100
+#define EXT2F_INCOMPAT_FLEX_BG 0x0200
#define EXT2F_INCOMPAT_BITS \
"\20" \
+ "\012INCOMPAT_FLEX_BG" \
+ "\011INCOMPAT_MMP" \
+ "\010INCOMPAT_64BIT" \
+ "\07INCOMPAT_EXTENTS" \
+ "\05INCOMPAT_META_BG" \
"\04INCOMPAT_USES_JOURNAL" \
"\03INCOMPAT_REPLAY_JOURNAL" \
"\02INCOMPAT_FTYPE" \
Index: src/sys/ufs/ext2fs/ext2fs_dinode.h
diff -u src/sys/ufs/ext2fs/ext2fs_dinode.h:1.24 src/sys/ufs/ext2fs/ext2fs_dinode.h:1.25
--- src/sys/ufs/ext2fs/ext2fs_dinode.h:1.24 Mon Nov 19 00:36:21 2012
+++ src/sys/ufs/ext2fs/ext2fs_dinode.h Wed Nov 21 20:45:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_dinode.h,v 1.24 2012/11/19 00:36:21 jakllsch Exp $ */
+/* $NetBSD: ext2fs_dinode.h,v 1.25 2012/11/21 20:45:36 jakllsch Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -145,13 +145,23 @@ struct ext2fs_dinode {
#define EXT2_IFSOCK 014 /* UNIX domain socket. */
/* file flags */
-#define EXT2_SECRM 0x0001 /* Secure deletion */
-#define EXT2_UNRM 0x0002 /* Undelete */
-#define EXT2_COMPR 0x0004 /* Compress file */
-#define EXT2_SYNC 0x0008 /* Synchronous updates */
-#define EXT2_IMMUTABLE 0x0010 /* Immutable file */
+#define EXT2_SECRM 0x0001 /* Secure deletion */
+#define EXT2_UNRM 0x0002 /* Undelete */
+#define EXT2_COMPR 0x0004 /* Compress file */
+#define EXT2_SYNC 0x0008 /* Synchronous updates */
+#define EXT2_IMMUTABLE 0x0010 /* Immutable file */
#define EXT2_APPEND 0x0020 /* writes to file may only append */
-#define EXT2_NODUMP 0x0040 /* do not dump file */
+#define EXT2_NODUMP 0x0040 /* do not dump file */
+#define EXT2_NOATIME 0x0080 /* do not update atime */
+#define EXT2_INDEX 0x1000 /* hash-indexed directory */
+#define EXT2_IMAGIC 0x2000 /* AFS directory */
+#define EXT2_JOURNAL_DATA 0x4000 /* file data should be journaled */
+#define EXT2_NOTAIL 0x8000 /* file tail should not be merged */
+#define EXT2_DIRSYNC 0x0001 /* dirsync behaviour */
+#define EXT2_TOPDIR 0x0002 /* Top of directory hierarchies*/
+#define EXT2_HUGE_FILE 0x0004 /* Set to each huge file */
+#define EXT2_EXTENTS 0x0008 /* Inode uses extents */
+#define EXT2_EOFBLOCKS 0x0040 /* Blocks allocated beyond EOF */
/* Size of on-disk inode. */
#define EXT2_REV0_DINODE_SIZE sizeof(struct ext2fs_dinode)
CVS commit: src/share/mk
Module Name:src
Committed By: pooka
Date: Wed Nov 21 20:30:01 UTC 2012
Modified Files:
src/share/mk: bsd.gcc.mk
Log Message:
unrevert previous. i can't figure out how to make the build break with
the change anymore, so assume it was a sunspot.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/mk/bsd.gcc.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.gcc.mk
diff -u src/share/mk/bsd.gcc.mk:1.6 src/share/mk/bsd.gcc.mk:1.7
--- src/share/mk/bsd.gcc.mk:1.6 Wed Nov 21 18:45:08 2012
+++ src/share/mk/bsd.gcc.mk Wed Nov 21 20:30:01 2012
@@ -1,13 +1,17 @@
-# $NetBSD: bsd.gcc.mk,v 1.6 2012/11/21 18:45:08 pooka Exp $
+# $NetBSD: bsd.gcc.mk,v 1.7 2012/11/21 20:30:01 pooka Exp $
.if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1
.if defined(EXTERNAL_TOOLCHAIN)
_GCC_CRTBEGIN!= ${CC} --print-file-name=crtbegin.o
+.ifndef _GCC_CRTBEGINS
_GCC_CRTBEGINS!= ${CC} --print-file-name=crtbeginS.o
+.endif
_GCC_CRTEND!= ${CC} --print-file-name=crtend.o
+.ifndef _GCC_CRTENDS
_GCC_CRTENDS!= ${CC} --print-file-name=crtendS.o
+.endif
_GCC_CRTI!= ${CC} --print-file-name=crti.o
_GCC_CRTN!= ${CC} --print-file-name=crtn.o
_GCC_CRTDIR!= dirname ${_GCC_CRTBEGIN}
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Wed Nov 21 19:39:39 UTC 2012 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv7.S Log Message: Always supply all registers (don't make one implicit). To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm/cpufunc_asm_armv7.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/cpufunc_asm_armv7.S diff -u src/sys/arch/arm/arm/cpufunc_asm_armv7.S:1.10 src/sys/arch/arm/arm/cpufunc_asm_armv7.S:1.11 --- src/sys/arch/arm/arm/cpufunc_asm_armv7.S:1.10 Sun Oct 21 09:25:16 2012 +++ src/sys/arch/arm/arm/cpufunc_asm_armv7.S Wed Nov 21 19:39:39 2012 @@ -48,8 +48,8 @@ ENTRY(armv7_context_switch) dsb@ data synchronization barrier mrc p15, 0, r2, c0, c0, 5 @ get MPIDR cmp r2, #0 - orrlt r0, #0x5b @ MP, cachable (Normal WB) - orrge r0, #0x1b @ Non-MP, cacheable, normal WB + orrlt r0, r0, #0x5b @ MP, cachable (Normal WB) + orrge r0, r0, #0x1b @ Non-MP, cacheable, normal WB mcr p15, 0, r0, c2, c0, 0 @ set the new TTB #ifdef MULTIPROCESSOR mcr p15, 0, r0, c8, c3, 0 @ flush the I+D @@ -76,8 +76,8 @@ END(armv7_tlb_flushID_SE) ENTRY_NP(armv7_setttb) mrc p15, 0, r2, c0, c0, 5 @ get MPIDR cmp r2, #0 - orrlt r0, #0x5b @ MP, cachable (Normal WB) - orrge r0, #0x1b @ Non-MP, cacheable, normal WB + orrlt r0, r0, #0x5b @ MP, cachable (Normal WB) + orrge r0, r0, #0x1b @ Non-MP, cacheable, normal WB mcr p15, 0, r0, c2, c0, 0 @ load new TTB cmp r1, #0 #ifdef MULTIPROCESSOR
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Wed Nov 21 19:38:37 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: locore.S
Log Message:
Fix missing registers (don't make then implicit).
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm32/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/locore.S
diff -u src/sys/arch/arm/arm32/locore.S:1.29 src/sys/arch/arm/arm32/locore.S:1.30
--- src/sys/arch/arm/arm32/locore.S:1.29 Thu Sep 27 21:28:13 2012
+++ src/sys/arch/arm/arm32/locore.S Wed Nov 21 19:38:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.29 2012/09/27 21:28:13 matt Exp $ */
+/* $NetBSD: locore.S,v 1.30 2012/11/21 19:38:36 matt Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -42,7 +42,7 @@
/* What size should this really be ? It is only used by init_arm() */
#define INIT_ARM_STACK_SIZE 2048
- RCSID("$NetBSD: locore.S,v 1.29 2012/09/27 21:28:13 matt Exp $")
+ RCSID("$NetBSD: locore.S,v 1.30 2012/11/21 19:38:36 matt Exp $")
/*
* This is for kvm_mkdb, and should be the address of the beginning
@@ -155,9 +155,9 @@ ENTRY_NP(cpu_reset)
* Hurl ourselves into the ROM
*/
mrc p15, 0, r0, c1, c0, 0
- bic r0, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE)
- bic r0, #(CPU_CONTROL_IC_ENABLE)
- orr r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE)
+ bic r0, r0, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE)
+ bic r0, r0, #(CPU_CONTROL_IC_ENABLE)
+ orr r0, r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE)
mcr p15, 0, r0, c1, c0, 0
mcreq p15, 0, r2, c8, c7, 0 /* nail I+D TLB on ARMv4 and greater */
mov pc, r4
CVS commit: src/usr.bin/su
Module Name:src Committed By: pgoyette Date: Wed Nov 21 19:30:53 UTC 2012 Modified Files: src/usr.bin/su: su.1 Log Message: Note that 'su -l' does not update utmp and related databases. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/usr.bin/su/su.1 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/su/su.1 diff -u src/usr.bin/su/su.1:1.49 src/usr.bin/su/su.1:1.50 --- src/usr.bin/su/su.1:1.49 Mon May 18 09:37:44 2009 +++ src/usr.bin/su/su.1 Wed Nov 21 19:30:53 2012 @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)su.1 8.2 (Berkeley) 4/18/94 -.\" $NetBSD: su.1,v 1.49 2009/05/18 09:37:44 wiz Exp $ +.\" $NetBSD: su.1,v 1.50 2012/11/21 19:30:53 pgoyette Exp $ .\" -.Dd October 27, 2007 +.Dd November 20, 2012 .Dt SU 1 .Os .Sh NAME @@ -186,6 +186,12 @@ is imported from your current environmen The invoked shell is the target login's, and .Nm will change directory to the target login's home directory. +The +.Xr utmp 5 , +.Xr wtmp 5 , +and +.Xr lastlogin 5 +databases are not updated. .It Fl Same as .Fl l .
CVS commit: src/lib/libpthread
Module Name:src
Committed By: christos
Date: Wed Nov 21 19:19:25 UTC 2012
Modified Files:
src/lib/libpthread: pthread_int.h pthread_specific.c pthread_tsd.c
Log Message:
Replace the simple implementation of pthread_key_{create,destroy}
and pthread_{g,s}etspecific functions, to one that invalidates
values of keys in other threads when pthread_key_delete() is called.
This fixes chromium, which expects pthread_key_delete() to do
cleanup in all threads.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.23 -r1.24 src/lib/libpthread/pthread_specific.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libpthread/pthread_tsd.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/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.87 src/lib/libpthread/pthread_int.h:1.88
--- src/lib/libpthread/pthread_int.h:1.87 Sat Nov 3 19:42:27 2012
+++ src/lib/libpthread/pthread_int.h Wed Nov 21 14:19:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.87 2012/11/03 23:42:27 rmind Exp $ */
+/* $NetBSD: pthread_int.h,v 1.88 2012/11/21 19:19:24 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -148,7 +148,10 @@ struct __pthread_st {
/* Thread-specific data. Large so it sits close to the end. */
int pt_havespecific;
- void *pt_specific[PTHREAD_KEYS_MAX];
+ struct pt_specific {
+ void *pts_value;
+ PTQ_ENTRY(pt_specific) pts_next;
+ } pt_specific[PTHREAD_KEYS_MAX];
/*
* Context for thread creation. At the end as it's cached
@@ -295,6 +298,7 @@ char *pthread__getenv(const char *) PTHR
__dead void pthread__cancelled(void) PTHREAD_HIDE;
void pthread__mutex_deferwake(pthread_t, pthread_mutex_t *) PTHREAD_HIDE;
int pthread__checkpri(int) PTHREAD_HIDE;
+int pthread__add_specific(pthread_t, pthread_key_t, const void *) PTHREAD_HIDE;
#ifndef pthread__smt_pause
#define pthread__smt_pause() /* nothing */
Index: src/lib/libpthread/pthread_specific.c
diff -u src/lib/libpthread/pthread_specific.c:1.23 src/lib/libpthread/pthread_specific.c:1.24
--- src/lib/libpthread/pthread_specific.c:1.23 Wed Sep 12 10:55:48 2012
+++ src/lib/libpthread/pthread_specific.c Wed Nov 21 14:19:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_specific.c,v 1.23 2012/09/12 14:55:48 matt Exp $ */
+/* $NetBSD: pthread_specific.c,v 1.24 2012/11/21 19:19:24 christos Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread_specific.c,v 1.23 2012/09/12 14:55:48 matt Exp $");
+__RCSID("$NetBSD: pthread_specific.c,v 1.24 2012/11/21 19:19:24 christos Exp $");
/* Functions and structures dealing with thread-specific data */
@@ -62,18 +62,14 @@ pthread_setspecific(pthread_key_t key, c
* and return it from functions that are const void *, without
* generating a warning.
*/
- /*LINTED const cast*/
- self->pt_specific[key] = (void *) value;
- self->pt_havespecific = 1;
-
- return 0;
+ return pthread__add_specific(self, key, value);
}
void *
pthread_getspecific(pthread_key_t key)
{
- return pthread__self()->pt_specific[key];
+ return pthread__self()->pt_specific[key].pts_value;
}
unsigned int
Index: src/lib/libpthread/pthread_tsd.c
diff -u src/lib/libpthread/pthread_tsd.c:1.8 src/lib/libpthread/pthread_tsd.c:1.9
--- src/lib/libpthread/pthread_tsd.c:1.8 Fri Mar 2 13:11:53 2012
+++ src/lib/libpthread/pthread_tsd.c Wed Nov 21 14:19:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_tsd.c,v 1.8 2012/03/02 18:11:53 joerg Exp $ */
+/* $NetBSD: pthread_tsd.c,v 1.9 2012/11/21 19:19:24 christos Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: pthread_tsd.c,v 1.8 2012/03/02 18:11:53 joerg Exp $");
+__RCSID("$NetBSD: pthread_tsd.c,v 1.9 2012/11/21 19:19:24 christos Exp $");
/* Functions and structures dealing with thread-specific data */
#include
@@ -38,14 +38,23 @@ __RCSID("$NetBSD: pthread_tsd.c,v 1.8 20
#include "pthread.h"
#include "pthread_int.h"
+
static pthread_mutex_t tsd_mutex = PTHREAD_MUTEX_INITIALIZER;
static int nextkey;
-void *pthread__tsd_alloc[PTHREAD_KEYS_MAX];
+
+PTQ_HEAD(pthread__tsd_list, pt_specific)
+pthread__tsd_list[PTHREAD_KEYS_MAX];
void (*pthread__tsd_destructors[PTHREAD_KEYS_MAX])(void *);
__strong_alias(__libc_thr_keycreate,pthread_key_create)
__strong_alias(__libc_thr_keydelete,pthread_key_delete)
+static void
+/*ARGSUSED*/
+null_destructor(void *p)
+{
+}
+
int
pthread_key_create(pthread_key_t *key, void (*destructor)(void *))
{
@@ -54,10 +63,14 @@ pthread_key_create(pthread_key_t *key, v
/* Get a lock on the allocation list */
pthread_mutex_lock(&tsd_mutex);
- /* Find an available slot */
+ /* Find an available slot:
+ * The condition for an available slot is one with the destructor
+ * not
CVS commit: src/share/mk
Module Name:src
Committed By: pooka
Date: Wed Nov 21 18:45:09 UTC 2012
Modified Files:
src/share/mk: bsd.gcc.mk
Log Message:
revert previous, seems to upset the build in a creative way
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/mk/bsd.gcc.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.gcc.mk
diff -u src/share/mk/bsd.gcc.mk:1.5 src/share/mk/bsd.gcc.mk:1.6
--- src/share/mk/bsd.gcc.mk:1.5 Wed Nov 21 18:09:10 2012
+++ src/share/mk/bsd.gcc.mk Wed Nov 21 18:45:08 2012
@@ -1,17 +1,13 @@
-# $NetBSD: bsd.gcc.mk,v 1.5 2012/11/21 18:09:10 pooka Exp $
+# $NetBSD: bsd.gcc.mk,v 1.6 2012/11/21 18:45:08 pooka Exp $
.if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1
.if defined(EXTERNAL_TOOLCHAIN)
_GCC_CRTBEGIN!= ${CC} --print-file-name=crtbegin.o
-.ifndef _GCC_CRTBEGINS
_GCC_CRTBEGINS!= ${CC} --print-file-name=crtbeginS.o
-.endif
_GCC_CRTEND!= ${CC} --print-file-name=crtend.o
-.ifndef _GCC_CRTENDS
_GCC_CRTENDS!= ${CC} --print-file-name=crtendS.o
-.endif
_GCC_CRTI!= ${CC} --print-file-name=crti.o
_GCC_CRTN!= ${CC} --print-file-name=crtn.o
_GCC_CRTDIR!= dirname ${_GCC_CRTBEGIN}
CVS commit: src/share/mk
Module Name:src
Committed By: pooka
Date: Wed Nov 21 18:09:10 UTC 2012
Modified Files:
src/share/mk: bsd.gcc.mk
Log Message:
Allow user override of _GCC_CRT{BEGIN,END}S.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/mk/bsd.gcc.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.gcc.mk
diff -u src/share/mk/bsd.gcc.mk:1.4 src/share/mk/bsd.gcc.mk:1.5
--- src/share/mk/bsd.gcc.mk:1.4 Thu Jul 19 19:42:45 2012
+++ src/share/mk/bsd.gcc.mk Wed Nov 21 18:09:10 2012
@@ -1,13 +1,17 @@
-# $NetBSD: bsd.gcc.mk,v 1.4 2012/07/19 19:42:45 christos Exp $
+# $NetBSD: bsd.gcc.mk,v 1.5 2012/11/21 18:09:10 pooka Exp $
.if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1
.if defined(EXTERNAL_TOOLCHAIN)
_GCC_CRTBEGIN!= ${CC} --print-file-name=crtbegin.o
+.ifndef _GCC_CRTBEGINS
_GCC_CRTBEGINS!= ${CC} --print-file-name=crtbeginS.o
+.endif
_GCC_CRTEND!= ${CC} --print-file-name=crtend.o
+.ifndef _GCC_CRTENDS
_GCC_CRTENDS!= ${CC} --print-file-name=crtendS.o
+.endif
_GCC_CRTI!= ${CC} --print-file-name=crti.o
_GCC_CRTN!= ${CC} --print-file-name=crtn.o
_GCC_CRTDIR!= dirname ${_GCC_CRTBEGIN}
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Wed Nov 21 17:53:10 UTC 2012
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Instead of maintaining an evergrowing list of -U's, leave that up
to an external script.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/rump/Makefile.rump
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.66 src/sys/rump/Makefile.rump:1.67
--- src/sys/rump/Makefile.rump:1.66 Wed Nov 21 17:51:42 2012
+++ src/sys/rump/Makefile.rump Wed Nov 21 17:53:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.66 2012/11/21 17:51:42 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.67 2012/11/21 17:53:10 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -59,9 +59,8 @@ CPPFLAGS+= -DLOCKDEBUG
#LDFLAGS+= -nodefaultlibs
# make sure __NetBSD__ gets defined (for builds on non-NetBSD)
-# aaand make sure cc doesn't source files any wild ideas
-CPPFLAGS+= -D__NetBSD__
-CPPFLAGS+= -Ulinux -U__linux -U__linux__ -U__gnu_linux__
+# also, give those builds a way to undef the local compiler's macros
+CPPFLAGS+= -D__NetBSD__ ${RUMPKERN_UNDEF}
RUMPKERNEL= This is NetBSD and I am the rump. Good evening.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Wed Nov 21 17:51:43 UTC 2012
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Don't duplicate arbitrary chunks of bsd.sys.mk in here (especially
-Wsign-compare, since that doesn't even work with the kernel, and was
just previously masked by -isystem). Reorder a bit too.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/rump/Makefile.rump
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/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.65 src/sys/rump/Makefile.rump:1.66
--- src/sys/rump/Makefile.rump:1.65 Wed Nov 21 17:48:05 2012
+++ src/sys/rump/Makefile.rump Wed Nov 21 17:51:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.65 2012/11/21 17:48:05 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.66 2012/11/21 17:51:42 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -15,22 +15,19 @@ CPPFLAGS+= -D_RUMPKERNEL
CPPFLAGS+= -D_RUMP_NATIVE_ABI
.endif
+CPPFLAGS+= -DMAXUSERS=32
+CPPFLAGS+= -DCOMPAT_50=1
+
+CPPFLAGS+= -nostdinc
CFLAGS+= -ffreestanding -fno-strict-aliasing
-.if (defined(HAVE_GCC) && ${HAVE_GCC} >= 3) || defined(HAVE_LLVM)
-CFLAGS+= -Wsign-compare
-CFLAGS+= -Wno-pointer-sign -Wno-attributes
-CFLAGS+= -std=gnu99
-.endif
+
CWARNFLAGS+= -Wno-format-zero-length -Wno-pointer-sign
CPPFLAGS+= -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
-CPPFLAGS+= -DMAXUSERS=32
-CPPFLAGS+= -DCOMPAT_50=1
CPPFLAGS+= -DDEBUGPRINT
CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
-CPPFLAGS+= -nostdinc
.ifdef NEED_ISYSTEM
CPPFLAGS+= -isystem ${RUMPTOP}/../arch
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Wed Nov 21 17:48:06 UTC 2012
Modified Files:
src/sys/modules/solaris: Makefile.solmod
src/sys/modules/zfs: Makefile.zfsmod
src/sys/rump: Makefile.rump
Log Message:
Don't unconditionally use the error-silencing magic of -isystem
(as opposed to -I) on every component, only the zfs ones depend on it
to build. Regular modules might benefit from a similar move.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/solaris/Makefile.solmod
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/zfs/Makefile.zfsmod
cvs rdiff -u -r1.64 -r1.65 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/solaris/Makefile.solmod
diff -u src/sys/modules/solaris/Makefile.solmod:1.3 src/sys/modules/solaris/Makefile.solmod:1.4
--- src/sys/modules/solaris/Makefile.solmod:1.3 Sat Feb 4 18:39:21 2012
+++ src/sys/modules/solaris/Makefile.solmod Wed Nov 21 17:48:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.solmod,v 1.3 2012/02/04 18:39:21 christos Exp $
+# $NetBSD: Makefile.solmod,v 1.4 2012/11/21 17:48:05 pooka Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -85,3 +85,5 @@ CPPFLAGS+= -std=c99
# CPPFLAGS+= -D_NFS_NFS_H_
# CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
CPPFLAGS+= -DDIAGNOSTIC
+
+NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.3 src/sys/modules/zfs/Makefile.zfsmod:1.4
--- src/sys/modules/zfs/Makefile.zfsmod:1.3 Sun Feb 5 18:46:05 2012
+++ src/sys/modules/zfs/Makefile.zfsmod Wed Nov 21 17:48:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.3 2012/02/05 18:46:05 christos Exp $
+# $NetBSD: Makefile.zfsmod,v 1.4 2012/11/21 17:48:05 pooka Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -128,3 +128,5 @@ CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
CPPFLAGS+= -DDIAGNOSTIC
# -DZFS_DEBUG
+
+NEED_ISYSTEM= # duplicate headers, depends on -isystem to build
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.64 src/sys/rump/Makefile.rump:1.65
--- src/sys/rump/Makefile.rump:1.64 Tue Nov 13 19:12:42 2012
+++ src/sys/rump/Makefile.rump Wed Nov 21 17:48:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.64 2012/11/13 19:12:42 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.65 2012/11/21 17:48:05 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -27,10 +27,19 @@ CPPFLAGS+= -DMAXUSERS=32
CPPFLAGS+= -DCOMPAT_50=1
CPPFLAGS+= -DDEBUGPRINT
CPPFLAGS+= -I${.CURDIR} -I.
-CPPFLAGS+= -I${RUMPTOP}/../../common/include -isystem ${RUMPTOP}/../arch
+CPPFLAGS+= -I${RUMPTOP}/../../common/include
CPPFLAGS+= -I${RUMPTOP}/include
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern/opt
-CPPFLAGS+= -nostdinc -isystem ${RUMPTOP}/..
+CPPFLAGS+= -nostdinc
+
+.ifdef NEED_ISYSTEM
+CPPFLAGS+= -isystem ${RUMPTOP}/../arch
+CPPFLAGS+= -isystem ${RUMPTOP}/..
+.else
+CPPFLAGS+= -I${RUMPTOP}/../arch
+CPPFLAGS+= -I${RUMPTOP}/..
+.endif
+
LDFLAGS+= -T ${RUMPTOP}/ldscript.rump
RUMP_DIAGNOSTIC?=yes
CVS commit: src
Module Name:src Committed By: pooka Date: Wed Nov 21 17:41:27 UTC 2012 Modified Files: src/lib/librumpuser: rumpuser_port.h src/sys/rump/include/rump: rump.h Log Message: export register_t to rump kernel users on solaris To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/librumpuser/rumpuser_port.h cvs rdiff -u -r1.54 -r1.55 src/sys/rump/include/rump/rump.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.4 src/lib/librumpuser/rumpuser_port.h:1.5 --- src/lib/librumpuser/rumpuser_port.h:1.4 Sun Nov 18 19:29:40 2012 +++ src/lib/librumpuser/rumpuser_port.h Wed Nov 21 17:41:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_port.h,v 1.4 2012/11/18 19:29:40 pooka Exp $ */ +/* $NetBSD: rumpuser_port.h,v 1.5 2012/11/21 17:41:27 pooka Exp $ */ /* * Portability header for non-NetBSD platforms. @@ -15,10 +15,6 @@ #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ -#ifdef __sun__ -typedef long register_t; -#endif - #ifdef __NetBSD__ #include #include @@ -168,4 +164,9 @@ posix_memalign(void **ptr, size_t align, #define MSG_NOSIGNAL 0 #endif +#if defined(__sun__) && !defined(RUMP_REGISTER_T) +#define RUMP_REGISTER_T long +typedef RUMP_REGISTER_T register_t; +#endif + #endif /* _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ */ Index: src/sys/rump/include/rump/rump.h diff -u src/sys/rump/include/rump/rump.h:1.54 src/sys/rump/include/rump/rump.h:1.55 --- src/sys/rump/include/rump/rump.h:1.54 Fri Jul 20 09:27:11 2012 +++ src/sys/rump/include/rump/rump.h Wed Nov 21 17:41:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.54 2012/07/20 09:27:11 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.55 2012/11/21 17:41:27 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -57,6 +57,11 @@ typedef struct prop_dictionary *prop_dic #endif #endif /* __NetBSD__ */ +#if defined(__sun__) && !defined(RUMP_REGISTER_T) +#define RUMP_REGISTER_T long +typedef RUMP_REGISTER_T register_t; +#endif + #include #include
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Wed Nov 21 17:36:18 UTC 2012
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/include/rump/rumpdefs.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/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.15 src/sys/rump/include/rump/rumpdefs.h:1.16
--- src/sys/rump/include/rump/rumpdefs.h:1.15 Sun Nov 18 21:20:16 2012
+++ src/sys/rump/include/rump/rumpdefs.h Wed Nov 21 17:36:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.15 2012/11/18 21:20:16 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.16 2012/11/21 17:36:17 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -8,21 +8,6 @@
#define _RUMP_RUMPDEFS_H_
#include
-#ifdef _KERNEL
-#include
-#else
-#include
-#endif
-
-struct rump_sockaddr_in {
- uint8_t sin_len;
- uint8_t sin_family;
- uint16_t sin_port;
- struct {
- uint32_t s_addr;
- } sin_addr;
- int8_t sin_zero[8];
-};
/* NetBSD: fcntl.h,v 1.42 2012/01/25 00:28:35 christos Exp */
#define RUMP_O_RDONLY 0x /* open for reading only */
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Wed Nov 21 17:35:21 UTC 2012
Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh
Log Message:
ok, rump_sockaddr_in was a pretty desperate kludge in the first place,
much better solved by syscall compat. but, now it's really time to let
it go since solaris thinks it's nice to define s_addr around any way
it likes.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/include/rump/makerumpdefs.sh
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/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.11 src/sys/rump/include/rump/makerumpdefs.sh:1.12
--- src/sys/rump/include/rump/makerumpdefs.sh:1.11 Sun Nov 18 21:19:52 2012
+++ src/sys/rump/include/rump/makerumpdefs.sh Wed Nov 21 17:35:21 2012
@@ -8,38 +8,17 @@ echo Generating rumpdefs.h
rm -f rumpdefs.h
exec > rumpdefs.h
-printf '/* $NetBSD: makerumpdefs.sh,v 1.11 2012/11/18 21:19:52 pooka Exp $ */\n\n'
+printf '/* $NetBSD: makerumpdefs.sh,v 1.12 2012/11/21 17:35:21 pooka Exp $ */\n\n'
printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n'
printf '#ifndef _RUMP_RUMPDEFS_H_\n'
printf '#define _RUMP_RUMPDEFS_H_\n\n'
printf '#include \n'
-printf '#ifdef _KERNEL\n'
-printf '#include \n'
-printf '#else\n'
-printf '#include \n'
-printf '#endif\n'
fromvers () {
echo
sed -n '1{s/\$//gp;q;}' $1
}
-# Odds of sockaddr_in changing are zero, so no acrobatics needed. Alas,
-# dealing with in_addr_t for s_addr is very difficult, so have it as
-# an incompatible uint32_t for now.
-echo
-cat <
CVS commit: src/share/man/man9
Module Name:src
Committed By: christos
Date: Wed Nov 21 17:18:11 UTC 2012
Modified Files:
src/share/man/man9: kprintf.9
Log Message:
document change in {,v}snprintf() behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/share/man/man9/kprintf.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/kprintf.9
diff -u src/share/man/man9/kprintf.9:1.31 src/share/man/man9/kprintf.9:1.32
--- src/share/man/man9/kprintf.9:1.31 Sun Jul 17 16:54:35 2011
+++ src/share/man/man9/kprintf.9 Wed Nov 21 12:18:11 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: kprintf.9,v 1.31 2011/07/17 20:54:35 joerg Exp $
+.\" $NetBSD: kprintf.9,v 1.32 2012/11/21 17:18:11 christos Exp $
.\"
.\" Copyright (c) 1998, 2002, 2007, 2011 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 21, 2011
+.Dd November 21, 2012
.Dt KPRINTF 9
.Os
.Sh NAME
@@ -250,9 +250,13 @@ The
.Fn snprintf
and
.Fn vsnprintf
-functions return the number of characters placed in the buffer
+functions return the number of characters that would have been placed
+in the buffer
.Fa buf .
-This is different to the user-space functions of the same name.
+if there was enough space in the buffer, not including the trailing
+.Dv NUL
+character used to terminate output strings like the user-space functions
+of the same name.
.Pp
The
.Fn tprintf_open
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed Nov 21 15:57:20 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Correct a typo: x86k->x68k. To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-6.1 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.1 diff -u src/doc/CHANGES-6.1:1.1.2.31 src/doc/CHANGES-6.1:1.1.2.32 --- src/doc/CHANGES-6.1:1.1.2.31 Tue Nov 20 23:31:09 2012 +++ src/doc/CHANGES-6.1 Wed Nov 21 15:57:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.31 2012/11/20 23:31:09 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.32 2012/11/21 15:57:20 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -512,7 +512,7 @@ sys/arch/x68k/stand/xxboot/xxboot_ffsv2/ sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile 1.1 sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile 1.1 - Update x86k bootloader: cdboot, netboot support, and bugfixes. + Update x68k bootloader: cdboot, netboot support, and bugfixes. [tsutsui, ticket #645] sys/dev/ic/mfi.c1.48
CVS commit: src/sys/rump/net/lib/libnpf
Module Name:src
Committed By: pooka
Date: Wed Nov 21 11:03:13 UTC 2012
Modified Files:
src/sys/rump/net/lib/libnpf: Makefile
Log Message:
This component is not WARNS>3 clean (example: it includes socketvar.h
which does signed-unsigned comparison in an inline function). Why it
compiled at all is one of those marvels of compiler technology.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnpf/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/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.2 src/sys/rump/net/lib/libnpf/Makefile:1.3
--- src/sys/rump/net/lib/libnpf/Makefile:1.2 Sun Sep 16 13:47:42 2012
+++ src/sys/rump/net/lib/libnpf/Makefile Wed Nov 21 11:03:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/09/16 13:47:42 rmind Exp $
+# $NetBSD: Makefile,v 1.3 2012/11/21 11:03:13 pooka Exp $
#
# Public Domain.
#
@@ -19,8 +19,6 @@ SRCS+= npf_ext_log.c npf_ext_normalise.c
SRCS+= component.c
-WARNS= 5
-
CPPFLAGS+= -D_NPF_TESTING
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
CVS commit: [matt-nb6-plus] src/gnu/dist/gcc4/gcc/config/arm
Module Name:src
Committed By: matt
Date: Wed Nov 21 08:54:21 UTC 2012
Modified Files:
src/gnu/dist/gcc4/gcc/config/arm [matt-nb6-plus]: arm-cores.def arm.c
Log Message:
Let gcc match -march=armv7a and -mcpu=cortex-a[89].
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.46.1 \
src/gnu/dist/gcc4/gcc/config/arm/arm-cores.def
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.30.1 src/gnu/dist/gcc4/gcc/config/arm/arm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/config/arm/arm-cores.def
diff -u src/gnu/dist/gcc4/gcc/config/arm/arm-cores.def:1.1.1.1 src/gnu/dist/gcc4/gcc/config/arm/arm-cores.def:1.1.1.1.46.1
--- src/gnu/dist/gcc4/gcc/config/arm/arm-cores.def:1.1.1.1 Thu Apr 20 09:50:55 2006
+++ src/gnu/dist/gcc4/gcc/config/arm/arm-cores.def Wed Nov 21 08:54:21 2012
@@ -115,3 +115,7 @@ ARM_CORE("arm1176jz-s", arm1176jzs, 6Z
ARM_CORE("arm1176jzf-s", arm1176jzfs, 6ZK, FL_LDSCHED | FL_VFPV2, 9e)
ARM_CORE("mpcorenovfp", mpcorenovfp, 6K, FL_LDSCHED, 9e)
ARM_CORE("mpcore", mpcore, 6K, FL_LDSCHED | FL_VFPV2, 9e)
+
+/* V7 Architecture Processors */
+ARM_CORE("cortex-a8", cortexa8, 7A, FL_LDSCHED | FL_VFPV2, 9e)
+ARM_CORE("cortex-a9", cortexa9, 7A, FL_LDSCHED | FL_VFPV2, 9e)
Index: src/gnu/dist/gcc4/gcc/config/arm/arm.c
diff -u src/gnu/dist/gcc4/gcc/config/arm/arm.c:1.1.1.4 src/gnu/dist/gcc4/gcc/config/arm/arm.c:1.1.1.4.30.1
--- src/gnu/dist/gcc4/gcc/config/arm/arm.c:1.1.1.4 Sat Feb 2 22:48:58 2008
+++ src/gnu/dist/gcc4/gcc/config/arm/arm.c Wed Nov 21 08:54:21 2012
@@ -433,6 +433,7 @@ static int thumb_call_reg_needed;
#define FL_WBUF (1 << 14) /* Schedule for write buffer ops.
Note: ARM6 & 7 derivatives only. */
#define FL_ARCH6K (1 << 15) /* Architecture rel 6 K extensions. */
+#define FL_ARCH7A (1 << 16) /* Architecture rel 7. */
#define FL_IWMMXT (1 << 29) /* XScale v2 or "Intel Wireless MMX technology". */
@@ -451,6 +452,7 @@ static int thumb_call_reg_needed;
#define FL_FOR_ARCH6K (FL_FOR_ARCH6 | FL_ARCH6K)
#define FL_FOR_ARCH6Z FL_FOR_ARCH6
#define FL_FOR_ARCH6ZK FL_FOR_ARCH6K
+#define FL_FOR_ARCH7A (FL_ARCH7A | FL_FOR_ARCH6K)
/* The bits in this mask specify which
instructions we are allowed to generate. */
@@ -484,6 +486,9 @@ int arm_arch6 = 0;
/* Nonzero if this chip supports the ARM 6K extensions. */
int arm_arch6k = 0;
+/* Nonzero if this chip supports the ARM Architecutre 7 extensions. */
+int arm_arch7 = 0;
+
/* Nonzero if this chip can benefit from load scheduling. */
int arm_ld_sched = 0;
@@ -596,6 +601,7 @@ static const struct processors all_archi
{"armv6k", mpcore, "6K", FL_CO_PROC | FL_FOR_ARCH6K, NULL},
{"armv6z", arm1176jzs, "6Z", FL_CO_PROC | FL_FOR_ARCH6Z, NULL},
{"armv6zk", arm1176jzs, "6ZK", FL_CO_PROC | FL_FOR_ARCH6ZK, NULL},
+ {"armv7a", cortexa8, "7A", FL_CO_PROC | FL_FOR_ARCH7A, NULL},
{"ep9312", ep9312, "4T", FL_LDSCHED | FL_CIRRUS | FL_FOR_ARCH4, NULL},
{"iwmmxt", iwmmxt, "5TE", FL_LDSCHED | FL_STRONG | FL_FOR_ARCH5TE | FL_XSCALE | FL_IWMMXT , NULL},
{NULL, arm_none, NULL, 0 , NULL}
@@ -1100,6 +1106,7 @@ arm_override_options (void)
arm_arch5e = (insn_flags & FL_ARCH5E) != 0;
arm_arch6 = (insn_flags & FL_ARCH6) != 0;
arm_arch6k = (insn_flags & FL_ARCH6K) != 0;
+ arm_arch7 = (insn_flags & FL_ARCH7A) != 0;
arm_arch_xscale = (insn_flags & FL_XSCALE) != 0;
arm_arch_cirrus = (insn_flags & FL_CIRRUS) != 0;
CVS commit: [matt-nb6-plus] src/gnu/dist/binutils
Module Name:src
Committed By: matt
Date: Wed Nov 21 08:52:09 UTC 2012
Modified Files:
src/gnu/dist/binutils/gas/config [matt-nb6-plus]: tc-arm.c
src/gnu/dist/binutils/include/opcode [matt-nb6-plus]: arm.h
src/gnu/dist/binutils/opcodes [matt-nb6-plus]: arm-dis.c
Log Message:
Teach binutils (gas) just enough to handle some armv7 instructions
(dsb, dmb, isb, bfc, bfi, sbfx, ubfx) and the .arch pseudo-op.
To generate a diff of this commit:
cvs rdiff -u -r1.6.6.2 -r1.6.6.3 src/gnu/dist/binutils/gas/config/tc-arm.c
cvs rdiff -u -r1.2.6.2 -r1.2.6.3 src/gnu/dist/binutils/include/opcode/arm.h
cvs rdiff -u -r1.2.6.2 -r1.2.6.3 src/gnu/dist/binutils/opcodes/arm-dis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/binutils/gas/config/tc-arm.c
diff -u src/gnu/dist/binutils/gas/config/tc-arm.c:1.6.6.2 src/gnu/dist/binutils/gas/config/tc-arm.c:1.6.6.3
--- src/gnu/dist/binutils/gas/config/tc-arm.c:1.6.6.2 Tue Nov 20 18:41:50 2012
+++ src/gnu/dist/binutils/gas/config/tc-arm.c Wed Nov 21 08:52:09 2012
@@ -6746,6 +6746,186 @@ do_swi (char * str)
}
static void
+do_dsb (char * str)
+{
+ skip_whitespace (str);
+ /* Allow optional leading '#'. */
+ if (is_immediate_prefix (*str))
+str++;
+
+ end_of_line (str);
+}
+
+static void
+do_bfci (char * str)
+{
+ expressionS expr;
+ unsigned long lsb;
+ unsigned long width;
+ int reg;
+
+ skip_whitespace (str);
+
+ if ((reg = reg_required_here (&str, 12)) == FAIL
+ || skip_past_comma (&str) == FAIL)
+return;
+
+ if (reg == REG_PC)
+{
+ inst.error = BAD_PC;
+ return;
+}
+
+ if ((inst.instruction & 0xf) == 0)
+{
+ if ((reg == reg_required_here (&str, 0)) == FAIL
+ || skip_past_comma (&str) == FAIL)
+ return;
+
+ if (reg == REG_PC)
+ {
+ inst.error = BAD_PC;
+ return;
+ }
+}
+
+ if (is_immediate_prefix (*str))
+str++;
+ else
+{
+ inst.error = _("immediate expression expected");
+ return;
+}
+
+ if (my_get_expression (&expr, &str))
+return;
+
+ if (expr.X_op != O_constant)
+{
+ inst.error = _("constant expression expected");
+ return FAIL;
+}
+
+ lsb = expr.X_add_number;
+ if (lsb > 31)
+{
+ inst.error = _("invalid lsb");
+ return;
+}
+
+ if (skip_past_comma (&str) == FAIL)
+return;
+
+ if (is_immediate_prefix (*str))
+str++;
+ else
+{
+ inst.error = _("immediate expression expected");
+ return;
+}
+
+ if (my_get_expression (&expr, &str))
+return;
+
+ if (expr.X_op != O_constant)
+{
+ inst.error = _("constant expression expected");
+ return FAIL;
+}
+
+ width = expr.X_add_number;
+ if (lsb + width > 32 || width > 32 || width == 0)
+{
+ if (!inst.error)
+inst.error = _("invalid width");
+ return;
+}
+
+ inst.instruction |= (lsb << 7);
+ inst.instruction |= (lsb + width - 1) << 16;
+
+ end_of_line (str);
+}
+
+static void
+do_bfx (char * str)
+{
+ expressionS expr;
+ unsigned long lsb;
+ unsigned long width;
+ int rd, rn;
+
+ skip_whitespace (str);
+
+ if ((rd = reg_required_here (&str, 12)) == FAIL
+ || skip_past_comma (&str) == FAIL
+ || (rn = reg_required_here (&str, 0)) == FAIL
+ || skip_past_comma (&str) == FAIL)
+{
+ inst.error = BAD_ARGS;
+ return;
+}
+ else if (rd == REG_PC || rn == REG_PC)
+{
+ inst.error = BAD_PC;
+ return;
+}
+
+ if (is_immediate_prefix (*str))
+str++;
+ else
+{
+ inst.error = _("immediate expression expected");
+ return;
+}
+
+ if (my_get_expression (&expr, &str))
+return;
+
+ if (expr.X_op != O_constant)
+{
+ inst.error = _("constant expression expected");
+ return FAIL;
+}
+
+ lsb = expr.X_add_number;
+ if (lsb > 31)
+{
+ inst.error = _("invalid lsb");
+ return;
+}
+
+ if (skip_past_comma (&str) == FAIL)
+{
+ inst.error = BAD_ARGS;
+ return;
+}
+
+ if (is_immediate_prefix (*str))
+str++;
+ else
+{
+ inst.error = _("immediate expression expected");
+ return;
+}
+
+ if (my_get_expression (&expr, &str))
+return;
+
+ width = expr.X_add_number;
+ if (lsb + width > 32 || width > 32 || width == 0)
+{
+ inst.error = _("invalid width");
+ return;
+}
+
+ inst.instruction |= (lsb << 7);
+ inst.instruction |= (width - 1) << 16;
+
+ end_of_line (str);
+}
+
+static void
do_swap (char * str)
{
int reg;
@@ -10014,6 +10194,15 @@ static const struct asm_opcode insns[] =
/* ARM V6Z. */
{ "smi", 0xe1600070, 3, ARM_EXT_V6Z, do_smi},
+ /* ARM V7A. */
+ { "dmb", 0xf57ff05f, 0, ARM_EXT_V7A, do_dsb},
+ { "dsb", 0xf57ff04f, 0, ARM_EXT_V7A, do_dsb},
+ { "isb", 0xf57ff06f, 0, ARM_EXT_V7A, do_dsb},
+ { "sbfx", 0xe7a00050, 4, ARM_EXT_V7A, do_bfx},
+ { "bfi
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: skrll
Date: Wed Nov 21 08:47:13 UTC 2012
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_tmr.c
Log Message:
Fix delay.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_tmr.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/arm/broadcom/bcm2835_tmr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.1 src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.2
--- src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.1 Thu Jul 26 06:21:57 2012
+++ src/sys/arch/arm/broadcom/bcm2835_tmr.c Wed Nov 21 08:47:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_tmr.c,v 1.1 2012/07/26 06:21:57 skrll Exp $ */
+/* $NetBSD: bcm2835_tmr.c,v 1.2 2012/11/21 08:47:13 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.1 2012/07/26 06:21:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.2 2012/11/21 08:47:13 skrll Exp $");
#include
#include
@@ -159,22 +159,19 @@ delay(unsigned int n)
uint32_t delta, usecs;
KASSERT(sc != NULL);
- int nhloops = 0;
last = bus_space_read_4(sc->sc_iot, sc->sc_ioh, BCM2835_STIMER_CLO);
delta = usecs = 0;
while (n > usecs) {
- if (nhloops++ > 0x10) Debugger();
curr = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
BCM2835_STIMER_CLO);
- /* XXXNH !?!?!?!?!?!?! - use CHI? */
/* Check to see if the timer has wrapped around. */
if (curr < last)
- delta += (last + (counts_per_hz - curr));
+ delta += curr + (UINT32_MAX - last);
else
- delta += (last - curr);
+ delta += curr - last;
last = curr;
CVS commit: src/sys/arch/arm/marvell
Module Name:src
Committed By: msaitoh
Date: Wed Nov 21 08:03:18 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: mvsocgpp.c
Log Message:
Fix a uvm_fault panic that memory is not allocated for the last few GPIO bits.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/marvell/mvsocgpp.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/arm/marvell/mvsocgpp.c
diff -u src/sys/arch/arm/marvell/mvsocgpp.c:1.4 src/sys/arch/arm/marvell/mvsocgpp.c:1.5
--- src/sys/arch/arm/marvell/mvsocgpp.c:1.4 Mon Sep 10 08:50:37 2012
+++ src/sys/arch/arm/marvell/mvsocgpp.c Wed Nov 21 08:03:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsocgpp.c,v 1.4 2012/09/10 08:50:37 msaitoh Exp $ */
+/* $NetBSD: mvsocgpp.c,v 1.5 2012/11/21 08:03:18 msaitoh Exp $ */
/*
* Copyright (c) 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mvsocgpp.c,v 1.4 2012/09/10 08:50:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsocgpp.c,v 1.5 2012/11/21 08:03:18 msaitoh Exp $");
#include "gpio.h"
@@ -168,7 +168,8 @@ mvsocgpp_attach(device_t parent, device_
MVSOCGPP_WRITE(sc, MVSOCGPP_GPIOIC(i), 0);
sc->sc_pic =
- kmem_zalloc(sizeof(struct mvsocgpp_pic) * gpp_npins / 8, KM_SLEEP);
+ kmem_zalloc(sizeof(struct mvsocgpp_pic) * howmany(gpp_npins, 8),
+ KM_SLEEP);
for (i = 0, j = 0; i < gpp_npins; i += 8, j++) {
gpio_pic = &(sc->sc_pic + j)->gpio_pic;
gpio_pic->pic_ops = &gpio_pic_ops;
