CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Sat Jan 10 01:06:42 UTC 2015 Modified Files: src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS configure configure.ac src/external/gpl3/gcc/dist/gcc: ChangeLog config.gcc configure configure.ac expr.c src/external/gpl3/gcc/dist/gcc/config/arm: arm.h arm.md src/external/gpl3/gcc/dist/gcc/config/i386: i386.c src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c src/external/gpl3/gcc/dist/gcc/config/sh: sh.c src/external/gpl3/gcc/dist/gcc/config/sparc: sparc.md src/external/gpl3/gcc/dist/gcc/doc: invoke.texi src/external/gpl3/gcc/dist/libcpp: lex.c Log Message: merge GCC 4.8.4. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/LAST_UPDATED \ src/external/gpl3/gcc/dist/MD5SUMS cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/configure cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/configure.ac cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/ChangeLog cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/gcc/dist/gcc/config.gcc cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/dist/gcc/configure cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/dist/gcc/configure.ac cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/expr.c cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/config/arm/arm.h cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/config/arm/arm.md cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/config/sh/sh.c cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/sparc/sparc.md cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/libcpp/lex.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/gcc/dist/LAST_UPDATED diff -u src/external/gpl3/gcc/dist/LAST_UPDATED:1.4 src/external/gpl3/gcc/dist/LAST_UPDATED:1.5 --- src/external/gpl3/gcc/dist/LAST_UPDATED:1.4 Sun Oct 12 07:11:58 2014 +++ src/external/gpl3/gcc/dist/LAST_UPDATED Sat Jan 10 01:06:41 2015 @@ -1 +1 @@ -Obtained from SVN: branches/gcc-4_8-branch revision 216050 +Obtained from SVN: tags/gcc_4_8_4_release revision 218947 Index: src/external/gpl3/gcc/dist/MD5SUMS diff -u src/external/gpl3/gcc/dist/MD5SUMS:1.4 src/external/gpl3/gcc/dist/MD5SUMS:1.5 --- src/external/gpl3/gcc/dist/MD5SUMS:1.4 Sun Oct 12 07:11:58 2014 +++ src/external/gpl3/gcc/dist/MD5SUMS Sat Jan 10 01:06:41 2015 @@ -1,5 +1,5 @@ # This file contains the MD5 checksums of the files in the -# gcc-4.8-20141009.tar.bz2 tarball. +# gcc-4.8.4.tar.bz2 tarball. # # Besides verifying that all files in the tarball were correctly expanded, # it also can be used to determine if any files have changed since the @@ -15,18 +15,30 @@ fe60d87048567d4fe8c8a0ed2448bcc8 COPYING.RUNTIME d32239bcb673463ab874e80d47fae504 COPYING3 6a6a8e020838b23406c81b19c1d46df6 COPYING3.LIB -d4cc0ebf08c9815b3577fb3d40e07823 ChangeLog +4480e0a3bc87ba07c08c434f6b1e0ecf ChangeLog 09538b708302f1735f6fa05b622ecf5e ChangeLog.tree-ssa 79ef16e405f5873970e04cee49091ff8 INSTALL/README -e583232305703d0a1f8a8290889fc4a1 LAST_UPDATED +8198620c99ae5d498af977fe48b6fcc5 INSTALL/binaries.html +e692922e41d41b619e06e9026ad1b4e3 INSTALL/build.html +fbba4289512d91e23f898ead4b23f57a INSTALL/configure.html +0cffd20c5cc08b3c4c6c0b199e53af71 INSTALL/download.html +6c57b94dad2f02f2a1b4612e84d4db39 INSTALL/finalinstall.html +d108b6aa020535e12f943830d6517384 INSTALL/gfdl.html +05839347918e698352fad3b4c665e807 INSTALL/index.html +60006efad29dce59df9433a4fb470513 INSTALL/old.html +33e1d1af9dbca7b9f1afd856559f1837 INSTALL/prerequisites.html +8b72685e409e06a61f001b9ca5139aa8 INSTALL/specific.html +c038158da59c97672084149b947444c3 INSTALL/test.html +3cf34d14a42c968be113b73ecbb3098f LAST_UPDATED 98dba0586988a9aa76768f50ece2dc21 MAINTAINERS -9778e247c16e7f5a4de9f623068dc8ab Makefile.def -3ef32dc362ce6ac47f2882fe0334f79f Makefile.in +2b525648f28fc6651400e95fe25d40ed Makefile.def +997f87c45b47c0a0c63eed5e39ee3831 Makefile.in 6b571c1e8f90bb088989c4350d479485 Makefile.tpl +b961293a60d80efdd076d4682219b84a NEWS 80d26bc3b1ad4f6969a96a24c9181bf5 README b510a5285eb05298b5f3d9f5ae920588 boehm-gc/AmigaOS.c 2caafacabf758bb76a9dfce1fc544b97 boehm-gc/BCC_MAKEFILE -a4967175d1b1f1bf84d483aeff581f20 boehm-gc/ChangeLog +4baf07144be5d715143bb355ea9ebf46 boehm-gc/ChangeLog c18075e3729cd116028480307a8e845d boehm-gc/EMX_MAKEFILE 3b7cc3be9ed3c2135bbda990e8a69303 boehm-gc/MacOS.c 5cf7764626b7dd7272b2fe11403d1b6a boehm-gc/MacProjects.sit.hqx @@ -205,7 +217,7 @@ b04a1232318128ebd7c630fca10d02e5 boehm- eea34cf893bb060ee20189e256a8065a config.guess 040359150cf11493f973a46d8a25b06b
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Fri Jan 9 15:25:23 UTC 2015
Modified Files:
src/sys/dev/pci: if_wpi.c
Log Message:
Take sc_rsw_mtx before calling wpi_getrfkill() from wpi_init(),
Problem reported and patch tested by chris at chriswareham.net
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/if_wpi.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_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.70 src/sys/dev/pci/if_wpi.c:1.71
--- src/sys/dev/pci/if_wpi.c:1.70 Tue Jan 6 15:39:54 2015
+++ src/sys/dev/pci/if_wpi.c Fri Jan 9 15:25:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.70 2015/01/06 15:39:54 bouyer Exp $ */
+/* $NetBSD: if_wpi.c,v 1.71 2015/01/09 15:25:23 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.70 2015/01/06 15:39:54 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.71 2015/01/09 15:25:23 bouyer Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -3197,13 +3197,16 @@ wpi_init(struct ifnet *ifp)
goto fail1;
/* Check the status of the radio switch */
+ mutex_enter(sc-sc_rsw_mtx);
if (wpi_getrfkill(sc)) {
+ mutex_exit(sc-sc_rsw_mtx);
aprint_error_dev(sc-sc_dev,
radio is disabled by hardware switch\n);
ifp-if_flags = ~IFF_UP;
error = EBUSY;
goto fail1;
}
+ mutex_exit(sc-sc_rsw_mtx);
/* wait for thermal sensors to calibrate */
for (ntries = 0; ntries 1000; ntries++) {
CVS commit: src/sys/arch/arm/imx
Module Name:src
Committed By: ryo
Date: Fri Jan 9 09:50:46 UTC 2015
Modified Files:
src/sys/arch/arm/imx: imx6_board.c imx6_ccm.c imx6_ccmreg.h
imx6_ccmvar.h
Log Message:
- add some clock source about IPU
- fix a9tmr frequency when changing clock of machdep.imx6.frequency.arm
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx6_board.c \
src/sys/arch/arm/imx/imx6_ccmreg.h src/sys/arch/arm/imx/imx6_ccmvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx6_ccm.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/imx/imx6_board.c
diff -u src/sys/arch/arm/imx/imx6_board.c:1.2 src/sys/arch/arm/imx/imx6_board.c:1.3
--- src/sys/arch/arm/imx/imx6_board.c:1.2 Mon Oct 6 10:27:13 2014
+++ src/sys/arch/arm/imx/imx6_board.c Fri Jan 9 09:50:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_board.c,v 1.2 2014/10/06 10:27:13 ryo Exp $ */
+/* $NetBSD: imx6_board.c,v 1.3 2015/01/09 09:50:46 ryo Exp $ */
/*
* Copyright (c) 2012 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: imx6_board.c,v 1.2 2014/10/06 10:27:13 ryo Exp $);
+__KERNEL_RCSID(1, $NetBSD: imx6_board.c,v 1.3 2015/01/09 09:50:46 ryo Exp $);
#include opt_imx.h
#include arml2cc.h
@@ -46,19 +46,8 @@ __KERNEL_RCSID(1, $NetBSD: imx6_board.c
#include arm/imx/imx6_reg.h
#include arm/imx/imx6_mmdcreg.h
#include arm/imx/imx6_ccmreg.h
-#include arm/imx/imxclockvar.h
#include arm/imx/imxwdogreg.h
-/*
- * PERIPHCLK_N is an arm root clock divider for MPcore interupt controller.
- * PERIPHCLK_N is equal to, or greater than two.
- * see Cortex-A9 MPCore Technical Reference Manual -
- * Chapter 5: Clocks, Resets, and Power Management, 5.1: Clocks.
- */
-#ifndef PERIPHCLK_N
-#define PERIPHCLK_N 2
-#endif
-
bus_space_tag_t imx6_ioreg_bst = imx_bs_tag;
bus_space_handle_t imx6_ioreg_bsh;
bus_space_tag_t imx6_armcore_bst = imx_bs_tag;
@@ -219,7 +208,7 @@ imx6_device_register(device_t self, void
*/
if (device_is_a(self, a9tmr) || device_is_a(self, a9wdt)) {
prop_dictionary_set_uint32(dict, frequency,
- imx6_armrootclk() / PERIPHCLK_N);
+ imx6_armrootclk() / IMX6_PERIPHCLK_N);
return;
}
}
Index: src/sys/arch/arm/imx/imx6_ccmreg.h
diff -u src/sys/arch/arm/imx/imx6_ccmreg.h:1.2 src/sys/arch/arm/imx/imx6_ccmreg.h:1.3
--- src/sys/arch/arm/imx/imx6_ccmreg.h:1.2 Mon Oct 6 10:27:13 2014
+++ src/sys/arch/arm/imx/imx6_ccmreg.h Fri Jan 9 09:50:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_ccmreg.h,v 1.2 2014/10/06 10:27:13 ryo Exp $ */
+/* $NetBSD: imx6_ccmreg.h,v 1.3 2015/01/09 09:50:46 ryo Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu r...@nerv.org
@@ -31,12 +31,21 @@
#include sys/cdefs.h
+/*
+ * PERIPHCLK_N is an arm root clock divider for MPcore interupt controller.
+ * PERIPHCLK_N is equal to, or greater than two.
+ * see Cortex-A9 MPCore Technical Reference Manual -
+ * Chapter 5: Clocks, Resets, and Power Management, 5.1: Clocks.
+ */
+#ifndef IMX6_PERIPHCLK_N
+#define IMX6_PERIPHCLK_N 2
+#endif
+
#ifndef IMX6_OSC_FREQ
#define IMX6_OSC_FREQ (24 * 1000 * 1000) /* 24MHz */
#endif
#define IMX6_CCM_SIZE0x8000
-
/* 0x = 0x020c4000 */
#define CCM_CCR 0x
#define CCM_CCDR0x0004
@@ -90,6 +99,13 @@
#define CCM_CSCMR1_SSI1_CLK_SEL __BITS(11, 10)
#define CCM_CSCMR1_PERCLK_PODF __BITS(5, 0)
+#define CCM_CSCMR20x0020
+#define CCM_CSCMR2_ESAI_CLK_SEL __BITS(20, 19)
+#define CCM_CSCMR2_LDB_DI1_IPU_DIV __BIT(11)
+#define CCM_CSCMR2_LDB_DI0_IPU_DIV __BIT(10)
+#define CCM_CSCMR2_CAN_CLK_PODF __BITS(7, 2)
+
+
#define CCM_CSCDR10x0024
#define CCM_CSCDR1_VPU_AXI_PODF __BITS(25, 27)
#define CCM_CSCDR1_USDHC4_PODF __BITS(22, 24)
@@ -98,6 +114,32 @@
#define CCM_CSCDR1_USDHC1_PODF __BITS(13, 11)
#define CCM_CSCDR1_UART_CLK_PODF __BITS(5, 0)
+#define CCM_CS1CDR0x0028
+#define CCM_CS2CDR0x002c
+#define CCM_CS2CDR_ENFC_CLK_PODF __BITS(26, 21)
+#define CCM_CS2CDR_ENFC_CLK_PRED __BITS(20, 18)
+#define CCM_CS2CDR_ENFC_CLK_SEL __BITS(17, 16)
+#define CCM_CS2CDR_LDB_DI1_CLK_SEL __BITS(14, 12)
+#define CCM_CS2CDR_LDB_DI0_CLK_SEL __BITS(11, 9)
+#define CCM_CS2CDR_SSI2_CLK_PRED __BITS(8, 6)
+#define CCM_CS2CDR_SSI2_CLK_PODF __BITS(5, 0)
+#define CCM_CDCDR0x0030
+#define CCM_CHSCCDR0x0034
+#define CCM_CHSCCDR_IPU1_DI1_PRE_CLK_SEL __BITS(17, 15)
+#define CCM_CHSCCDR_IPU1_DI1_PODF __BITS(14, 12)
+#define CCM_CHSCCDR_IPU1_DI1_CLK_SEL __BITS(11, 9)
+#define CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL __BITS(8, 6)
+#define CCM_CHSCCDR_IPU1_DI0_PODF __BITS(5, 3)
+#define CCM_CHSCCDR_IPU1_DI0_CLK_SEL __BITS(2, 0)
+
+
+#define CCM_CSCDR20x0038
+#define CCM_CSCDR30x003c
+#define CCM_CSCDR3_IPU2_HSP_PODF __BITS(18, 16)
+#define CCM_CSCDR3_IPU2_HSP_CLK_SEL __BITS(15, 14)
+#define
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Jan 9 09:29:14 UTC 2015 Modified Files: src/doc: CHANGES.prev Log Message: Fix date/author in last. From shinnashi takeshi in PR 49550. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.123 src/doc/CHANGES.prev:1.124 --- src/doc/CHANGES.prev:1.123 Sun Nov 2 10:21:11 2014 +++ src/doc/CHANGES.prev Fri Jan 9 09:29:14 2015 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: $Revision: 1.123 $ +LIST OF CHANGES FROM PREVIOUS RELEASES: $Revision: 1.124 $ Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -11710,4 +11710,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: processed sooner. [tls 20141026] viornd(4): Add driver for VirtIO entropy source available on QEMU, KVM, and Google Compute Engine. From OpenBSD. - [20141026 tls] + [tls 20141026]
CVS commit: src/sys/arch/macppc/stand/ofwboot
Module Name:src Committed By: matt Date: Fri Jan 9 22:02:18 UTC 2015 Modified Files: src/sys/arch/macppc/stand/ofwboot: boot.h Log Message: Force main into .text To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/macppc/stand/ofwboot/boot.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/macppc/stand/ofwboot/boot.h diff -u src/sys/arch/macppc/stand/ofwboot/boot.h:1.4 src/sys/arch/macppc/stand/ofwboot/boot.h:1.5 --- src/sys/arch/macppc/stand/ofwboot/boot.h:1.4 Sun Feb 19 12:02:55 2012 +++ src/sys/arch/macppc/stand/ofwboot/boot.h Fri Jan 9 22:02:18 2015 @@ -5,7 +5,7 @@ typedef void (*boot_entry_t)(int, int, int (*)(void *), void *, u_int); -void main(void); +void main(void) __section(.text); #define MAXBOOTPATHLEN 256 extern char bootdev[MAXBOOTPATHLEN];
CVS commit: [netbsd-7] src/sys/arch/x86
Module Name:src
Committed By: martin
Date: Fri Jan 9 10:33:07 UTC 2015
Modified Files:
src/sys/arch/x86/include [netbsd-7]: specialreg.h
src/sys/arch/x86/x86 [netbsd-7]: cpu_ucode_intel.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #396):
sys/arch/x86/x86/cpu_ucode_intel.c: revision 1.6
sys/arch/x86/include/specialreg.h: revision 1.81
Use specialreg.h's definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.78.4.1 -r1.78.4.2 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/x86/x86/cpu_ucode_intel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.78.4.1 src/sys/arch/x86/include/specialreg.h:1.78.4.2
--- src/sys/arch/x86/include/specialreg.h:1.78.4.1 Fri Dec 12 16:44:35 2014
+++ src/sys/arch/x86/include/specialreg.h Fri Jan 9 10:33:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.78.4.1 2014/12/12 16:44:35 martin Exp $ */
+/* $NetBSD: specialreg.h,v 1.78.4.2 2015/01/09 10:33:07 martin Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -506,6 +506,7 @@
#define MSR_CESR 0x011 /* P5 only (trap on P6) */
#define MSR_CTR0 0x012 /* P5 only (trap on P6) */
#define MSR_CTR1 0x013 /* P5 only (trap on P6) */
+#define MSR_IA32_PLATFORM_ID 0x017
#define MSR_APICBASE 0x01b
#define MSR_EBL_CR_POWERON 0x02a
#define MSR_EBC_FREQUENCY_ID 0x02c /* PIV only */
Index: src/sys/arch/x86/x86/cpu_ucode_intel.c
diff -u src/sys/arch/x86/x86/cpu_ucode_intel.c:1.5 src/sys/arch/x86/x86/cpu_ucode_intel.c:1.5.4.1
--- src/sys/arch/x86/x86/cpu_ucode_intel.c:1.5 Wed Mar 26 08:04:19 2014
+++ src/sys/arch/x86/x86/cpu_ucode_intel.c Fri Jan 9 10:33:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_intel.c,v 1.5 2014/03/26 08:04:19 christos Exp $ */
+/* $NetBSD: cpu_ucode_intel.c,v 1.5.4.1 2015/01/09 10:33:07 martin Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_ucode_intel.c,v 1.5 2014/03/26 08:04:19 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_ucode_intel.c,v 1.5.4.1 2015/01/09 10:33:07 martin Exp $);
#include opt_xen.h
#include opt_cpu_ucode.h
@@ -46,10 +46,6 @@ __KERNEL_RCSID(0, $NetBSD: cpu_ucode_in
#include machine/specialreg.h
#include x86/cpu_ucode.h
-#define MSR_IA32_PLATFORM_ID 0x17
-#define MSR_IA32_BIOS_UPDT_TRIGGER 0x79
-#define MSR_IA32_BIOS_SIGN_ID 0x8b
-
static void
intel_getcurrentucode(uint32_t *ucodeversion, int *platformid)
{
@@ -58,9 +54,9 @@ intel_getcurrentucode(uint32_t *ucodever
kpreempt_disable();
- wrmsr(MSR_IA32_BIOS_SIGN_ID, 0);
+ wrmsr(MSR_BIOS_SIGN, 0);
x86_cpuid(0, unneeded_ids);
- msr = rdmsr(MSR_IA32_BIOS_SIGN_ID);
+ msr = rdmsr(MSR_BIOS_SIGN);
*ucodeversion = msr 32;
kpreempt_enable();
@@ -138,7 +134,7 @@ cpu_ucode_intel_apply(struct cpu_ucode_s
kpreempt_enable();
return EEXIST; /* ??? */
}
- wrmsr(MSR_IA32_BIOS_UPDT_TRIGGER, (uintptr_t)(sc-sc_blob) + 48);
+ wrmsr(MSR_BIOS_UPDT_TRIG, (uintptr_t)(sc-sc_blob) + 48);
intel_getcurrentucode(nucodeversion, platformid);
kpreempt_enable();
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri Jan 9 14:07:56 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #397 To generate a diff of this commit: cvs rdiff -u -r1.1.2.154 -r1.1.2.155 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.154 src/doc/CHANGES-7.0:1.1.2.155 --- src/doc/CHANGES-7.0:1.1.2.154 Fri Jan 9 10:34:02 2015 +++ src/doc/CHANGES-7.0 Fri Jan 9 14:07:56 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.154 2015/01/09 10:34:02 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.155 2015/01/09 14:07:56 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13200,3 +13200,9 @@ sys/arch/x86/x86/cpu_ucode_intel.c 1.6 Use specialreg.h's definitions. [msaitoh, ticket #396] +sys/kern/kern_rndq.c1.29 + + Don't use cpu_counter32() unconditionally. + [christos, ticket #397] + +
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Jan 9 14:06:55 UTC 2015
Modified Files:
src/sys/kern [netbsd-7]: kern_rndq.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #397):
sys/kern/kern_rndq.c: revision 1.29
PR 49104: Jarle Greipsland: Don't use cpu_counter32() unconditionally.
PR 49124: Soekris net4501 panics during boot after merge of tls-earlyentropy
to HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.26.2.2 -r1.26.2.3 src/sys/kern/kern_rndq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.26.2.2 src/sys/kern/kern_rndq.c:1.26.2.3
--- src/sys/kern/kern_rndq.c:1.26.2.2 Sun Nov 2 09:47:04 2014
+++ src/sys/kern/kern_rndq.c Fri Jan 9 14:06:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.26.2.2 2014/11/02 09:47:04 martin Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.26.2.3 2015/01/09 14:06:55 martin Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.26.2.2 2014/11/02 09:47:04 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndq.c,v 1.26.2.3 2015/01/09 14:06:55 martin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -222,7 +222,8 @@ rnd_counter(void)
uint32_t ret;
#if defined(__HAVE_CPU_COUNTER)
- return (cpu_counter32());
+ if (cpu_hascounter())
+ return cpu_counter32();
#endif
if (rnd_ready) {
nanouptime(ts);
CVS commit: src/usr.bin/pkill
Module Name:src
Committed By: prlw1
Date: Fri Jan 9 12:45:32 UTC 2015
Modified Files:
src/usr.bin/pkill: pkill.c
Log Message:
Simplify code so that gcc 4.8 can understand it.
http://mail-index.netbsd.org/tech-userlevel/2015/01/06/msg008882.html
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/pkill/pkill.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pkill/pkill.c
diff -u src/usr.bin/pkill/pkill.c:1.29 src/usr.bin/pkill/pkill.c:1.30
--- src/usr.bin/pkill/pkill.c:1.29 Wed Jan 2 10:36:07 2013
+++ src/usr.bin/pkill/pkill.c Fri Jan 9 12:45:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $ */
+/* $NetBSD: pkill.c,v 1.30 2015/01/09 12:45:32 prlw1 Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $);
+__RCSID($NetBSD: pkill.c,v 1.30 2015/01/09 12:45:32 prlw1 Exp $);
#endif /* !lint */
#include sys/types.h
@@ -128,8 +128,8 @@ main(int argc, char **argv)
action = grepact;
pgrep = 1;
} else if (strcmp(getprogname(), prenice) == 0) {
+ action = reniceact;
prenice = 1;
-
} else {
action = killact;
p = argv[1];
@@ -171,7 +171,6 @@ main(int argc, char **argv)
if (argc 2)
usage();
- action = reniceact;
p = argv[1];
i = (int)strtol(p, q, 10);
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri Jan 9 10:34:02 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #396 To generate a diff of this commit: cvs rdiff -u -r1.1.2.153 -r1.1.2.154 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.153 src/doc/CHANGES-7.0:1.1.2.154 --- src/doc/CHANGES-7.0:1.1.2.153 Thu Jan 8 11:48:47 2015 +++ src/doc/CHANGES-7.0 Fri Jan 9 10:34:02 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.153 2015/01/08 11:48:47 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.154 2015/01/09 10:34:02 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13194,3 +13194,9 @@ usr.bin/netstat/if.c1.81 Adjust to the netname4 prototype. [prlw1, ticket #395] +sys/arch/x86/include/specialreg.h 1.81 +sys/arch/x86/x86/cpu_ucode_intel.c 1.6 + + Use specialreg.h's definitions. + [msaitoh, ticket #396] +
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: nonaka
Date: Fri Jan 9 11:45:12 UTC 2015
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c
Log Message:
Use correct register for next cacheline address.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/booke/booke_pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.19 src/sys/arch/powerpc/booke/booke_pmap.c:1.20
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.19 Mon Jan 5 07:40:05 2015
+++ src/sys/arch/powerpc/booke/booke_pmap.c Fri Jan 9 11:45:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.19 2015/01/05 07:40:05 nonaka Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.20 2015/01/09 11:45:11 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: booke_pmap.c,v 1.19 2015/01/05 07:40:05 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: booke_pmap.c,v 1.20 2015/01/09 11:45:11 nonaka Exp $);
#include sys/param.h
#include sys/kcore.h
@@ -364,8 +364,8 @@ pmap_copy_page(paddr_t src, paddr_t dst)
const vaddr_t end = src_va + PAGE_SIZE;
while (src_va end) {
- __asm(
- dcbt %2,%1 \n\t /* touch next src cachline */
+ __asm __volatile(
+ dcbt %2,%0 \n\t /* touch next src cacheline */
dcba 0,%1 \n\t /* don't fetch dst cacheline */
:: b(src_va), b(dst_va), b(line_size));
for (u_int i = 0;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri Jan 9 14:51:50 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket #398 To generate a diff of this commit: cvs rdiff -u -r1.1.2.155 -r1.1.2.156 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.155 src/doc/CHANGES-7.0:1.1.2.156 --- src/doc/CHANGES-7.0:1.1.2.155 Fri Jan 9 14:07:56 2015 +++ src/doc/CHANGES-7.0 Fri Jan 9 14:51:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.155 2015/01/09 14:07:56 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.156 2015/01/09 14:51:50 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13206,3 +13206,9 @@ sys/kern/kern_rndq.c1.29 [christos, ticket #397] +sys/kern/vfs_mount.c1.32 + + vfs_vnode_iterator_destroy: set v_usecount of marker to zero to + prevent an assertion from vnfree(). + [hannken, ticket #398] +
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Jan 9 14:50:35 UTC 2015
Modified Files:
src/sys/kern [netbsd-7]: vfs_mount.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #398):
sys/kern/vfs_mount.c: revision 1.32
vfs_vnode_iterator_destroy: set v_usecount of marker to zero to prevent
an assertion from vnfree().
To generate a diff of this commit:
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/sys/kern/vfs_mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.30.2.1 src/sys/kern/vfs_mount.c:1.30.2.2
--- src/sys/kern/vfs_mount.c:1.30.2.1 Tue Nov 18 18:40:06 2014
+++ src/sys/kern/vfs_mount.c Fri Jan 9 14:50:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.30.2.1 2014/11/18 18:40:06 snj Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.30.2.2 2015/01/09 14:50:35 martin Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.30.2.1 2014/11/18 18:40:06 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.30.2.2 2015/01/09 14:50:35 martin Exp $);
#define _VFS_VNODE_PRIVATE
@@ -365,8 +365,10 @@ vfs_vnode_iterator_destroy(struct vnode_
mutex_enter(mntvnode_lock);
KASSERT(ISSET(mvp-v_iflag, VI_MARKER));
- if (mvp-v_usecount != 0)
+ if (mvp-v_usecount != 0) {
TAILQ_REMOVE(mvp-v_mount-mnt_vnodelist, mvp, v_mntvnodes);
+ mvp-v_usecount = 0;
+ }
mutex_exit(mntvnode_lock);
vnfree(mvp);
}
