CVS commit: src/sys/sys
Module Name:src Committed By: msaitoh Date: Wed Dec 5 08:05:54 UTC 2012 Modified Files: src/sys/sys: proc.h Log Message: sys/proc.h refers sizeof(struct pcb), so include . To generate a diff of this commit: cvs rdiff -u -r1.317 -r1.318 src/sys/sys/proc.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/proc.h diff -u src/sys/sys/proc.h:1.317 src/sys/sys/proc.h:1.318 --- src/sys/sys/proc.h:1.317 Sun Jul 22 22:40:18 2012 +++ src/sys/sys/proc.h Wed Dec 5 08:05:54 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.317 2012/07/22 22:40:18 rmind Exp $ */ +/* $NetBSD: proc.h,v 1.318 2012/12/05 08:05:54 msaitoh Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -75,6 +75,7 @@ #endif #include /* Machine-dependent proc substruct */ +#include #include #include #include
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: wiz Date: Wed Dec 5 08:56:55 UTC 2012 Modified Files: src/sbin/cgdconfig: cgdconfig.8 Log Message: Whitespace. New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sbin/cgdconfig/cgdconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/cgdconfig/cgdconfig.8 diff -u src/sbin/cgdconfig/cgdconfig.8:1.32 src/sbin/cgdconfig/cgdconfig.8:1.33 --- src/sbin/cgdconfig/cgdconfig.8:1.32 Wed Dec 5 02:23:20 2012 +++ src/sbin/cgdconfig/cgdconfig.8 Wed Dec 5 08:56:54 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: cgdconfig.8,v 1.32 2012/12/05 02:23:20 christos Exp $ +.\" $NetBSD: cgdconfig.8,v 1.33 2012/12/05 08:56:54 wiz Exp $ .\" .\" Copyright (c) 2002, The NetBSD Foundation, Inc. .\" All rights reserved. @@ -178,7 +178,8 @@ a disk volume with meaningless data prio .It urandomkey The method simply reads .Pa /dev/urandom -and uses the resulting bits as the key. This is similar to the +and uses the resulting bits as the key. +This is similar to the .Pa randomkey method, but it guarantees that cgdconfig will not stall waiting for hard-random bits (useful when configuring a cgd for swap at boot time). @@ -355,7 +356,7 @@ sequence of commands that is recommended .Pp To scrub data from a disk before setting up a cgd: .Bd -literal - # cgdconfig -s cgd0 /dev/sd0e aes-cbc 256 < /dev/urandom + # cgdconfig -s cgd0 /dev/sd0e aes-cbc 256 < /dev/urandom # dd if=/dev/zero of=/dev/rcgd0d bs=32k progress=512 # cgdconfig -u cgd0 .Ed
CVS commit: src/doc
Module Name:src Committed By: spz Date: Wed Dec 5 08:57:53 UTC 2012 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: note the bind update To generate a diff of this commit: cvs rdiff -u -r1.983 -r1.984 src/doc/3RDPARTY cvs rdiff -u -r1.1761 -r1.1762 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.983 src/doc/3RDPARTY:1.984 --- src/doc/3RDPARTY:1.983 Wed Nov 28 09:43:16 2012 +++ src/doc/3RDPARTY Wed Dec 5 08:57:53 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.983 2012/11/28 09:43:16 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.984 2012/12/05 08:57:53 spz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -110,8 +110,8 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.9.1-P2 -Current Vers: 9.9.1-P2 +Version: 9.9.2-P1 +Current Vers: 9.9.2-P1 Maintainer: Paul Vixie Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1761 src/doc/CHANGES:1.1762 --- src/doc/CHANGES:1.1761 Mon Nov 26 00:23:53 2012 +++ src/doc/CHANGES Wed Dec 5 08:57:53 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1761 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1762 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -145,3 +145,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: xsurf(4): Add X-Surf IDE controller support. [rkujawa 20121119] z3rambd(4): Add driver for Zorro III RAM boards as block devices. [rkujawa 20121126] + bind: update to 9.9.2-P1 to fix the DNS64 vulnerability. + [spz 20121204]
CVS commit: src/sbin/sysctl
Module Name:src
Committed By: christos
Date: Wed Dec 5 13:53:39 UTC 2012
Modified Files:
src/sbin/sysctl: sysctl.c
Log Message:
fix bug found by clang.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sbin/sysctl/sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.146 src/sbin/sysctl/sysctl.c:1.147
--- src/sbin/sysctl/sysctl.c:1.146 Sat Dec 1 10:30:16 2012
+++ src/sbin/sysctl/sysctl.c Wed Dec 5 08:53:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.146 2012/12/01 15:30:16 christos Exp $ */
+/* $NetBSD: sysctl.c,v 1.147 2012/12/05 13:53:39 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.146 2012/12/01 15:30:16 christos Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.147 2012/12/05 13:53:39 christos Exp $");
#endif
#endif /* not lint */
@@ -2722,7 +2722,7 @@ bitmask_scan(const void *v, uint32_t *o)
char *s = strdup(v);
if (s == NULL)
err(1, "");
- __BITMAP_ZERO(o);
+
for (s = strtok(s, ","); s; s = strtok(NULL, ",")) {
char *e;
errno = 0;
@@ -2749,6 +2749,7 @@ reserve(HANDLER_ARGS)
osz = sizeof(o);
if (value) {
+ __BITMAP_ZERO(n);
bitmask_scan(value, n);
value = (char *)n;
nsz = sizeof(n);
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Wed Dec 5 16:19:47 UTC 2012
Modified Files:
src/sys/arch/i386/conf: GENERIC
src/sys/arch/x86/pci: files.pci
src/sys/dev/pci: pcidevs
Added Files:
src/sys/arch/x86/pci: tcpcib.c
Log Message:
Intel Atom E600 PCI-LPC bridge, adds a watchdog + HPET support. Tested
on a Soekris net6501. (jmcneill)
To generate a diff of this commit:
cvs rdiff -u -r1.1082 -r1.1083 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/pci/tcpcib.c
cvs rdiff -u -r1.1144 -r1.1145 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1082 src/sys/arch/i386/conf/GENERIC:1.1083
--- src/sys/arch/i386/conf/GENERIC:1.1082 Wed Oct 17 10:48:13 2012
+++ src/sys/arch/i386/conf/GENERIC Wed Dec 5 11:19:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1082 2012/10/17 14:48:13 apb Exp $
+# $NetBSD: GENERIC,v 1.1083 2012/12/05 16:19:46 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1082 $"
+#ident "GENERIC-$Revision: 1.1083 $"
maxusers 64 # estimated number of users
@@ -457,6 +457,8 @@ ichlpcib* at pci? dev ? function ? # Int
# watchdog, SpeedStep and HPET
fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
#hpet* at ichlpcib?
+tcpcib* at pci? dev ? function ? # Intel Atom E6xx PCI-LPC
+hpet* at tcpcib?
gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/
# timecounter, watchdog and GPIO
#piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep
@@ -486,6 +488,7 @@ eisa0 at pceb?
#isa0 at amdpcib?
isa0 at gcscpcib?
isa0 at ichlpcib?
+isa0 at tcpcib?
#isa0 at piixpcib?
#isa0 at gscpcib?
isa0 at viapcib?
Index: src/sys/arch/x86/pci/files.pci
diff -u src/sys/arch/x86/pci/files.pci:1.14 src/sys/arch/x86/pci/files.pci:1.15
--- src/sys/arch/x86/pci/files.pci:1.14 Fri Apr 13 09:11:17 2012
+++ src/sys/arch/x86/pci/files.pci Wed Dec 5 11:19:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.14 2012/04/13 13:11:17 cegger Exp $
+# $NetBSD: files.pci,v 1.15 2012/12/05 16:19:46 christos Exp $
device aapic
attach aapic at pci
@@ -19,7 +19,8 @@ file arch/x86/pci/pchb.c pchb needs-fl
device pcib: isabus
attach pcib at pci
file arch/x86/pci/pcib.c pcib | ichlpcib | gscpcib | piixpcib |
- viapcib | amdpcib | gcscpcib | rdcpcib
+ viapcib | amdpcib | gcscpcib | rdcpcib |
+ tcpcib
device amdpcib {} : isabus
attach amdpcib at pci
@@ -51,6 +52,10 @@ file arch/x86/pci/ichlpcib.c ichlpcib
attach hpet at hpetichbus with ichlpcib_hpet
filearch/x86/pci/ichlpcib_hpet.c ichlpcib_hpet
+device tcpcib: isabus, sysmon_wdog, hpetichbus
+attach tcpcib at pci
+file arch/x86/pci/tcpcib.c tcpcib
+
device fwhrng
attach fwhrng at fwhichbus
file arch/x86/pci/fwhrng.c fwhrng needs-flag
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1144 src/sys/dev/pci/pcidevs:1.1145
--- src/sys/dev/pci/pcidevs:1.1144 Thu Nov 29 13:45:20 2012
+++ src/sys/dev/pci/pcidevs Wed Dec 5 11:19:46 2012
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1144 2012/11/29 18:45:20 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1145 2012/12/05 16:19:46 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3386,6 +3386,7 @@ product INTEL 82443GX_AGP 0x71a1 82443GX
product INTEL 82443GX_NOAGP 0x71a2 82443GX Host Bridge/Controller (AGP disabled)
product INTEL I740 0x7800 i740 Graphics Accelerator
product INTEL SCH_IDE 0x811a SCH IDE Controller
+product INTEL E600_LPC 0x8186 Atom Processor E6xx LPC Bridge
product INTEL PCI450_PB 0x84c4 82454KX/GX PCI Bridge (PB)
product INTEL PCI450_MC 0x84c5 82451KX/GX Memory Controller (MC)
product INTEL 82451NX_MIOC 0x84ca 82451NX Memory & I/O Controller (MIOC)
Added files:
Index: src/sys/arch/x86/pci/tcpcib.c
diff -u /dev/null src/sys/arch/x86/pci/tcpcib.c:1.1
--- /dev/null Wed Dec 5 11:19:47 2012
+++ src/sys/arch/x86/pci/tcpcib.c Wed Dec 5 11:19:46 2012
@@ -0,0 +1,359 @@
+/* $NetBSD: tcpcib.c,v 1.1 2012/12/05 16:19:46 christos Exp $ */
+/* $OpenBSD: tcpcib.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $ */
+
+/*
+ * Copyright (c) 2012 Matt Dainty
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
CVS commit: src/doc
Module Name:src Committed By: dholland Date: Wed Dec 5 17:21:55 UTC 2012 Modified Files: src/doc: RESPONSIBLE Log Message: Improve my last change (1.102) per 1.104 (retain but mark retired developers). To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/doc/RESPONSIBLE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/RESPONSIBLE diff -u src/doc/RESPONSIBLE:1.105 src/doc/RESPONSIBLE:1.106 --- src/doc/RESPONSIBLE:1.105 Wed Dec 5 06:19:11 2012 +++ src/doc/RESPONSIBLE Wed Dec 5 17:21:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.105 2012/12/05 06:19:11 jnemeth Exp $ +# $NetBSD: RESPONSIBLE,v 1.106 2012/12/05 17:21:55 dholland Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -189,7 +189,7 @@ lfs dholland, perseant mfs [nobody in particular] msdosfs jdolecek* nilfs reinoud -nfs [nobody really] +nfs fvdl* ntfs jdolecek* nullfs/layerfs dholland, pooka overlay [nobody] @@ -200,7 +200,7 @@ smbfs jdolecek* sysvbfs ? tmpfs rmind udf reinoud -ufs ? +ufs fvdl* union [nobody] umapfs [nobody] v7fs uch
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Wed Dec 5 19:05:47 UTC 2012
Modified Files:
src/sys/arch/arm/arm: process_machdep.c sig_machdep.c
src/sys/arch/arm/arm32: cpu.c cpuswitch.S vm_machdep.c
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/include: mcontext.h ptrace.h reg.h
src/sys/arch/arm/vfp: vfp_init.c
Removed Files:
src/sys/arch/arm/fpe-arm: armfpe.S armfpe.h armfpe_glue.S armfpe_init.c
Log Message:
ARMFPE hasn't compiled since NetBSD 4. Remove it.
Complete support for FPU_VFP.
fpregs now contains vfpreg.
XXX vfpreg only has space for 16 64-bit FP registers though VFPv3 and later
have 32 64-bit FP registers.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm/process_machdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/arm/sig_machdep.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/arm/arm32/cpuswitch.S
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/arm/arm32/vm_machdep.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/fpe-arm/armfpe.S
cvs rdiff -u -r1.7 -r0 src/sys/arch/arm/fpe-arm/armfpe.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/arm/fpe-arm/armfpe_glue.S
cvs rdiff -u -r1.18 -r0 src/sys/arch/arm/fpe-arm/armfpe_init.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/mcontext.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/ptrace.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/include/reg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/vfp/vfp_init.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/arm/process_machdep.c
diff -u src/sys/arch/arm/arm/process_machdep.c:1.23 src/sys/arch/arm/arm/process_machdep.c:1.24
--- src/sys/arch/arm/arm/process_machdep.c:1.23 Thu Aug 16 16:41:53 2012
+++ src/sys/arch/arm/arm/process_machdep.c Wed Dec 5 19:05:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.23 2012/08/16 16:41:53 matt Exp $ */
+/* $NetBSD: process_machdep.c,v 1.24 2012/12/05 19:05:46 matt Exp $ */
/*
* Copyright (c) 1993 The Regents of the University of California.
@@ -133,7 +133,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.23 2012/08/16 16:41:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.24 2012/12/05 19:05:46 matt Exp $");
#include
#include
@@ -145,10 +145,6 @@ __KERNEL_RCSID(0, "$NetBSD: process_mach
#include
-#ifdef ARMFPE
-#include
-#endif
-
int
process_read_regs(struct lwp *l, struct reg *regs)
{
@@ -177,14 +173,15 @@ process_read_regs(struct lwp *l, struct
int
process_read_fpregs(struct lwp *l, struct fpreg *regs)
{
-#ifdef ARMFPE
- arm_fpe_getcontext(p, regs);
- return(0);
-#else /* ARMFPE */
- /* No hardware FP support */
- memset(regs, 0, sizeof(struct fpreg));
+#ifdef FPU_VFP
+ if (curcpu()->ci_vfp_id == 0) {
+ return EINVAL;
+ }
+ const struct pcb * const pcb = lwp_getpcb(l);
+ vfp_savecontext();
+ regs->fpr_vfp = pcb->pcb_vfp;
+#endif
return(0);
-#endif /* ARMFPE */
}
int
@@ -222,13 +219,16 @@ process_write_regs(struct lwp *l, const
int
process_write_fpregs(struct lwp *l, const struct fpreg *regs)
{
-#ifdef ARMFPE
- arm_fpe_setcontext(p, regs);
- return(0);
-#else /* ARMFPE */
- /* No hardware FP support */
+#ifdef FPU_VFP
+ if (curcpu()->ci_vfp_id == 0) {
+ return EINVAL;
+ }
+ struct pcb * const pcb = lwp_getpcb(l);
+ vfp_discardcontext();
+ l->l_md.md_flags |= MDLWP_VFPUSED;
+ pcb->pcb_vfp = regs->fpr_vfp;
+#endif
return(0);
-#endif /* ARMFPE */
}
int
Index: src/sys/arch/arm/arm/sig_machdep.c
diff -u src/sys/arch/arm/arm/sig_machdep.c:1.43 src/sys/arch/arm/arm/sig_machdep.c:1.44
--- src/sys/arch/arm/arm/sig_machdep.c:1.43 Thu Aug 16 16:41:53 2012
+++ src/sys/arch/arm/arm/sig_machdep.c Wed Dec 5 19:05:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.43 2012/08/16 16:41:53 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.44 2012/12/05 19:05:46 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.43 2012/08/16 16:41:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.44 2012/12/05 19:05:46 matt Exp $");
#include /* XXX only needed by syscallargs.h */
#include
@@ -191,10 +191,8 @@ cpu_getmcontext(struct lwp *l, mcontext_
*flags |= _UC_CPU;
-#ifdef ARMFPE
- /* Save Floating Point Register context. */
- arm_fpe_getcontext(p, (struct fpreg *)(void *)&mcp->fpregs);
- *flags |= _UC_FPU;
+#ifdef FPU_VFP
+ vfp_getcontext(l, mcp, flags);
#endif
mcp->_mc_tlsbase = (uintptr_t)l->l_private;
@@ -220,6 +218,11 @@ cpu_setmcontext(struct lwp *l, const mco
struct proc * const p = l->l_proc;
int error;
+#ifdef FPU_VFP
+ if ((flags & _UC_FPU) && curcpu()->ci_vfp_id == 0)
+ return EINVAL;
+#endif
+
if ((flags & _UC_CPU) != 0) {
/* Restore General Register context. */
error
CVS commit: src/doc
Module Name:src Committed By: matt Date: Wed Dec 5 19:15:11 UTC 2012 Modified Files: src/doc: CHANGES Log Message: ARMFPE support has been removed To generate a diff of this commit: cvs rdiff -u -r1.1762 -r1.1763 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1762 src/doc/CHANGES:1.1763 --- src/doc/CHANGES:1.1762 Wed Dec 5 08:57:53 2012 +++ src/doc/CHANGES Wed Dec 5 19:15:11 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1762 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1763 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -147,3 +147,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [rkujawa 20121126] bind: update to 9.9.2-P1 to fix the DNS64 vulnerability. [spz 20121204] + arm: ARMFPE support had bitrotted and has been removed. [matt 20121205]
CVS commit: src/sys/arch/arm/vfp
Module Name:src
Committed By: matt
Date: Wed Dec 5 19:30:10 UTC 2012
Modified Files:
src/sys/arch/arm/vfp: vfp_init.c
Log Message:
For armv7 (cortex), disable access to the upper 16 FP registers (restrict
the register space to 16 64-bit FP registers).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/vfp/vfp_init.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/vfp/vfp_init.c
diff -u src/sys/arch/arm/vfp/vfp_init.c:1.8 src/sys/arch/arm/vfp/vfp_init.c:1.9
--- src/sys/arch/arm/vfp/vfp_init.c:1.8 Wed Dec 5 19:05:46 2012
+++ src/sys/arch/arm/vfp/vfp_init.c Wed Dec 5 19:30:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfp_init.c,v 1.8 2012/12/05 19:05:46 matt Exp $ */
+/* $NetBSD: vfp_init.c,v 1.9 2012/12/05 19:30:10 matt Exp $ */
/*
* Copyright (c) 2008 ARM Ltd
@@ -231,6 +231,12 @@ vfp_attach(void)
uint32_t cpacr = armreg_cpacr_read();
cpacr |= __SHIFTIN(CPACR_ALL, cpacr_vfp);
cpacr |= __SHIFTIN(CPACR_ALL, cpacr_vfp2);
+ if (CPU_ID_CORTEX_P(curcpu()->ci_arm_cpuid)) {
+ /*
+ * Disable access to the upper 16 FP registers.
+ */
+ cpacr |= CPACR_V7_D32DIS;
+ }
armreg_cpacr_write(cpacr);
/*
CVS commit: src/usr.bin/renice
Module Name:src Committed By: khorben Date: Wed Dec 5 23:59:33 UTC 2012 Modified Files: src/usr.bin/renice: renice.8 Log Message: Added a reference to prenice(1) ok riz@, mrg@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/renice/renice.8 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/renice/renice.8 diff -u src/usr.bin/renice/renice.8:1.13 src/usr.bin/renice/renice.8:1.14 --- src/usr.bin/renice/renice.8:1.13 Wed Apr 8 13:20:23 2009 +++ src/usr.bin/renice/renice.8 Wed Dec 5 23:59:33 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: renice.8,v 1.13 2009/04/08 13:20:23 joerg Exp $ +.\" $NetBSD: renice.8,v 1.14 2012/12/05 23:59:33 khorben Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -28,7 +28,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)renice.8 8.1 (Berkeley) 6/9/93 -.\" $NetBSD: renice.8,v 1.13 2009/04/08 13:20:23 joerg Exp $ +.\" $NetBSD: renice.8,v 1.14 2012/12/05 23:59:33 khorben Exp $ .\" .Dd June 9, 1993 .Dt RENICE 8 @@ -139,6 +139,7 @@ to map user names to user ID's .El .Sh SEE ALSO .Xr nice 1 , +.Xr prenice 1 , .Xr getpriority 2 , .Xr setpriority 2 .Sh HISTORY
CVS commit: src/sys/arch/x86/acpi
Module Name:src Committed By: jruoho Date: Thu Dec 6 04:43:29 UTC 2012 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c Log Message: Disable C1E also on K8, if present. From Imre Vadasz in PR install/47224. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/acpi/acpi_cpu_md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/acpi/acpi_cpu_md.c diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.72 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71 Sat Feb 11 22:09:47 2012 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Thu Dec 6 04:43:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_md.c,v 1.71 2012/02/11 22:09:47 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_md.c,v 1.72 2012/12/06 04:43:29 jruoho Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.71 2012/02/11 22:09:47 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.72 2012/12/06 04:43:29 jruoho Exp $"); #include #include @@ -253,6 +253,12 @@ acpicpu_md_flags(void) case 0x0f: /* + * Disable C1E if present. + */ + if (rdmsr_safe(MSR_CMPHALT, &msr) != EFAULT) +val |= ACPICPU_FLAG_C_C1E; + + /* * Evaluate support for the "FID/VID * algorithm" also used by powernow(4). */ @@ -268,6 +274,9 @@ acpicpu_md_flags(void) case 0x10: case 0x11: + /* + * Disable C1E if present. + */ if (rdmsr_safe(MSR_CMPHALT, &msr) != EFAULT) val |= ACPICPU_FLAG_C_C1E;
CVS commit: src/sys/arch
Module Name:src Committed By: msaitoh Date: Thu Dec 6 06:25:25 UTC 2012 Modified Files: src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC src/sys/arch/cats/conf: GENERIC INSTALL src/sys/arch/hpcarm/conf: IPAQ JORNADA720 JORNADA820 src/sys/arch/netwinder/conf: GENERIC src/sys/arch/shark/conf: GENERIC INSTALL OFWGENCFG Log Message: Remove "#options ARMFPE" To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/acorn32/conf/EB7500ATX cvs rdiff -u -r1.104 -r1.105 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.63 -r1.64 src/sys/arch/acorn32/conf/INSTALL cvs rdiff -u -r1.58 -r1.59 src/sys/arch/acorn32/conf/LOWMEM_WSCONS cvs rdiff -u -r1.56 -r1.57 src/sys/arch/acorn32/conf/NC cvs rdiff -u -r1.141 -r1.142 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.82 -r1.83 src/sys/arch/cats/conf/INSTALL cvs rdiff -u -r1.68 -r1.69 src/sys/arch/hpcarm/conf/IPAQ cvs rdiff -u -r1.87 -r1.88 src/sys/arch/hpcarm/conf/JORNADA720 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcarm/conf/JORNADA820 cvs rdiff -u -r1.113 -r1.114 src/sys/arch/netwinder/conf/GENERIC cvs rdiff -u -r1.103 -r1.104 src/sys/arch/shark/conf/GENERIC cvs rdiff -u -r1.50 -r1.51 src/sys/arch/shark/conf/INSTALL cvs rdiff -u -r1.38 -r1.39 src/sys/arch/shark/conf/OFWGENCFG 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/acorn32/conf/EB7500ATX diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.48 src/sys/arch/acorn32/conf/EB7500ATX:1.49 --- src/sys/arch/acorn32/conf/EB7500ATX:1.48 Fri Aug 17 20:11:37 2012 +++ src/sys/arch/acorn32/conf/EB7500ATX Thu Dec 6 06:25:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: EB7500ATX,v 1.48 2012/08/17 20:11:37 abs Exp $ +# $NetBSD: EB7500ATX,v 1.49 2012/12/06 06:25:24 msaitoh Exp $ # # EB7500ATX --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "EB7500ATX-$Revision: 1.48 $" +#ident "EB7500ATX-$Revision: 1.49 $" # estimated number of users maxusers 32 @@ -35,9 +35,6 @@ options RTC_OFFSET=0 # hardware clock i # CPU options options CPU_ARM7 # Support the ARM7 core -# FPA options -#options ARMFPE # ARM Ltd FPE - options EB7500ATX # Define in case needed # File systems Index: src/sys/arch/acorn32/conf/GENERIC diff -u src/sys/arch/acorn32/conf/GENERIC:1.104 src/sys/arch/acorn32/conf/GENERIC:1.105 --- src/sys/arch/acorn32/conf/GENERIC:1.104 Wed Oct 17 14:48:07 2012 +++ src/sys/arch/acorn32/conf/GENERIC Thu Dec 6 06:25:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.104 2012/10/17 14:48:07 apb Exp $ +# $NetBSD: GENERIC,v 1.105 2012/12/06 06:25:24 msaitoh Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.104 $" +#ident "GENERIC-$Revision: 1.105 $" # estimated number of users maxusers 32 @@ -42,9 +42,6 @@ options CPU_ARM7 # Support the ARM7 cor # For StrongARM only kernels #makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm" -# FPA options -#options ARMFPE # ARM Ltd FPE - # File systems file-system FFS # UFS Index: src/sys/arch/acorn32/conf/INSTALL diff -u src/sys/arch/acorn32/conf/INSTALL:1.63 src/sys/arch/acorn32/conf/INSTALL:1.64 --- src/sys/arch/acorn32/conf/INSTALL:1.63 Fri Aug 17 20:11:37 2012 +++ src/sys/arch/acorn32/conf/INSTALL Thu Dec 6 06:25:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.63 2012/08/17 20:11:37 abs Exp $ +# $NetBSD: INSTALL,v 1.64 2012/12/06 06:25:24 msaitoh Exp $ # # INSTALL -- NetBSD/acorn32 install configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "INSTALL-$Revision: 1.63 $" +#ident "INSTALL-$Revision: 1.64 $" # estimated number of users maxusers 32 @@ -42,9 +42,6 @@ options CPU_ARM7 # Support the ARM7 cor # For StrongARM only kernels #makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm" -# FPA options -#options ARMFPE # ARM Ltd FPE - # File systems file-system FFS # UFS Index: src/sys/arch/acorn32/conf/LOWMEM_WSCONS diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.58 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.59 --- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.58 Fri Aug 17 20:11:37 2012 +++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS Thu Dec 6 06:25:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: LOWMEM_WSCONS,v 1.58 2012/08/17 20:11:37 abs Exp $ +# $NetBSD: LOWMEM_WSCONS,v 1.59 2012/12/06 06:25:24 msaitoh Exp $ # # LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines # @@ -29,10 +29,6 @@ options CPU_ARM7 # Support the ARM7 cor # For small kernels makeoptions COPTS="-Os -fno-inline -Dinline= -D__inline__= -D_inline_= " -# FPA options - -#options ARMFPE #
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: matt
Date: Thu Dec 6 06:45:46 UTC 2012
Modified Files:
src/external/gpl3/gdb/dist/gdb: armnbsd-nat.c
Log Message:
Fetch VFP registers, not FPA.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.6
--- src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c:1.5 Mon Jan 23 21:24:43 2012
+++ src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c Thu Dec 6 06:45:45 2012
@@ -123,16 +123,16 @@ arm_supply_gregset (struct regcache *reg
}
static void
-arm_supply_fparegset (struct regcache *regcache, struct fpreg *fparegset)
+arm_supply_vfpregset (struct regcache *regcache, struct fpreg *vfpregset)
{
int regno;
- for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
-regcache_raw_supply (regcache, regno,
- (char *) &fparegset->fpr[regno - ARM_F0_REGNUM]);
+ for (regno = 0; regno < 16; regno++)
+regcache_raw_supply (regcache, regno + ARM_D0_REGNUM,
+ (char *) vfpregset->fpr_vfp.vfp_regs + 8*regno);
- regcache_raw_supply (regcache, ARM_FPS_REGNUM,
- (char *) &fparegset->fpr_fpsr);
+ regcache_raw_supply (regcache, ARM_FPSCR_REGNUM,
+ (char *) &vfpregset->fpr_vfp.vfp_fpscr);
}
void
@@ -166,19 +166,22 @@ fill_gregset (const struct regcache *reg
}
void
-fill_fpregset (const struct regcache *regcache, fpregset_t *fpregsetp, int regno)
+fill_fpregset (const struct regcache *regcache, fpregset_t *vfpregsetp, int regno)
{
if (-1 == regno)
{
int regnum;
- for (regnum = ARM_F0_REGNUM; regnum <= ARM_F7_REGNUM; regnum++)
- regcache_raw_collect(regcache, regnum, (char *) &fpregsetp->fpr[regnum - ARM_F0_REGNUM]);
-}
- else if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM)
-regcache_raw_collect(regcache, regno, (char *) &fpregsetp->fpr[regno - ARM_F0_REGNUM]);
-
- if (ARM_FPS_REGNUM == regno || -1 == regno)
-regcache_raw_collect (regcache, ARM_FPS_REGNUM, (char *) &fpregsetp->fpr_fpsr);
+ for (regnum = 0; regnum <= 15; regnum++)
+ regcache_raw_collect(regcache, regnum + ARM_D0_REGNUM,
+ (char *) vfpregsetp->fpr_vfp.vfp_regs + 8*regnum);
+}
+ else if (regno >= ARM_D0_REGNUM && regno <= ARM_D0_REGNUM + 15)
+regcache_raw_collect(regcache, regno,
+ (char *) vfpregsetp->fpr_vfp.vfp_regs + 8*regno);
+
+ if (ARM_FPSCR_REGNUM == regno || -1 == regno)
+regcache_raw_collect (regcache, ARM_FPSCR_REGNUM,
+ (char *) &vfpregsetp->fpr_vfp.vfp_fpscr);
}
void
@@ -190,7 +193,7 @@ supply_gregset (struct regcache *regcach
void
supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
{
- arm_supply_fparegset (regcache, (struct fpreg *)fpregsetp);
+ arm_supply_vfpregset (regcache, (struct fpreg *)fpregsetp);
}
static void
@@ -281,14 +284,14 @@ fetch_fp_register (struct regcache *regc
switch (regno)
{
-case ARM_FPS_REGNUM:
- regcache_raw_supply (regcache, ARM_FPS_REGNUM,
- (char *) &inferior_fp_registers.fpr_fpsr);
+case ARM_FPSCR_REGNUM:
+ regcache_raw_supply (regcache, ARM_FPSCR_REGNUM,
+ (char *) &inferior_fp_registers.fpr_vfp.vfp_fpscr);
break;
default:
regcache_raw_supply (regcache, regno,
- (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
+ (char *) inferior_fp_registers.fpr_vfp.vfp_regs + 8 * (regno - ARM_D0_REGNUM));
break;
}
}
@@ -309,7 +312,7 @@ fetch_fp_regs (struct regcache *regcache
return;
}
- arm_supply_fparegset (regcache, &inferior_fp_registers);
+ arm_supply_vfpregset (regcache, &inferior_fp_registers);
}
static void
@@ -318,10 +321,10 @@ armnbsd_fetch_registers (struct target_o
{
if (regno >= 0)
{
- if (regno < ARM_F0_REGNUM || regno > ARM_FPS_REGNUM)
- fetch_register (regcache, regno);
- else
+ if (regno >= ARM_D0_REGNUM && regno <= ARM_FPSCR_REGNUM)
fetch_fp_register (regcache, regno);
+ else
+ fetch_register (regcache, regno);
}
else
{
@@ -473,14 +476,15 @@ store_fp_register (const struct regcache
switch (regno)
{
-case ARM_FPS_REGNUM:
+case ARM_FPSCR_REGNUM:
regcache_raw_collect (regcache, ARM_FPS_REGNUM,
- (char *) &inferior_fp_registers.fpr_fpsr);
+ (char *) &inferior_fp_registers.fpr_vfp.vfp_fpscr);
break;
default:
regcache_raw_collect (regcache, regno,
- (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
+ (char *) inferior_fp_registers.fpr_vfp.vfp_regs
+ + 8 * (regno - ARM_D0_REGNUM));
break;
}
@@ -499,12 +503,13 @@ store_fp_regs (const struct regcache *re
int regno;
- for (regno = ARM_F0_REGNUM; regno <= ARM_F
CVS commit: src/usr.bin/renice
Module Name:src Committed By: wiz Date: Thu Dec 6 07:52:12 UTC 2012 Modified Files: src/usr.bin/renice: renice.8 Log Message: emove duplicate RCS Id. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.bin/renice/renice.8 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/renice/renice.8 diff -u src/usr.bin/renice/renice.8:1.14 src/usr.bin/renice/renice.8:1.15 --- src/usr.bin/renice/renice.8:1.14 Wed Dec 5 23:59:33 2012 +++ src/usr.bin/renice/renice.8 Thu Dec 6 07:52:12 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: renice.8,v 1.14 2012/12/05 23:59:33 khorben Exp $ +.\" $NetBSD: renice.8,v 1.15 2012/12/06 07:52:12 wiz Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -28,9 +28,8 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)renice.8 8.1 (Berkeley) 6/9/93 -.\" $NetBSD: renice.8,v 1.14 2012/12/05 23:59:33 khorben Exp $ .\" -.Dd June 9, 1993 +.Dd December 6, 2012 .Dt RENICE 8 .Os .Sh NAME
