CVS commit: src/usr.bin/rump_allserver
Module Name:src Committed By: pooka Date: Fri Mar 4 09:10:34 UTC 2011 Modified Files: src/usr.bin/rump_allserver: rump_allserver.1 Log Message: Add note about block device properties. From discussion with riz. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/rump_allserver/rump_allserver.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/rump_allserver/rump_allserver.1 diff -u src/usr.bin/rump_allserver/rump_allserver.1:1.17 src/usr.bin/rump_allserver/rump_allserver.1:1.18 --- src/usr.bin/rump_allserver/rump_allserver.1:1.17 Wed Feb 23 19:59:18 2011 +++ src/usr.bin/rump_allserver/rump_allserver.1 Fri Mar 4 09:10:33 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_allserver.1,v 1.17 2011/02/23 19:59:18 pooka Exp $ +.\ $NetBSD: rump_allserver.1,v 1.18 2011/03/04 09:10:33 pooka Exp $ .\ .\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ @@ -125,6 +125,12 @@ .Dq reg for block device, character device and regular file, respectively. The default is a block device. +.Pp +Note: the contents of block devices are cached in the rump kernel's +buffer cache. +To avoid cache incoherency, it is advisable not to access a file +through the host namespace while it is mapped as a block device in +a running rump kernel. .El .Pp In case
CVS commit: src/usr.bin/rump_allserver
Module Name:src Committed By: pooka Date: Fri Mar 4 09:13:23 UTC 2011 Modified Files: src/usr.bin/rump_allserver: rump_allserver.1 Log Message: adjust wording in previous To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.bin/rump_allserver/rump_allserver.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/rump_allserver/rump_allserver.1 diff -u src/usr.bin/rump_allserver/rump_allserver.1:1.18 src/usr.bin/rump_allserver/rump_allserver.1:1.19 --- src/usr.bin/rump_allserver/rump_allserver.1:1.18 Fri Mar 4 09:10:33 2011 +++ src/usr.bin/rump_allserver/rump_allserver.1 Fri Mar 4 09:13:23 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_allserver.1,v 1.18 2011/03/04 09:10:33 pooka Exp $ +.\ $NetBSD: rump_allserver.1,v 1.19 2011/03/04 09:13:23 pooka Exp $ .\ .\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ @@ -130,7 +130,7 @@ buffer cache. To avoid cache incoherency, it is advisable not to access a file through the host namespace while it is mapped as a block device in -a running rump kernel. +a rump kernel. .El .Pp In case
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 4 09:28:34 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_cpu_cstate.c Log Message: Remove redundant/wrong increment of a variable. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dev/acpi/acpi_cpu_cstate.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_cpu_cstate.c diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.49 src/sys/dev/acpi/acpi_cpu_cstate.c:1.50 --- src/sys/dev/acpi/acpi_cpu_cstate.c:1.49 Tue Mar 1 05:57:04 2011 +++ src/sys/dev/acpi/acpi_cpu_cstate.c Fri Mar 4 09:28:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_cstate.c,v 1.49 2011/03/01 05:57:04 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_cstate.c,v 1.50 2011/03/04 09:28:34 jruoho Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.49 2011/03/01 05:57:04 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.50 2011/03/04 09:28:34 jruoho Exp $); #include sys/param.h #include sys/cpu.h @@ -407,8 +407,6 @@ aprint_error_dev(sc-sc_dev, failed to add C-state: %s\n, AcpiFormatException(rv)); - i++; - return rv; }
CVS commit: src/lib/libpuffs
Module Name:src Committed By: yamt Date: Fri Mar 4 09:47:47 UTC 2011 Modified Files: src/lib/libpuffs: callcontext.c Log Message: puffs__cc_destroy: clear PCC_HASCALLER. the caller info is not necessarily relevant to the next life of the cc. this also fixes the failure of the assertion in the next line. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/lib/libpuffs/callcontext.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/libpuffs/callcontext.c diff -u src/lib/libpuffs/callcontext.c:1.24 src/lib/libpuffs/callcontext.c:1.25 --- src/lib/libpuffs/callcontext.c:1.24 Mon Jan 10 23:20:45 2011 +++ src/lib/libpuffs/callcontext.c Fri Mar 4 09:47:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: callcontext.c,v 1.24 2011/01/10 23:20:45 yamt Exp $ */ +/* $NetBSD: callcontext.c,v 1.25 2011/03/04 09:47:47 yamt Exp $ */ /* * Copyright (c) 2006, 2007, 2008 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ #include sys/cdefs.h #if !defined(lint) -__RCSID($NetBSD: callcontext.c,v 1.24 2011/01/10 23:20:45 yamt Exp $); +__RCSID($NetBSD: callcontext.c,v 1.25 2011/03/04 09:47:47 yamt Exp $); #endif /* !lint */ #include sys/types.h @@ -291,6 +291,7 @@ { struct puffs_usermount *pu = pcc-pcc_pu; + pcc-pcc_flags = ~PCC_HASCALLER; assert(pcc-pcc_flags == 0); assert(!puffs_fakecc);
CVS commit: src/lib/libc/softfloat
Module Name:src Committed By: martin Date: Fri Mar 4 11:48:58 UTC 2011 Modified Files: src/lib/libc/softfloat: softfloat-specialize Log Message: Use sigqueueinfo() instead of raise() to generate exceptions. Provide minimalistic siginfo data. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/softfloat/softfloat-specialize Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/softfloat/softfloat-specialize diff -u src/lib/libc/softfloat/softfloat-specialize:1.4 src/lib/libc/softfloat/softfloat-specialize:1.5 --- src/lib/libc/softfloat/softfloat-specialize:1.4 Sun Sep 26 21:13:27 2004 +++ src/lib/libc/softfloat/softfloat-specialize Fri Mar 4 11:48:58 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: softfloat-specialize,v 1.4 2004/09/26 21:13:27 jmmv Exp $ */ +/* $NetBSD: softfloat-specialize,v 1.5 2011/03/04 11:48:58 martin Exp $ */ /* This is a derivative work. */ @@ -33,6 +33,8 @@ */ #include signal.h +#include string.h +#include unistd.h /* --- @@ -56,11 +58,26 @@ fp_except float_exception_mask = 0; void float_raise( fp_except flags ) { +siginfo_t info; float_exception_flags |= flags; if ( flags float_exception_mask ) { - raise( SIGFPE ); + memset(info, 0, sizeof info); + info.si_signo = SIGFPE; + info.si_pid = getpid(); + info.si_uid = geteuid(); + if (flags float_flag_underflow) + info.si_code = FPE_FLTUND; + else if (flags float_flag_overflow) + info.si_code = FPE_FLTOVF; + else if (flags float_flag_divbyzero) + info.si_code = FPE_FLTDIV; + else if (flags float_flag_invalid) + info.si_code = FPE_FLTINV; + else if (flags float_flag_inexact) + info.si_code = FPE_FLTRES; + sigqueueinfo(getpid(), info); } }
CVS commit: src/sys
Module Name:src Committed By: jruoho Date: Fri Mar 4 12:10:50 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/dev/acpi: acpi_cpu.h Log Message: Rename a badly named constant. Make it correspond with x86/specialreg.h. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/acpi/acpi_cpu_md.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_cpu.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/x86/acpi/acpi_cpu_md.c diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.52 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.53 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.52 Wed Mar 2 06:23:17 2011 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Mar 4 12:10:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_md.c,v 1.52 2011/03/02 06:23:17 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_md.c,v 1.53 2011/03/04 12:10:49 jruoho Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.52 2011/03/02 06:23:17 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.53 2011/03/04 12:10:49 jruoho Exp $); #include sys/param.h #include sys/bus.h @@ -179,7 +179,7 @@ x86_cpuid(0x0006, regs); if ((regs[2] CPUID_DSPM_HWF) != 0) - val |= ACPICPU_PDC_P_HW; + val |= ACPICPU_PDC_P_HWF; } return val; @@ -248,7 +248,7 @@ x86_cpuid(0x0006, regs); if ((regs[2] CPUID_DSPM_HWF) != 0) -val |= ACPICPU_FLAG_P_HW; +val |= ACPICPU_FLAG_P_HWF; if ((regs[0] CPUID_DSPM_IDA) != 0) val |= ACPICPU_FLAG_P_TURBO; @@ -338,7 +338,7 @@ x86_cpuid(0x0006, regs); if ((regs[2] CPUID_DSPM_HWF) != 0) - val |= ACPICPU_FLAG_P_HW; + val |= ACPICPU_FLAG_P_HWF; } break; @@ -500,7 +500,7 @@ /* * Reset the APERF and MPERF counters. */ - if ((sc-sc_flags ACPICPU_FLAG_P_HW) != 0) + if ((sc-sc_flags ACPICPU_FLAG_P_HWF) != 0) acpicpu_md_pstate_percent_reset(sc); return acpicpu_md_pstate_sysctl_init(); @@ -658,7 +658,7 @@ if (__predict_false((sc-sc_flags ACPICPU_FLAG_P) == 0)) return 0; - if (__predict_false((sc-sc_flags ACPICPU_FLAG_P_HW) == 0)) + if (__predict_false((sc-sc_flags ACPICPU_FLAG_P_HWF) == 0)) return 0; aperf = sc-sc_pstate_aperf; @@ -687,7 +687,7 @@ uint64_t xc; KASSERT((sc-sc_flags ACPICPU_FLAG_P) != 0); - KASSERT((sc-sc_flags ACPICPU_FLAG_P_HW) != 0); + KASSERT((sc-sc_flags ACPICPU_FLAG_P_HWF) != 0); msr.msr_value = 0; msr.msr_read = false; Index: src/sys/dev/acpi/acpi_cpu.h diff -u src/sys/dev/acpi/acpi_cpu.h:1.35 src/sys/dev/acpi/acpi_cpu.h:1.36 --- src/sys/dev/acpi/acpi_cpu.h:1.35 Tue Mar 1 04:35:48 2011 +++ src/sys/dev/acpi/acpi_cpu.h Fri Mar 4 12:10:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu.h,v 1.35 2011/03/01 04:35:48 jruoho Exp $ */ +/* $NetBSD: acpi_cpu.h,v 1.36 2011/03/04 12:10:50 jruoho Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -50,7 +50,7 @@ #define ACPICPU_PDC_T_SW __BIT(7) /* SMP Tx (different)*/ #define ACPICPU_PDC_C_C1_FFH __BIT(8) /* SMP C1 native beyond halt */ #define ACPICPU_PDC_C_C2C3_FFH__BIT(9) /* SMP C2 and C2 native */ -#define ACPICPU_PDC_P_HW __BIT(11) /* Px hardware coordination */ +#define ACPICPU_PDC_P_HWF __BIT(11) /* Px hardware feedback */ #define ACPICPU_PDC_GAS_HW __BIT(0) /* HW-coordinated state */ #define ACPICPU_PDC_GAS_BM __BIT(1) /* Bus master check required */ @@ -114,7 +114,7 @@ #define ACPICPU_FLAG_P_FFH __BIT(13) /* Native P-states */ #define ACPICPU_FLAG_P_DEP __BIT(14) /* P-state CPU coordination */ -#define ACPICPU_FLAG_P_HW __BIT(15) /* HW coordination supported */ +#define ACPICPU_FLAG_P_HWF __BIT(15) /* HW feedback supported */ #define ACPICPU_FLAG_P_XPSS __BIT(16) /* Microsoft XPSS in use */ #define ACPICPU_FLAG_P_TURBO __BIT(17) /* Turbo Boost / Turbo Core */ #define ACPICPU_FLAG_P_FIDVID __BIT(18) /* AMD FID/VID algorithm */
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: jruoho Date: Fri Mar 4 12:18:15 UTC 2011 Modified Files: src/share/man/man4/man4.x86: odcm.4 Log Message: From mrg@: note that the states may be limited on some CPUs due erratas. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.x86/odcm.4 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/man4/man4.x86/odcm.4 diff -u src/share/man/man4/man4.x86/odcm.4:1.2 src/share/man/man4/man4.x86/odcm.4:1.3 --- src/share/man/man4/man4.x86/odcm.4:1.2 Fri Mar 4 06:42:10 2011 +++ src/share/man/man4/man4.x86/odcm.4 Fri Mar 4 12:18:15 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: odcm.4,v 1.2 2011/03/04 06:42:10 jruoho Exp $ +.\ $NetBSD: odcm.4,v 1.3 2011/03/04 12:18:15 jruoho Exp $ .\ .\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -60,6 +60,8 @@ .It Ic machdep.clockmod.available A list of available duty cycles. .El +.Pp +Note that few erratas may limit the availability of some duty cycles. .Sh SEE ALSO .Xr acpicpu 4 , .Xr est 4 ,
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: wiz Date: Fri Mar 4 13:49:26 UTC 2011 Modified Files: src/share/man/man4/man4.x86: odcm.4 Log Message: Improve wording (errata is already plural). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.x86/odcm.4 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/man4/man4.x86/odcm.4 diff -u src/share/man/man4/man4.x86/odcm.4:1.3 src/share/man/man4/man4.x86/odcm.4:1.4 --- src/share/man/man4/man4.x86/odcm.4:1.3 Fri Mar 4 12:18:15 2011 +++ src/share/man/man4/man4.x86/odcm.4 Fri Mar 4 13:49:26 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: odcm.4,v 1.3 2011/03/04 12:18:15 jruoho Exp $ +.\ $NetBSD: odcm.4,v 1.4 2011/03/04 13:49:26 wiz Exp $ .\ .\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -61,7 +61,7 @@ A list of available duty cycles. .El .Pp -Note that few erratas may limit the availability of some duty cycles. +Note that some errata may limit the availability of some duty cycles. .Sh SEE ALSO .Xr acpicpu 4 , .Xr est 4 ,
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: oster Date: Fri Mar 4 17:45:17 UTC 2011 Modified Files: src/sys/dev/raidframe: rf_netbsdkintf.c Log Message: Remove bogus RF_ASSERT that must have crept in by accident. Thanks to Jan-Hinrich Fessel for reporting the issue. To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/sys/dev/raidframe/rf_netbsdkintf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/raidframe/rf_netbsdkintf.c diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.282 src/sys/dev/raidframe/rf_netbsdkintf.c:1.283 --- src/sys/dev/raidframe/rf_netbsdkintf.c:1.282 Sat Feb 19 07:11:09 2011 +++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Mar 4 17:45:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.282 2011/02/19 07:11:09 enami Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.283 2011/03/04 17:45:17 oster Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ ***/ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.282 2011/02/19 07:11:09 enami Exp $); +__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.283 2011/03/04 17:45:17 oster Exp $); #ifdef _KERNEL_OPT #include opt_compat_netbsd.h @@ -2997,8 +2997,6 @@ uint64_t numsecs; unsigned secsize; - RF_ASSERT(raidPtr-bytesPerSector rf_component_info_offset()); - /* initialize the AutoConfig list */ ac_list = NULL;
CVS commit: src/tests/sbin/resize_ffs
Module Name:src Committed By: riz Date: Fri Mar 4 17:56:53 UTC 2011 Modified Files: src/tests/sbin/resize_ffs: common.sh Log Message: Back out previous; it's causing intermittent problems which I don't fully understand yet. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/tests/sbin/resize_ffs/common.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/sbin/resize_ffs/common.sh diff -u src/tests/sbin/resize_ffs/common.sh:1.10 src/tests/sbin/resize_ffs/common.sh:1.11 --- src/tests/sbin/resize_ffs/common.sh:1.10 Thu Mar 3 16:25:15 2011 +++ src/tests/sbin/resize_ffs/common.sh Fri Mar 4 17:56:53 2011 @@ -14,8 +14,6 @@ else BYTESWAP=le fi - rumpsrv=rump_server -lrumpvfs -lrumpfs_ffs -d key=/img,hostpath=${IMG},size=host - export RUMP_SERVER=unix://sock } # test_case() taken from the tests/ipf/h_common.sh @@ -27,13 +25,14 @@ atf_test_case ${name} cleanup eval ${name}_head() { \ - atf_set descr resize_ffs test ; \ + atf_set require.user root ; \ } eval ${name}_body() { \ ${check_function} ${@} ; \ } eval ${name}_cleanup() { \ - rump.halt + umount -f mnt ; \ + : reset error ; \ } } @@ -58,7 +57,7 @@ # copy_data requires the mount already done; makes one copy of the test data copy_data () { - uudecode -p ${TDBASE64} | tar xzf - -C /rump/mnt -s/testdata/TD$1/ + uudecode -p ${TDBASE64} | (cd mnt; tar xzf - -s/testdata/TD$1/) } copy_multiple () @@ -73,7 +72,7 @@ # is to ensure data exists near the end of the fs under test. remove_data () { - rm -rf /rump/mnt/TD$1 + rm -rf mnt/TD$1 } remove_multiple () @@ -88,8 +87,8 @@ # generated md5 file doesn't need explicit cleanup thanks to ATF check_data () { - atf_check -x -o file:${GOODMD5} \ - md5 /rump/mnt/TD$1/* | sed s,/rump/mnt/TD$1/,, + (cd mnt/TD$1 md5 *) TD$1.md5 + atf_check diff -u ${GOODMD5} TD$1.md5 } # supply begin and end arguments @@ -101,15 +100,6 @@ done } -domount () -{ - atf_check -s exit:0 -e ignore mount_ffs /img /rump/mnt -} - -dounmount () -{ - atf_check -s exit:0 umount -R /rump/mnt -} resize_ffs() { @@ -121,6 +111,7 @@ local fslevel=$5 local numdata=$6 local swap=$7 + mkdir -p mnt echo bs is ${bs} numdata is ${numdata} echo resizing fs with blocksize ${bs} @@ -139,12 +130,7 @@ fi # we're specifying relative paths, so rump_ffs warns - ignore. - echo RUMP_SERVER is ${RUMP_SERVER} - atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER} - export LD_PRELOAD=/usr/lib/librumphijack.so - mkdir /rump/mnt - domount - + atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt copy_multiple ${numdata} if [ ${nsize} -lt ${osize} ]; then @@ -155,20 +141,15 @@ remove_multiple ${remove} fi - dounmount - rump.halt - unset LD_PRELOAD + umount mnt atf_check -s exit:0 -o ignore resize_ffs -y -s ${nsize} ${IMG} atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG} - atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER} - export LD_PRELOAD=/usr/lib/librumphijack.so - mkdir /rump/mnt - domount + atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt if [ ${nsize} -lt ${osize} ]; then check_data_range $((remove + 1)) ${numdata} else # checking everything because we don't delete on grow check_data_range 1 ${numdata} fi - dounmount + umount mnt }
CVS commit: src/external/gpl2/lvm2
Module Name:src Committed By: matt Date: Fri Mar 4 22:48:29 UTC 2011 Modified Files: src/external/gpl2/lvm2: lvm2tools.mk src/external/gpl2/lvm2/lib/libdevmapper: Makefile src/external/gpl2/lvm2/sbin/dmsetup: Makefile src/external/gpl2/lvm2/sbin/lvm: Makefile Log Message: Use static libdm so dmsetup and lvm can be linked dynamically. Change LIBDM_* to LIBDEVMAPPER_* so LIBDM can refer to libdm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/lvm2/lvm2tools.mk cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/lvm2/lib/libdevmapper/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/lvm2/sbin/dmsetup/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/lvm2/sbin/lvm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/lvm2/lvm2tools.mk diff -u src/external/gpl2/lvm2/lvm2tools.mk:1.3 src/external/gpl2/lvm2/lvm2tools.mk:1.4 --- src/external/gpl2/lvm2/lvm2tools.mk:1.3 Wed Jan 5 14:57:27 2011 +++ src/external/gpl2/lvm2/lvm2tools.mk Fri Mar 4 22:48:29 2011 @@ -1,20 +1,22 @@ -# $NetBSD: lvm2tools.mk,v 1.3 2011/01/05 14:57:27 haad Exp $ +# $NetBSD: lvm2tools.mk,v 1.4 2011/03/04 22:48:29 matt Exp $ .include bsd.own.mk LVM2_SRCDIR= ${NETBSDSRCDIR}/external/gpl2/lvm2 LVM2_DISTDIR= ${NETBSDSRCDIR}/external/gpl2/lvm2/dist -LIBDM_SRCDIR= ${NETBSDSRCDIR}/external/gpl2/lvm2/lib/libdevmapper -LIBDM_DISTDIR= ${NETBSDSRCDIR}/external/gpl2/lvm2/dist/libdm -LIBDM_INCLUDE= ${NETBSDSRCDIR}/external/gpl2/lvm2/dist/include +LIBDEVMAPPER_SRCDIR= ${LVM2_SRCDIR}/lib/libdevmapper +LIBDEVMAPPER_DISTDIR= ${LVM2_DISTDIR}/libdm +LIBDEVMAPPER_INCLUDE= ${LVM2_DISTDIR}/include + +LIBDM_SRCDIR= ${NETBSDSRCDIR}/lib/libdm # root:operator [cb]rw-r- CPPFLAGS+=-DDM_DEVICE_UID=0 -DDM_DEVICE_GID=5 -DDM_DEVICE_MODE=0640 \ -DDM_CONTROL_DEVICE_MODE=0660 -DLVM_LOCKDIR_MODE=0770 # -#LIBDM_OBJDIR.libdevmapper=${LIBDM_SRCDIR}/lib/libdevmapper/ +#LIBDEVMAPPER_OBJDIR.libdevmapper=${LIBDEVMAPPER_SRCDIR}/lib/libdevmapper/ # #.if !defined(LVM2OBJDIR.liblvm) #LVM2OBJDIR.liblvm!= cd ${LVM2_SRCDIR}/lib/liblvm ${PRINTOBJDIR} Index: src/external/gpl2/lvm2/lib/libdevmapper/Makefile diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.6 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.7 --- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.6 Fri Feb 11 06:35:26 2011 +++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile Fri Mar 4 22:48:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/02/11 06:35:26 matt Exp $ +# $NetBSD: Makefile,v 1.7 2011/03/04 22:48:29 matt Exp $ USE_SHLIBDIR= yes USE_FORT?= no @@ -8,10 +8,14 @@ LIB= devmapper -CPPFLAGS+= -I${LIBDM_DISTDIR} -I${LIBDM_DISTDIR}/misc -I${LIBDM_DISTDIR}/mm \ - -I${LIBDM_DISTDIR}/datastruct -I${LIBDM_DISTDIR}/ioctl \ - -I${LVM2_DISTDIR}/include -I${LIBDM_SRCDIR} -D__NetBSD__ - +CPPFLAGS+= -I${LIBDEVMAPPER_DISTDIR} \ + -I${LIBDEVMAPPER_DISTDIR}/misc \ + -I${LIBDEVMAPPER_DISTDIR}/mm \ + -I${LIBDEVMAPPER_DISTDIR}/datastruct \ + -I${LIBDEVMAPPER_DISTDIR}/ioctl \ + -I${LVM2_DISTDIR}/include \ + -I${LIBDEVMAPPER_SRCDIR} \ + -D__NetBSD__ CPPFLAGS+= -D__LIB_DEVMAPPER__ @@ -29,10 +33,10 @@ DBG=-g .endif -.PATH: ${LIBDM_DISTDIR}/ -.PATH: ${LIBDM_DISTDIR}/datastruct -.PATH: ${LIBDM_DISTDIR}/mm -.PATH: ${LIBDM_DISTDIR}/regex -.PATH: ${LIBDM_DISTDIR}/ioctl +.PATH: ${LIBDEVMAPPER_DISTDIR}/ +.PATH: ${LIBDEVMAPPER_DISTDIR}/datastruct +.PATH: ${LIBDEVMAPPER_DISTDIR}/mm +.PATH: ${LIBDEVMAPPER_DISTDIR}/regex +.PATH: ${LIBDEVMAPPER_DISTDIR}/ioctl .include bsd.lib.mk Index: src/external/gpl2/lvm2/sbin/dmsetup/Makefile diff -u src/external/gpl2/lvm2/sbin/dmsetup/Makefile:1.6 src/external/gpl2/lvm2/sbin/dmsetup/Makefile:1.7 --- src/external/gpl2/lvm2/sbin/dmsetup/Makefile:1.6 Tue Feb 8 03:26:13 2011 +++ src/external/gpl2/lvm2/sbin/dmsetup/Makefile Fri Mar 4 22:48:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/02/08 03:26:13 haad Exp $ +# $NetBSD: Makefile,v 1.7 2011/03/04 22:48:29 matt Exp $ USE_FORT?= no NOLINT= #defined @@ -15,18 +15,23 @@ #CFLAGS+= -g -O0 -CPPFLAGS+= -I${LIBDM_DISTDIR}/ -I${LIBDM_DISTDIR}/misc \ - -I. -I${LIBDM_DISTDIR}/ioctl -I${LVM2_DISTDIR}/include +CPPFLAGS+= -I${LIBDEVMAPPER_DISTDIR}/ -I${LIBDEVMAPPER_DISTDIR}/misc \ + -I. -I${LIBDEVMAPPER_DISTDIR}/ioctl -I${LVM2_DISTDIR}/include CPPFLAGS+= -D__LIB_DEVMAPPER__ +LIBDEVMAPPER_OBJDIR!= cd ${LIBDEVMAPPER_SRCDIR} ${PRINTOBJDIR} +LDADD+= -L${LIBDEVMAPPER_OBJDIR} -ldevmapper +DPADD+= ${LIBDEVMAPPER_OBJDIR}/libdevmapper.a + LIBDM_OBJDIR!= cd ${LIBDM_SRCDIR} ${PRINTOBJDIR} -LDADD+= -L${LIBDM_OBJDIR} -ldevmapper -DPADD+= ${LIBDM_OBJDIR}/libdevmapper.a +#LDADD+= -L${LIBDM_OBJDIR} -ldm +LDADD+= ${LIBDM_OBJDIR}/libdm.a +DPADD+= ${LIBDM_OBJDIR}/libdm.a -LDADD+= -ldm -lprop +LDADD+= -lprop -LDSTATIC= -static +#LDSTATIC= -static .PATH:
CVS commit: src/sys/kern
Module Name:src Committed By: matt Date: Sat Mar 5 01:52:18 UTC 2011 Modified Files: src/sys/kern: kern_proc.c Log Message: Simplify copyin_psstrings a bit. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/kern/kern_proc.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_proc.c diff -u src/sys/kern/kern_proc.c:1.172 src/sys/kern/kern_proc.c:1.173 --- src/sys/kern/kern_proc.c:1.172 Fri Mar 4 22:25:31 2011 +++ src/sys/kern/kern_proc.c Sat Mar 5 01:52:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_proc.c,v 1.172 2011/03/04 22:25:31 joerg Exp $ */ +/* $NetBSD: kern_proc.c,v 1.173 2011/03/05 01:52:18 matt Exp $ */ /*- * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_proc.c,v 1.172 2011/03/04 22:25:31 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_proc.c,v 1.173 2011/03/05 01:52:18 matt Exp $); #ifdef _KERNEL_OPT #include opt_kstack.h @@ -1836,13 +1836,12 @@ int copyin_psstrings(struct proc *p, struct ps_strings *arginfo) { - int error; #ifdef COMPAT_NETBSD32 if (p-p_flag PK_32) { struct ps_strings32 arginfo32; - error = copyin_proc(p, (void *)p-p_psstrp, arginfo32, + int error = copyin_proc(p, (void *)p-p_psstrp, arginfo32, sizeof(arginfo32)); if (error) return error; @@ -1850,15 +1849,10 @@ arginfo-ps_nargvstr = arginfo32.ps_nargvstr; arginfo-ps_envstr = (void *)(uintptr_t)arginfo32.ps_envstr; arginfo-ps_nenvstr = arginfo32.ps_nenvstr; - } else -#endif - { - error = copyin_proc(p, (void *)p-p_psstrp, arginfo, - sizeof(*arginfo)); - if (error) - return error; + return 0; } - return 0; +#endif + return copyin_proc(p, (void *)p-p_psstrp, arginfo, sizeof(*arginfo)); } static int
CVS commit: src/sys/arch/mmeye/stand/boot
Module Name:src Committed By: joerg Date: Sat Mar 5 01:58:01 UTC 2011 Modified Files: src/sys/arch/mmeye/stand/boot: Makefile Log Message: Use deflate.sh from the right directory. Execute with HOST_SH. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mmeye/stand/boot/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/arch/mmeye/stand/boot/Makefile diff -u src/sys/arch/mmeye/stand/boot/Makefile:1.1 src/sys/arch/mmeye/stand/boot/Makefile:1.2 --- src/sys/arch/mmeye/stand/boot/Makefile:1.1 Thu Mar 3 05:59:37 2011 +++ src/sys/arch/mmeye/stand/boot/Makefile Sat Mar 5 01:58:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/03/03 05:59:37 kiyohara Exp $ +# $NetBSD: Makefile,v 1.2 2011/03/05 01:58:01 joerg Exp $ NOMAN= # defined @@ -82,8 +82,8 @@ ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} .if ${MMEYE_CPU} == SH4 ${OBJCOPY} -S -O binary ${.TARGET} ${.TARGET}.bin - env TOOL_AWK=${TOOL_AWK} TOOL_HEXDUMP=${TOOL_HEXDUMP} \ - ./deflate.sh ${.TARGET}.bin + TOOL_AWK=${TOOL_AWK} TOOL_HEXDUMP=${TOOL_HEXDUMP} \ + ${HOST_SH} $(.CURDIR)/deflate.sh ${.TARGET}.bin .endif cleandir distclean: .WAIT cleanlibdir
CVS commit: src/sys/rump
Module Name:src Committed By: joerg Date: Sat Mar 5 03:15:26 UTC 2011 Modified Files: src/sys/rump/fs: Makefile.rumpfscomp src/sys/rump/kern: Makefile.rumpkerncomp Log Message: Fix spelling of MKZFS To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/Makefile.rumpfscomp cvs rdiff -u -r1.3 -r1.4 src/sys/rump/kern/Makefile.rumpkerncomp 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/fs/Makefile.rumpfscomp diff -u src/sys/rump/fs/Makefile.rumpfscomp:1.2 src/sys/rump/fs/Makefile.rumpfscomp:1.3 --- src/sys/rump/fs/Makefile.rumpfscomp:1.2 Tue Jan 18 22:21:23 2011 +++ src/sys/rump/fs/Makefile.rumpfscomp Sat Mar 5 03:15:25 2011 @@ -1,12 +1,13 @@ -# $NetBSD: Makefile.rumpfscomp,v 1.2 2011/01/18 22:21:23 haad Exp $ +# $NetBSD: Makefile.rumpfscomp,v 1.3 2011/03/05 03:15:25 joerg Exp $ # +.include bsd.own.mk + RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \ nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs \ tmpfs udf umap union -.if ${MACHINE_ARCH} == i386 || \ -${MACHINE_ARCH} == x86_64 +.if ${MKZFS} != no RUMPFSCOMP+= zfs .endif Index: src/sys/rump/kern/Makefile.rumpkerncomp diff -u src/sys/rump/kern/Makefile.rumpkerncomp:1.3 src/sys/rump/kern/Makefile.rumpkerncomp:1.4 --- src/sys/rump/kern/Makefile.rumpkerncomp:1.3 Tue Jan 18 22:21:23 2011 +++ src/sys/rump/kern/Makefile.rumpkerncomp Sat Mar 5 03:15:25 2011 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile.rumpkerncomp,v 1.3 2011/01/18 22:21:23 haad Exp $ +# $NetBSD: Makefile.rumpkerncomp,v 1.4 2011/03/05 03:15:25 joerg Exp $ # +.include bsd.own.mk + RUMPKERNCOMPS= crypto ksem tty z -.if ${MACHINE_ARCH} == i386 || \ -${MACHINE_ARCH} == x86_64 +.if ${MKZFS} != no RUMPKERNCOMPS+=solaris .endif
CVS commit: src/sys/dev/nand
Module Name:src Committed By: jruoho Date: Sat Mar 5 06:28:29 UTC 2011 Modified Files: src/sys/dev/nand: nand.h Log Message: KNF. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nand/nand.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/nand/nand.h diff -u src/sys/dev/nand/nand.h:1.1 src/sys/dev/nand/nand.h:1.2 --- src/sys/dev/nand/nand.h:1.1 Sat Feb 26 18:07:31 2011 +++ src/sys/dev/nand/nand.h Sat Mar 5 06:28:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: nand.h,v 1.1 2011/02/26 18:07:31 ahoka Exp $ */ +/* $NetBSD: nand.h,v 1.2 2011/03/05 06:28:29 jruoho Exp $ */ /*- * Copyright (c) 2010 Department of Software Engineering, @@ -453,9 +453,11 @@ static inline void nand_dump_data(const char *name, void *data, size_t len) { - printf(dumping %s\n--\n, name); uint8_t *dump = data; - for (int i = 0; i len; i++) { + int i; + + printf(dumping %s\n--\n, name); + for (i = 0; i len; i++) { printf(0x%.2hhx , *dump); dump++; }
CVS commit: src/sys/arch/x86/acpi
Module Name:src Committed By: jruoho Date: Sat Mar 5 06:39:55 UTC 2011 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c Log Message: If the P-state control mask is set, do a proper read-modify-write. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 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.53 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.54 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.53 Fri Mar 4 12:10:49 2011 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Sat Mar 5 06:39:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_md.c,v 1.53 2011/03/04 12:10:49 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_md.c,v 1.54 2011/03/05 06:39:55 jruoho Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.53 2011/03/04 12:10:49 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.54 2011/03/05 06:39:55 jruoho Exp $); #include sys/param.h #include sys/bus.h @@ -761,7 +761,7 @@ int acpicpu_md_pstate_set(struct acpicpu_pstate *ps) { - uint64_t val; + uint64_t val = 0; if (__predict_false(ps-ps_control_addr == 0)) return EINVAL; @@ -769,10 +769,15 @@ if ((ps-ps_flags ACPICPU_FLAG_P_FIDVID) != 0) return acpicpu_md_pstate_fidvid_set(ps); - val = ps-ps_control; + /* + * If the mask is set, do a read-modify-write. + */ + if (__predict_true(ps-ps_control_mask != 0)) { + val = rdmsr(ps-ps_control_addr); + val = ~ps-ps_control_mask; + } - if (__predict_true(ps-ps_control_mask != 0)) - val = val ps-ps_control_mask; + val |= ps-ps_control; wrmsr(ps-ps_control_addr, val); DELAY(ps-ps_latency);
CVS commit: src/tests/fs/tmpfs
Module Name:src Committed By: pooka Date: Sat Mar 5 07:41:12 UTC 2011 Modified Files: src/tests/fs/tmpfs: t_create.sh t_mkdir.sh Log Message: chown the workdir to unpriv user instead of chmod 711. Otherwise, if your (root's) login shell is {t,}csh, su -m gets outoutsmarted. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/fs/tmpfs/t_create.sh \ src/tests/fs/tmpfs/t_mkdir.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/tmpfs/t_create.sh diff -u src/tests/fs/tmpfs/t_create.sh:1.7 src/tests/fs/tmpfs/t_create.sh:1.8 --- src/tests/fs/tmpfs/t_create.sh:1.7 Tue Nov 9 13:01:33 2010 +++ src/tests/fs/tmpfs/t_create.sh Sat Mar 5 07:41:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_create.sh,v 1.7 2010/11/09 13:01:33 jmmv Exp $ +# $NetBSD: t_create.sh,v 1.8 2011/03/05 07:41:11 pooka Exp $ # # Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -52,8 +52,9 @@ atf_set require.user root } attrs_body() { + user=$(atf_config_get unprivileged-user) # Allow the unprivileged user to access the work directory. - chmod 711 . + chown ${user} . test_mount @@ -70,8 +71,6 @@ test ${st_gid} -eq ${dst_gid} || atf_fail Incorrect gid test ${st_mode} = 0100644 || atf_fail Incorrect mode - user=$(atf_config_get unprivileged-user) - atf_check -s eq:0 -o empty -e empty mkdir b c atf_check -s eq:0 -o empty -e empty chown ${user}:0 b Index: src/tests/fs/tmpfs/t_mkdir.sh diff -u src/tests/fs/tmpfs/t_mkdir.sh:1.7 src/tests/fs/tmpfs/t_mkdir.sh:1.8 --- src/tests/fs/tmpfs/t_mkdir.sh:1.7 Mon Nov 8 15:25:50 2010 +++ src/tests/fs/tmpfs/t_mkdir.sh Sat Mar 5 07:41:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_mkdir.sh,v 1.7 2010/11/08 15:25:50 pooka Exp $ +# $NetBSD: t_mkdir.sh,v 1.8 2011/03/05 07:41:11 pooka Exp $ # # Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -92,13 +92,12 @@ atf_set require.user root } attrs_body() { + user=$(atf_config_get unprivileged-user) # Allow the unprivileged user to access the work directory. - chmod 711 . + chown ${user} . test_mount - user=$(atf_config_get unprivileged-user) - atf_check -s eq:0 -o empty -e empty mkdir b c atf_check -s eq:0 -o empty -e empty chown ${user}:0 b
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sat Mar 5 07:47:54 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Add one bug to the list. (Neither acpicpu(4) nor est(4) or powernow(4) handle possible skew in timers and counters such as TSC.) To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/acpicpu.4 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/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.27 src/share/man/man4/acpicpu.4:1.28 --- src/share/man/man4/acpicpu.4:1.27 Fri Mar 4 06:01:25 2011 +++ src/share/man/man4/acpicpu.4 Sat Mar 5 07:47:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.27 2011/03/04 06:01:25 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.28 2011/03/05 07:47:54 jruoho Exp $ .\ .\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 4, 2011 +.Dd March 5, 2011 .Dt ACPICPU 4 .Os .Sh NAME @@ -317,6 +317,16 @@ .Xr acpitz 4 ) is not yet supported. .It +Depending on the processor, changes in C-, P-, +and T-states may all skew timers and counters such as +.Tn TSC . +This is neither handled by +.Nm +nor by +.Xr est 4 +and +.Xr powernow 4 . +.It There is currently neither a well-defined, machine-independent .Tn API for processor performance management nor a