CVS commit: src
Module Name:src Committed By: mbalmer Date: Thu Aug 11 07:33:26 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/distrib/sets/lists/modules: mi src/share/man/man4: Makefile src/sys/dev/pci: files.pci src/sys/modules: Makefile Added Files: src/share/man/man4: pwdog.4 src/sys/dev/pci: pwdog.c src/sys/modules/pwdog: Makefile pwdog.ioconf Log Message: pwdog(4) is a device driver for QUANCOM Electronic PWDOG1 PCI attached watchdog timers. To generate a diff of this commit: cvs rdiff -u -r1.1330 -r1.1331 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.562 -r1.563 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/pwdog.4 cvs rdiff -u -r1.343 -r1.344 src/sys/dev/pci/files.pci cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/pwdog.c cvs rdiff -u -r1.86 -r1.87 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/pwdog/Makefile \ src/sys/modules/pwdog/pwdog.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1330 src/distrib/sets/lists/man/mi:1.1331 --- src/distrib/sets/lists/man/mi:1.1330 Thu Aug 4 21:59:35 2011 +++ src/distrib/sets/lists/man/mi Thu Aug 11 07:33:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1330 2011/08/04 21:59:35 riz Exp $ +# $NetBSD: mi,v 1.1331 2011/08/11 07:33:25 mbalmer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1418,6 +1418,7 @@ ./usr/share/man/cat4/puc.0 man-sys-catman .cat ./usr/share/man/cat4/pud.0 man-sys-catman .cat ./usr/share/man/cat4/puffs.0 man-puffs-catman .cat +./usr/share/man/cat4/pwdog.0 man-sys-catman .cat ./usr/share/man/cat4/px.0 man-sys-catman .cat ./usr/share/man/cat4/pxg.0 man-sys-catman .cat ./usr/share/man/cat4/qe.0 man-sys-catman .cat @@ -4158,6 +4159,7 @@ ./usr/share/man/html4/puc.html man-sys-htmlman html ./usr/share/man/html4/pud.html man-sys-htmlman html ./usr/share/man/html4/puffs.html man-sys-htmlman html +./usr/share/man/html4/pwdog.html man-sys-htmlman html ./usr/share/man/html4/px.html man-sys-htmlman html ./usr/share/man/html4/pxg.html man-sys-htmlman html ./usr/share/man/html4/qe.html man-sys-htmlman html @@ -6803,6 +6805,7 @@ ./usr/share/man/man4/puc.4 man-sys-man .man ./usr/share/man/man4/pud.4 man-sys-man .man ./usr/share/man/man4/puffs.4 man-sys-man .man +./usr/share/man/man4/pwdog.4 man-sys-man .man ./usr/share/man/man4/px.4 man-sys-man .man ./usr/share/man/man4/pxg.4 man-sys-man .man ./usr/share/man/man4/qe.4 man-sys-man .man Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.26 src/distrib/sets/lists/modules/mi:1.27 --- src/distrib/sets/lists/modules/mi:1.26 Tue Aug 9 01:42:57 2011 +++ src/distrib/sets/lists/modules/mi Thu Aug 11 07:33:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.26 2011/08/09 01:42:57 jmcneill Exp $ +# $NetBSD: mi,v 1.27 2011/08/11 07:33:25 mbalmer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -110,6 +110,8 @@ ./@MODULEDIR@/puffs/puffs.kmod base-kernel-modules kmod ./@MODULEDIR@/putterbase-kernel-modules kmod ./@MODULEDIR@/putter/putter.kmod base-kernel-modules kmod +./@MODULEDIR@/pwdogbase-kernel-modules kmod +./@MODULEDIR@/pwdog/pwdog.kmod base-kernel-modules kmod ./@MODULEDIR@/scsiverbose base-kernel-modules kmod ./@MODULEDIR@/scsiverbose/scsiverbose.kmod base-kernel-modules kmod ./@MODULEDIR@/sdtbase-kernel-modules kmod,dtrace Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.562 src/share/man/man4/Makefile:1.563 --- src/share/man/man4/Makefile:1.562 Wed Jul 20 20:51:12 2011 +++ src/share/man/man4/Makefile Thu Aug 11 07:33:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.562 2011/07/20 20:51:12 jakllsch Exp $ +# $NetBSD: Makefile,v 1.563 2011/08/11 07:33:25 mbalmer Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -45,7 +45,7 @@ pad.4 pas.4 pcdisplay.4 pcf8563rtc.4 pciide.4 pckbc.4 pckbd.4 pcn.4 \ pcppi.4 pcscp.4 pcweasel.4 pdcide.4 pdcsata.4 piixide.4 piixpcib.4 \ piixpm.4 pim.4 plip.4 pms.4 pmu.4 pnaphy.4 ppbus.4 ppp.4 pppoe.4 \ - pseye.4 ptm.4 pty.4 puc.4 pud.4 puffs.4 px.4 pxg.4 \ + pseye.4 ptm.4 pty.4 puc.4 pud.4 puffs.4 pwdog.4 px.4 pxg.4 \ qe.4 qec.4 qsphy.4 \ raid.4 ral.4 ray.4 rcons.4 rdcphy.4 re.4 rgephy.4 rlphy.4 \ rnd.4 route.4 rs5c372rtc.4 rtk.4 rtw.4 rum.4 \ Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.343 src/sys/dev/pci/files.pci:1.344 --- src/sys/dev/pci/files.pci:1.343 Thu Aug 4 14:43:55 2011 +++ src/sys/dev/pci/files.pci Thu Aug 11 07:33:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.343 2011/08/04 14:43:55 jakllsch Exp $ +# $NetBSD: files.pci,v
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: mbalmer Date: Thu Aug 11 07:36:17 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add commented out sample entry for pwdog(4). To generate a diff of this commit: cvs rdiff -u -r1.332 -r1.333 src/sys/arch/amd64/conf/GENERIC 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.332 src/sys/arch/amd64/conf/GENERIC:1.333 --- src/sys/arch/amd64/conf/GENERIC:1.332 Tue Aug 9 02:52:29 2011 +++ src/sys/arch/amd64/conf/GENERIC Thu Aug 11 07:36:17 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.332 2011/08/09 02:52:29 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.333 2011/08/11 07:36:17 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.332 $ +#ident GENERIC-$Revision: 1.333 $ maxusers 64 # estimated number of users @@ -334,6 +334,8 @@ #amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET #hpet* at amdpcib? +#pwdog* at pci? dev ? function ? # QUANCOM PWDOG1 + ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter, # watchdog and Speedstep and HPET fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Thu Aug 11 07:38:56 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: Add entries for pwdog(4). To generate a diff of this commit: cvs rdiff -u -r1.317 -r1.318 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1046 -r1.1047 src/sys/arch/i386/conf/GENERIC 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/ALL diff -u src/sys/arch/i386/conf/ALL:1.317 src/sys/arch/i386/conf/ALL:1.318 --- src/sys/arch/i386/conf/ALL:1.317 Thu Aug 4 14:45:54 2011 +++ src/sys/arch/i386/conf/ALL Thu Aug 11 07:38:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.317 2011/08/04 14:45:54 jakllsch Exp $ +# $NetBSD: ALL,v 1.318 2011/08/11 07:38:56 mbalmer Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.317 $ +#ident ALL-$Revision: 1.318 $ maxusers 64 # estimated number of users @@ -496,6 +496,8 @@ # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI universal comm. cards +pwdog* at pci? dev ? function ? # QUANCOM PWDOG1 + agp* at pchb? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1046 src/sys/arch/i386/conf/GENERIC:1.1047 --- src/sys/arch/i386/conf/GENERIC:1.1046 Tue Aug 9 02:52:29 2011 +++ src/sys/arch/i386/conf/GENERIC Thu Aug 11 07:38:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1046 2011/08/09 02:52:29 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.1047 2011/08/11 07:38:56 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1046 $ +#ident GENERIC-$Revision: 1.1047 $ maxusers 64 # estimated number of users @@ -469,6 +469,8 @@ # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI universal comm. cards +pwdog* at pci ? dev ? function ? # QUANCOM PWDOG1 + agp* at pchb?
CVS commit: src/distrib/sgimips/instkernel
Module Name:src
Committed By: he
Date: Thu Aug 11 07:47:23 UTC 2011
Modified Files:
src/distrib/sgimips/instkernel: Makefile
Log Message:
Bump the image size so that the contents fits again.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sgimips/instkernel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sgimips/instkernel/Makefile
diff -u src/distrib/sgimips/instkernel/Makefile:1.8 src/distrib/sgimips/instkernel/Makefile:1.9
--- src/distrib/sgimips/instkernel/Makefile:1.8 Sun Feb 20 08:26:09 2011
+++ src/distrib/sgimips/instkernel/Makefile Thu Aug 11 07:47:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/02/20 08:26:09 matt Exp $
+# $NetBSD: Makefile,v 1.9 2011/08/11 07:47:22 he Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -16,7 +16,7 @@
.endif
IMAGE= diskimage
-IMAGESIZE= 3600k
+IMAGESIZE= 3700k
MTREECONF= ${DISTRIBDIR}/common/mtree.dot
IMAGEENDIAN= be
CVS commit: src/doc
Module Name:src Committed By: mbalmer Date: Thu Aug 11 07:58:56 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Add pwdog(4). To generate a diff of this commit: cvs rdiff -u -r1.1592 -r1.1593 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.1592 src/doc/CHANGES:1.1593 --- src/doc/CHANGES:1.1592 Tue Aug 9 18:03:10 2011 +++ src/doc/CHANGES Thu Aug 11 07:58:56 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1592 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1593 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1101,4 +1101,6 @@ amd64: Switch to GCC 4.5.3 [mrg 20110806] i386: Switch to GCC 4.5.3 [mrg 20110806] userland: Over 50 new manual pages. [jruoho 20110809] + pwdog(4): A new driver for QUANCOM Electronic PWDOG1 watchdog timer + cards. [mbalmer 20110811]
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: mbalmer Date: Thu Aug 11 08:00:05 UTC 2011 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Xr pwdog(4). To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sbin/wdogctl/wdogctl.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/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.23 src/sbin/wdogctl/wdogctl.8:1.24 --- src/sbin/wdogctl/wdogctl.8:1.23 Sat Mar 19 08:41:19 2011 +++ src/sbin/wdogctl/wdogctl.8 Thu Aug 11 08:00:05 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: wdogctl.8,v 1.23 2011/03/19 08:41:19 wiz Exp $ +.\ $NetBSD: wdogctl.8,v 1.24 2011/08/11 08:00:05 mbalmer Exp $ .\ .\ Copyright (c) 2000 Zembu Labs, Inc. .\ All rights reserved. @@ -31,7 +31,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 18, 2011 +.Dd August 11, 2011 .Dt WDOGCTL 8 .Os .Sh NAME @@ -170,6 +170,7 @@ .Xr ipmi 4 , .Xr itesio 4 , .Xr pcweasel 4 , +.Xr pwdog 4 , .Xr swwdog 4 , .Xr x86/ichlpcib 4 .Sh HISTORY
CVS commit: src/sys/arch/netwinder/conf
Module Name:src Committed By: he Date: Thu Aug 11 08:39:35 UTC 2011 Modified Files: src/sys/arch/netwinder/conf: GENERIC Log Message: Bump SYMTAB_SPACE so that it fits again. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/arch/netwinder/conf/GENERIC 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/netwinder/conf/GENERIC diff -u src/sys/arch/netwinder/conf/GENERIC:1.105 src/sys/arch/netwinder/conf/GENERIC:1.106 --- src/sys/arch/netwinder/conf/GENERIC:1.105 Thu Jun 30 20:09:33 2011 +++ src/sys/arch/netwinder/conf/GENERIC Thu Aug 11 08:39:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.105 2011/06/30 20:09:33 wiz Exp $ +# $NetBSD: GENERIC,v 1.106 2011/08/11 08:39:35 he Exp $ # # GENERIC machine description file # @@ -172,7 +172,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=59 +options SYMTAB_SPACE=60 config netbsd root on ? type ?
CVS commit: src/distrib/evbppc/ramdisk
Module Name:src Committed By: matt Date: Thu Aug 11 08:39:42 UTC 2011 Modified Files: src/distrib/evbppc/ramdisk: list Log Message: Add fdisk To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/evbppc/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/evbppc/ramdisk/list diff -u src/distrib/evbppc/ramdisk/list:1.16 src/distrib/evbppc/ramdisk/list:1.17 --- src/distrib/evbppc/ramdisk/list:1.16 Tue Jan 18 01:27:16 2011 +++ src/distrib/evbppc/ramdisk/list Thu Aug 11 08:39:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.16 2011/01/18 01:27:16 matt Exp $ +# $NetBSD: list,v 1.17 2011/08/11 08:39:42 matt Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -27,6 +27,7 @@ PROG sbin/chown bin/chgrp PROG sbin/disklabel PROG sbin/dmesg +PROG sbin/fdisk PROG sbin/fsck PROG sbin/fsck_ffs PROG sbin/ifconfig
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: cherry
Date: Thu Aug 11 11:01:31 UTC 2011
Modified Files:
src/sys/arch/i386/i386: gdt.c
Log Message:
per-cpu gdt support for xen
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/i386/gdt.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/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.50 src/sys/arch/i386/i386/gdt.c:1.51
--- src/sys/arch/i386/i386/gdt.c:1.50 Sat Nov 21 03:11:00 2009
+++ src/sys/arch/i386/i386/gdt.c Thu Aug 11 11:01:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gdt.c,v 1.50 2009/11/21 03:11:00 rmind Exp $ */
+/* $NetBSD: gdt.c,v 1.51 2011/08/11 11:01:30 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gdt.c,v 1.50 2009/11/21 03:11:00 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: gdt.c,v 1.51 2011/08/11 11:01:30 cherry Exp $);
#include opt_multiprocessor.h
#include opt_xen.h
@@ -207,17 +207,28 @@
KASSERT(va = VM_MIN_KERNEL_ADDRESS);
ptp = kvtopte(va);
frames[f] = *ptp PAGE_SHIFT;
- pmap_pte_clearbits(ptp, PG_RW);
+ {
+ /*
+ * pmap_pte_clearbits(ptp, PG_RW);
+ * but without spl(), since %fs is not setup
+ * properly yet, ie; curcpu() won't work at this
+ * point and spl() will break.
+ */
+ xpq_queue_lock();
+ xpq_queue_pte_update(xpmap_ptetomach(ptp),
+ *ptp ~PG_RW);
+ xpq_flush_queue();
+ xpq_queue_unlock();
+ }
}
- /* printk(loading gdt %x, %d entries, %d pages, */
- /* frames[0] PAGE_SHIFT, gdt_size[0], len PAGE_SHIFT); */
+
if (HYPERVISOR_set_gdt(frames, gdt_size[0]))
panic(HYPERVISOR_set_gdt failed!\n);
lgdt_finish();
#endif
}
-#ifdef MULTIPROCESSOR
+#if defined(MULTIPROCESSOR) !defined(XEN)
void
gdt_reload_cpu(struct cpu_info *ci)
@@ -255,15 +266,17 @@
gdt_size[which] = MINGDTSIZ;
new_len = gdt_size[which] * sizeof(gdt[0]);
}
- for(va = (vaddr_t)(cpu_info_primary.ci_gdt) + old_len + max_len;
- va (vaddr_t)(cpu_info_primary.ci_gdt) + new_len + max_len;
- va += PAGE_SIZE) {
- while ((pg = uvm_pagealloc(NULL, 0, NULL, UVM_PGA_ZERO))
- == NULL) {
-uvm_wait(gdt_grow);
+ for (CPU_INFO_FOREACH(cii, ci)) {
+ for(va = (vaddr_t)(ci-ci_gdt) + old_len + max_len;
+ va (vaddr_t)(ci-ci_gdt) + new_len + max_len;
+ va += PAGE_SIZE) {
+while ((pg = uvm_pagealloc(NULL, 0, NULL, UVM_PGA_ZERO))
+ == NULL) {
+ uvm_wait(gdt_grow);
+}
+pmap_kenter_pa(va, VM_PAGE_TO_PHYS(pg),
+ VM_PROT_READ | VM_PROT_WRITE, 0);
}
- pmap_kenter_pa(va, VM_PAGE_TO_PHYS(pg),
- VM_PROT_READ | VM_PROT_WRITE, 0);
}
return;
}
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: mbalmer Date: Thu Aug 11 11:21:06 UTC 2011 Modified Files: src/distrib/sets/lists/modules: mi Log Message: Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.28 src/distrib/sets/lists/modules/mi:1.29 --- src/distrib/sets/lists/modules/mi:1.28 Thu Aug 11 11:17:15 2011 +++ src/distrib/sets/lists/modules/mi Thu Aug 11 11:21:06 2011 @@ -1,8 +1,8 @@ -# $NetBSD: mi,v 1.28 2011/08/11 11:17:15 mbalmer Exp $ +# $NetBSD: mi,v 1.29 2011/08/11 11:21:06 mbalmer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # -# IMPORTANT: When you add module here, you have to add it twice to +# IMPORTANT: When you add a module here, you have to add it twice to # md.evbppc as well. evbppc does not use mi, because # powerpc-4xx and powerpc-booke modules are incompatible. # Sorry for any inconvenience this may cause, the management.
CVS commit: src/sys/modules
Module Name:src
Committed By: mbalmer
Date: Thu Aug 11 12:03:06 UTC 2011
Modified Files:
src/sys/modules: Makefile
Log Message:
pwdog is not for all platforms, build only on i386, x86_64, and sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/modules/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/modules/Makefile
diff -u src/sys/modules/Makefile:1.87 src/sys/modules/Makefile:1.88
--- src/sys/modules/Makefile:1.87 Thu Aug 11 07:33:25 2011
+++ src/sys/modules/Makefile Thu Aug 11 12:03:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2011/08/11 07:33:25 mbalmer Exp $
+# $NetBSD: Makefile,v 1.88 2011/08/11 12:03:06 mbalmer Exp $
.include bsd.own.mk
@@ -49,7 +49,6 @@
SUBDIR+= ptyfs
SUBDIR+= puffs
SUBDIR+= putter
-SUBDIR+= pwdog
SUBDIR+= scsiverbose
SUBDIR+= secmodel_bsd44
SUBDIR+= secmodel_overlay
@@ -181,6 +180,12 @@
#SUBDIR+= compat_svr4
.endif
+.if ${MACHINE_ARCH} == i386 || \
+${MACHINE_ARCH} == x86_64 || \
+${MACHINE_ARCH} == sparc64
+SUBDIR+= pwdog
+.endif
+
.include bsd.own.mk
# we need our device mapper for LVM
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: mbalmer Date: Thu Aug 11 12:03:58 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.evbppc md.i386 md.sparc64 mi Log Message: pwdog is not mi, but it only in the lists we build it for. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/modules/md.evbppc cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/modules/md.sparc64 cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.28 src/distrib/sets/lists/modules/md.amd64:1.29 --- src/distrib/sets/lists/modules/md.amd64:1.28 Tue Aug 9 12:16:03 2011 +++ src/distrib/sets/lists/modules/md.amd64 Thu Aug 11 12:03:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.28 2011/08/09 12:16:03 jruoho Exp $ +# $NetBSD: md.amd64,v 1.29 2011/08/11 12:03:58 mbalmer Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -91,6 +91,8 @@ ./@MODULEDIR@/pad/pad.kmod base-kernel-modules kmod ./@MODULEDIR@/powernowbase-kernel-modules kmod ./@MODULEDIR@/powernow/powernow.kmod base-kernel-modules kmod +./@MODULEDIR@/pwdogbase-kernel-modules kmod +./@MODULEDIR@/pwdog/pwdog.kmod base-kernel-modules kmod ./@MODULEDIR@/thinkpadbase-kernel-modules kmod ./@MODULEDIR@/thinkpad/thinkpad.kmod base-kernel-modules kmod ./@MODULEDIR@/tprof_amdpmi base-kernel-modules kmod Index: src/distrib/sets/lists/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.7 src/distrib/sets/lists/modules/md.evbppc:1.8 --- src/distrib/sets/lists/modules/md.evbppc:1.7 Thu Aug 11 11:17:15 2011 +++ src/distrib/sets/lists/modules/md.evbppc Thu Aug 11 12:03:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.7 2011/08/11 11:17:15 mbalmer Exp $ +# $NetBSD: md.evbppc,v 1.8 2011/08/11 12:03:58 mbalmer Exp $ ./stand/powerpc-4xx base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod @@ -108,8 +108,6 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/puffs/puffs.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/putterbase-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/putter/putter.kmod base-kernel-modules kmod -./stand/powerpc-4xx/@OSRELEASE@/modules/pwdogbase-kernel-modules kmod -./stand/powerpc-4xx/@OSRELEASE@/modules/pwdog/pwdog.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/scsiverbose base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/scsiverbose/scsiverbose.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/sdtbase-kernel-modules kmod,dtrace @@ -259,8 +257,6 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/puffs/puffs.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/putterbase-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/putter/putter.kmod base-kernel-modules kmod -./stand/powerpc-booke/@OSRELEASE@/modules/pwdogbase-kernel-modules kmod -./stand/powerpc-booke/@OSRELEASE@/modules/pwdog/pwdog.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/scsiverbose base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/scsiverbose/scsiverbose.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/sdtbase-kernel-modules kmod,dtrace Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.32 src/distrib/sets/lists/modules/md.i386:1.33 --- src/distrib/sets/lists/modules/md.i386:1.32 Tue Aug 9 12:16:03 2011 +++ src/distrib/sets/lists/modules/md.i386 Thu Aug 11 12:03:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.32 2011/08/09 12:16:03 jruoho Exp $ +# $NetBSD: md.i386,v 1.33 2011/08/11 12:03:58 mbalmer Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -99,6 +99,8 @@ ./@MODULEDIR@/padlock/padlock.kmod base-kernel-modules kmod ./@MODULEDIR@/powernowbase-kernel-modules kmod ./@MODULEDIR@/powernow/powernow.kmod base-kernel-modules kmod +./@MODULEDIR@/pwdogbase-kernel-modules kmod +./@MODULEDIR@/pwdog/pwdog.kmod base-kernel-modules kmod ./@MODULEDIR@/thinkpadbase-kernel-modules kmod ./@MODULEDIR@/thinkpad/thinkpad.kmod base-kernel-modules kmod ./@MODULEDIR@/tprof_amdpmi base-kernel-modules kmod Index: src/distrib/sets/lists/modules/md.sparc64 diff -u src/distrib/sets/lists/modules/md.sparc64:1.1
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Thu Aug 11 17:14:12 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add SiS 315 Pro VGA To generate a diff of this commit: cvs rdiff -u -r1.1093 -r1.1094 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/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1093 src/sys/dev/pci/pcidevs:1.1094 --- src/sys/dev/pci/pcidevs:1.1093 Tue Aug 9 08:26:18 2011 +++ src/sys/dev/pci/pcidevs Thu Aug 11 17:14:12 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1093 2011/08/09 08:26:18 mbalmer Exp $ +$NetBSD: pcidevs,v 1.1094 2011/08/11 17:14:12 bouyer Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -4216,6 +4216,7 @@ product SIS 190 0x0190 190 Ethernet product SIS 5597_VGA 0x0200 5597/5598 Integrated VGA product SIS 300 0x0300 300/305 AGP VGA +product SIS 315PRO_VGA 0x0325 315 Pro VGA product SIS 85C501 0x0406 85C501 product SIS 85C496 0x0496 85C496 product SIS 530HB 0x0530 530 Host-PCI Bridge
CVS commit: src/sys/arch/xen
Module Name:src
Committed By: cherry
Date: Thu Aug 11 17:59:00 UTC 2011
Modified Files:
src/sys/arch/xen/include: evtchn.h intr.h
src/sys/arch/xen/x86: intr.c
src/sys/arch/xen/xen: evtchn.c xenevt.c
Log Message:
Make event/interrupt handling MP aware
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/include/evtchn.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/xen/include/intr.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/xen/x86/intr.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/xen/evtchn.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/xen/xen/xenevt.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/xen/include/evtchn.h
diff -u src/sys/arch/xen/include/evtchn.h:1.18 src/sys/arch/xen/include/evtchn.h:1.19
--- src/sys/arch/xen/include/evtchn.h:1.18 Fri Oct 23 02:32:33 2009
+++ src/sys/arch/xen/include/evtchn.h Thu Aug 11 17:58:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.h,v 1.18 2009/10/23 02:32:33 snj Exp $ */
+/* $NetBSD: evtchn.h,v 1.19 2011/08/11 17:58:59 cherry Exp $ */
/*
*
@@ -41,8 +41,9 @@
int event_set_handler(int, int (*func)(void *), void *, int, const char *);
int event_remove_handler(int, int (*func)(void *), void *);
+struct cpu_info;
struct intrhand;
-void event_set_iplhandler(struct intrhand *, int);
+void event_set_iplhandler(struct cpu_info *, struct intrhand *, int);
extern int debug_port;
extern int xen_debug_handler(void *);
@@ -52,6 +53,8 @@
int unbind_pirq_from_evtch(int);
int unbind_virq_from_evtch(int);
+evtchn_port_t bind_vcpu_to_evtch(cpuid_t);
+
struct pintrhand {
int pirq;
int evtch;
Index: src/sys/arch/xen/include/intr.h
diff -u src/sys/arch/xen/include/intr.h:1.32 src/sys/arch/xen/include/intr.h:1.33
--- src/sys/arch/xen/include/intr.h:1.32 Wed Aug 10 11:39:45 2011
+++ src/sys/arch/xen/include/intr.h Thu Aug 11 17:58:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.32 2011/08/10 11:39:45 cherry Exp $ */
+/* $NetBSD: intr.h,v 1.33 2011/08/11 17:58:59 cherry Exp $ */
/* NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp */
/*-
@@ -54,6 +54,7 @@
uint32_t ev_imask; /* interrupt mask */
struct intrhand *ev_handlers; /* handler chain */
struct evcnt ev_evcnt; /* interrupt counter */
+ struct cpu_info *ev_cpu;/* cpu on which this event is bound */
char ev_evname[32]; /* event counter name */
};
@@ -161,7 +162,6 @@
void intr_default_setup(void);
int x86_nmi(void);
-void intr_calculatemasks(struct evtsource *);
void *intr_establish(int, struct pic *, int, int, int, int (*)(void *), void *, bool);
void intr_disestablish(struct intrhand *);
@@ -180,9 +180,9 @@
int xen_send_ipi(struct cpu_info *, uint32_t);
void xen_broadcast_ipi(uint32_t);
#else
-#define xen_ipi_init(_1) do {} while(0) /* nothing */
-#define xen_send_ipi(_i1, _i2) do {} while(0) /* nothing */
-#define xen_broadcast_ipi(_i1) do {} while(0) /* nothing */
+#define xen_ipi_init(_1) ((void) 0) /* nothing */
+#define xen_send_ipi(_i1, _i2) (0) /* nothing */
+#define xen_broadcast_ipi(_i1) ((void) 0) /* nothing */
#endif /* MULTIPROCESSOR */
#endif /* !_LOCORE */
Index: src/sys/arch/xen/x86/intr.c
diff -u src/sys/arch/xen/x86/intr.c:1.27 src/sys/arch/xen/x86/intr.c:1.28
--- src/sys/arch/xen/x86/intr.c:1.27 Fri Mar 19 23:27:12 2010
+++ src/sys/arch/xen/x86/intr.c Thu Aug 11 17:59:00 2011
@@ -103,7 +103,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.27 2010/03/19 23:27:12 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.28 2011/08/11 17:59:00 cherry Exp $);
#include opt_multiprocessor.h
#include opt_xen.h
@@ -119,6 +119,7 @@
#include sys/proc.h
#include sys/errno.h
#include sys/cpu.h
+#include sys/simplelock.h
#include uvm/uvm_extern.h
@@ -153,24 +154,6 @@
#endif
/*
- * Recalculate the interrupt from scratch for an event source.
- */
-void
-intr_calculatemasks(struct evtsource *evts)
-{
- struct intrhand *ih;
-
- evts-ev_maxlevel = IPL_NONE;
- evts-ev_imask = 0;
- for (ih = evts-ev_handlers; ih != NULL; ih = ih-ih_evt_next) {
- if (ih-ih_level evts-ev_maxlevel)
- evts-ev_maxlevel = ih-ih_level;
- evts-ev_imask |= (1 ih-ih_level);
- }
-
-}
-
-/*
* Fake interrupt handler structures for the benefit of symmetry with
* other interrupt sources.
*/
Index: src/sys/arch/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.49 src/sys/arch/xen/xen/evtchn.c:1.50
--- src/sys/arch/xen/xen/evtchn.c:1.49 Wed Aug 10 21:46:02 2011
+++ src/sys/arch/xen/xen/evtchn.c Thu Aug 11 17:59:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.49 2011/08/10 21:46:02 cherry Exp $ */
+/* $NetBSD: evtchn.c,v 1.50 2011/08/11 17:59:00 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,20 +54,21 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.49 2011/08/10 21:46:02 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.50 2011/08/11 17:59:00
CVS commit: src/sys/arch
Module Name:src
Committed By: cherry
Date: Thu Aug 11 18:05:11 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64: fpu.c
src/sys/arch/i386/isa: npx.c
Log Message:
More appropriate use of xen_send_ipi().
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/amd64/fpu.c
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/i386/isa/npx.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/amd64/amd64/fpu.c
diff -u src/sys/arch/amd64/amd64/fpu.c:1.36 src/sys/arch/amd64/amd64/fpu.c:1.37
--- src/sys/arch/amd64/amd64/fpu.c:1.36 Wed Aug 10 11:39:44 2011
+++ src/sys/arch/amd64/amd64/fpu.c Thu Aug 11 18:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.36 2011/08/10 11:39:44 cherry Exp $ */
+/* $NetBSD: fpu.c,v 1.37 2011/08/11 18:05:11 cherry Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. All
@@ -100,7 +100,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.36 2011/08/10 11:39:44 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.37 2011/08/11 18:05:11 cherry Exp $);
#include opt_multiprocessor.h
@@ -407,7 +407,10 @@
}
splx(s);
#ifdef XEN
- xen_send_ipi(oci, XEN_IPI_SYNCH_FPU);
+ if (xen_send_ipi(oci, XEN_IPI_SYNCH_FPU) != 0) {
+ panic(xen_send_ipi(%s, XEN_IPI_SYNCH_FPU) failed.,
+ cpu_name(oci));
+ }
#else /* XEN */
x86_send_ipi(oci, X86_IPI_SYNCH_FPU);
#endif
Index: src/sys/arch/i386/isa/npx.c
diff -u src/sys/arch/i386/isa/npx.c:1.141 src/sys/arch/i386/isa/npx.c:1.142
--- src/sys/arch/i386/isa/npx.c:1.141 Wed Aug 10 11:39:45 2011
+++ src/sys/arch/i386/isa/npx.c Thu Aug 11 18:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: npx.c,v 1.141 2011/08/10 11:39:45 cherry Exp $ */
+/* $NetBSD: npx.c,v 1.142 2011/08/11 18:05:11 cherry Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.141 2011/08/10 11:39:45 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.142 2011/08/11 18:05:11 cherry Exp $);
#if 0
#define IPRINTF(x) printf x
@@ -720,7 +720,10 @@
}
splx(s);
#ifdef XEN
- xen_send_ipi(oci, XEN_IPI_SYNCH_FPU);
+ if (xen_send_ipi(oci, XEN_IPI_SYNCH_FPU) != 0) {
+ panic(xen_send_ipi(%s, XEN_IPI_SYNCH_FPU) failed.,
+ cpu_name(oci));
+ }
#else /* XEN */
x86_send_ipi(oci, X86_IPI_SYNCH_FPU);
#endif
CVS commit: src/sys/arch
Module Name:src
Committed By: cherry
Date: Thu Aug 11 18:11:17 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/i386/i386: machdep.c
src/sys/arch/x86/include: cpu.h
src/sys/arch/x86/x86: cpu.c x86_machdep.c
src/sys/arch/xen/x86: cpu.c
Log Message:
Hide the MD details of specific IPIs behind semantically pleasing functions.
This cleans up a couple of #ifdef XEN/#endif pairs
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.707 -r1.708 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/x86/x86_machdep.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/xen/x86/cpu.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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.163 src/sys/arch/amd64/amd64/machdep.c:1.164
--- src/sys/arch/amd64/amd64/machdep.c:1.163 Wed Aug 10 11:39:45 2011
+++ src/sys/arch/amd64/amd64/machdep.c Thu Aug 11 18:11:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.163 2011/08/10 11:39:45 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.164 2011/08/11 18:11:17 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
@@ -107,7 +107,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.163 2011/08/10 11:39:45 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.164 2011/08/11 18:11:17 cherry Exp $);
/* #define XENDEBUG_LOW */
@@ -719,11 +719,7 @@
#endif /* XEN */
}
-#ifdef XEN
- xen_broadcast_ipi(XEN_IPI_HALT);
-#else /* XEN */
- x86_broadcast_ipi(X86_IPI_HALT);
-#endif
+ cpu_broadcast_halt();
if (howto RB_HALT) {
#if NACPICA 0
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.707 src/sys/arch/i386/i386/machdep.c:1.708
--- src/sys/arch/i386/i386/machdep.c:1.707 Wed Aug 10 06:38:02 2011
+++ src/sys/arch/i386/i386/machdep.c Thu Aug 11 18:11:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.707 2011/08/10 06:38:02 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.708 2011/08/11 18:11:17 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.707 2011/08/10 06:38:02 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.708 2011/08/11 18:11:17 cherry Exp $);
#include opt_beep.h
#include opt_compat_ibcs2.h
@@ -955,11 +955,7 @@
}
#ifdef MULTIPROCESSOR
-#ifdef XEN
- xen_broadcast_ipi(XEN_IPI_HALT);
-#else /* XEN */
- x86_broadcast_ipi(X86_IPI_HALT);
-#endif /* XEN */
+ cpu_broadcast_halt();
#endif /* MULTIPROCESSOR */
if (howto RB_HALT) {
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.36 src/sys/arch/x86/include/cpu.h:1.37
--- src/sys/arch/x86/include/cpu.h:1.36 Wed Aug 10 06:40:35 2011
+++ src/sys/arch/x86/include/cpu.h Thu Aug 11 18:11:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.36 2011/08/10 06:40:35 cherry Exp $ */
+/* $NetBSD: cpu.h,v 1.37 2011/08/11 18:11:17 cherry Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -314,6 +314,8 @@
void cpu_init_idle_lwps(void);
void cpu_init_msrs(struct cpu_info *, bool);
void cpu_load_pmap(struct pmap *);
+void cpu_broadcast_halt(void);
+void cpu_kick(struct cpu_info *);
extern uint32_t cpus_attached;
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.90 src/sys/arch/x86/x86/cpu.c:1.91
--- src/sys/arch/x86/x86/cpu.c:1.90 Fri Jul 29 21:21:43 2011
+++ src/sys/arch/x86/x86/cpu.c Thu Aug 11 18:11:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.90 2011/07/29 21:21:43 dyoung Exp $ */
+/* $NetBSD: cpu.c,v 1.91 2011/08/11 18:11:17 cherry Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.90 2011/07/29 21:21:43 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.91 2011/08/11 18:11:17 cherry Exp $);
#include opt_ddb.h
#include opt_mpbios.h /* for MPDEBUG */
@@ -1210,3 +1210,23 @@
lcr3(pmap_pdirpa(pmap, 0));
#endif /* PAE */
}
+
+/*
+ * Notify all other cpus to halt.
+ */
+
+void
+cpu_broadcast_halt(struct cpu_info *ci)
+{
+ x86_broadcast_ipi(X86_IPI_HALT);
+}
+
+/*
+ * Send a dummy ipi to a cpu to force it to run splraise()/spllower()
+ */
+
+void
+cpu_kick(struct cpu_info *ci)
+{
+ x86_send_ipi(ci, 0);
+}
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.54 src/sys/arch/x86/x86/x86_machdep.c:1.55
--- src/sys/arch/x86/x86/x86_machdep.c:1.54 Wed Aug 10 11:39:45 2011
+++ src/sys/arch/x86/x86/x86_machdep.c Thu Aug 11 18:11:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.54 2011/08/10
CVS commit: src/sys/arch
Module Name:src Committed By: cherry Date: Thu Aug 11 18:36:14 UTC 2011 Modified Files: src/sys/arch/amd64/amd64: fpu.c src/sys/arch/i386/isa: npx.c Log Message: unbreak the build. #include sys/cpu.h To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amd64/amd64/fpu.c cvs rdiff -u -r1.142 -r1.143 src/sys/arch/i386/isa/npx.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/amd64/amd64/fpu.c diff -u src/sys/arch/amd64/amd64/fpu.c:1.37 src/sys/arch/amd64/amd64/fpu.c:1.38 --- src/sys/arch/amd64/amd64/fpu.c:1.37 Thu Aug 11 18:05:11 2011 +++ src/sys/arch/amd64/amd64/fpu.c Thu Aug 11 18:36:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.37 2011/08/11 18:05:11 cherry Exp $ */ +/* $NetBSD: fpu.c,v 1.38 2011/08/11 18:36:14 cherry Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. All @@ -100,13 +100,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.37 2011/08/11 18:05:11 cherry Exp $); +__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.38 2011/08/11 18:36:14 cherry Exp $); #include opt_multiprocessor.h #include sys/param.h #include sys/systm.h #include sys/conf.h +#include sys/cpu.h #include sys/file.h #include sys/proc.h #include sys/ioctl.h Index: src/sys/arch/i386/isa/npx.c diff -u src/sys/arch/i386/isa/npx.c:1.142 src/sys/arch/i386/isa/npx.c:1.143 --- src/sys/arch/i386/isa/npx.c:1.142 Thu Aug 11 18:05:11 2011 +++ src/sys/arch/i386/isa/npx.c Thu Aug 11 18:36:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: npx.c,v 1.142 2011/08/11 18:05:11 cherry Exp $ */ +/* $NetBSD: npx.c,v 1.143 2011/08/11 18:36:13 cherry Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.142 2011/08/11 18:05:11 cherry Exp $); +__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.143 2011/08/11 18:36:13 cherry Exp $); #if 0 #define IPRINTF(x) printf x @@ -110,6 +110,7 @@ #include sys/param.h #include sys/systm.h #include sys/conf.h +#include sys/cpu.h #include sys/file.h #include sys/proc.h #include sys/ioctl.h
CVS commit: src/sys/arch
Module Name:src
Committed By: cherry
Date: Thu Aug 11 19:52:53 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64: db_interface.c
src/sys/arch/i386/i386: db_interface.c
Log Message:
make ddb minimally MP aware
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amd64/amd64/db_interface.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/i386/i386/db_interface.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/amd64/amd64/db_interface.c
diff -u src/sys/arch/amd64/amd64/db_interface.c:1.23 src/sys/arch/amd64/amd64/db_interface.c:1.24
--- src/sys/arch/amd64/amd64/db_interface.c:1.23 Sun Apr 3 22:29:25 2011
+++ src/sys/arch/amd64/amd64/db_interface.c Thu Aug 11 19:52:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.23 2011/04/03 22:29:25 dyoung Exp $ */
+/* $NetBSD: db_interface.c,v 1.24 2011/08/11 19:52:52 cherry Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.23 2011/04/03 22:29:25 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.24 2011/08/11 19:52:52 cherry Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -82,7 +82,9 @@
#ifdef MULTIPROCESSOR
extern void ddb_ipi(struct trapframe);
static void ddb_suspend(struct trapframe *);
+#ifndef XEN
int ddb_vec;
+#endif /* XEN */
static bool ddb_mp_online;
#endif
@@ -98,9 +100,13 @@
{
#ifdef MULTIPROCESSOR
+#ifndef XEN
ddb_vec = idt_vec_alloc(0xf0, 0xff);
setgate((struct gate_descriptor *)idt[ddb_vec], Xintrddb, 1,
SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
+#else
+ /* Initialised as part of xen_ipi_init() */
+#endif /* XEN */
#endif
}
@@ -114,8 +120,10 @@
int cpu_me = cpu_number();
int win;
+#ifndef XEN
if (ddb_vec == 0)
return 1;
+#endif /* XEN */
__cpu_simple_lock(db_lock);
if (ddb_cpu == NOCPU)
@@ -123,7 +131,12 @@
win = (ddb_cpu == cpu_me);
__cpu_simple_unlock(db_lock);
if (win) {
+#ifdef XEN
+ xen_broadcast_ipi(XEN_IPI_DDB);
+#else
x86_ipi(ddb_vec, LAPIC_DEST_ALLEXCL, LAPIC_DLMODE_FIXED);
+#endif /* XEN */
+
}
ddb_mp_online = x86_mp_online;
x86_mp_online = false;
Index: src/sys/arch/i386/i386/db_interface.c
diff -u src/sys/arch/i386/i386/db_interface.c:1.66 src/sys/arch/i386/i386/db_interface.c:1.67
--- src/sys/arch/i386/i386/db_interface.c:1.66 Sun Apr 3 22:29:26 2011
+++ src/sys/arch/i386/i386/db_interface.c Thu Aug 11 19:52:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.66 2011/04/03 22:29:26 dyoung Exp $ */
+/* $NetBSD: db_interface.c,v 1.67 2011/08/11 19:52:52 cherry Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.66 2011/04/03 22:29:26 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.67 2011/08/11 19:52:52 cherry Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -86,7 +86,9 @@
extern void ddb_ipi(int, struct trapframe);
extern void ddb_ipi_tss(struct i386tss *);
static void ddb_suspend(struct trapframe *);
+#ifndef XEN
int ddb_vec;
+#endif /* XEN */
static bool ddb_mp_online;
#endif
@@ -104,8 +106,12 @@
{
#ifdef MULTIPROCESSOR
+#ifndef XEN
ddb_vec = idt_vec_alloc(0xf0, 0xff);
idt_vec_set(ddb_vec, Xintrddbipi);
+#else
+ /* Initialised as part of xen_ipi_init() */
+#endif /* XEN */
#endif
}
@@ -119,8 +125,10 @@
int cpu_me = cpu_number();
int win;
+#ifndef XEN
if (ddb_vec == 0)
return 1;
+#endif /* XEN */
__cpu_simple_lock(db_lock);
if (ddb_cpu == NOCPU)
@@ -128,7 +136,11 @@
win = (ddb_cpu == cpu_me);
__cpu_simple_unlock(db_lock);
if (win) {
+#ifdef XEN
+ xen_broadcast_ipi(XEN_IPI_DDB);
+#else
x86_ipi(ddb_vec, LAPIC_DEST_ALLEXCL, LAPIC_DLMODE_FIXED);
+#endif /* XEN */
}
ddb_mp_online = x86_mp_online;
x86_mp_online = false;
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: cherry
Date: Thu Aug 11 20:33:20 UTC 2011
Modified Files:
src/sys/arch/x86/x86: cpu.c
Log Message:
Unbreak the build. (conflicting types in function declaration and definition)
Thanks riz@
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/x86/x86/cpu.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/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.91 src/sys/arch/x86/x86/cpu.c:1.92
--- src/sys/arch/x86/x86/cpu.c:1.91 Thu Aug 11 18:11:17 2011
+++ src/sys/arch/x86/x86/cpu.c Thu Aug 11 20:33:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.91 2011/08/11 18:11:17 cherry Exp $ */
+/* $NetBSD: cpu.c,v 1.92 2011/08/11 20:33:20 cherry Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.91 2011/08/11 18:11:17 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.92 2011/08/11 20:33:20 cherry Exp $);
#include opt_ddb.h
#include opt_mpbios.h /* for MPDEBUG */
@@ -1216,7 +1216,7 @@
*/
void
-cpu_broadcast_halt(struct cpu_info *ci)
+cpu_broadcast_halt(void)
{
x86_broadcast_ipi(X86_IPI_HALT);
}
CVS commit: src/sys/arch/sandpoint/conf
Module Name:src Committed By: phx Date: Thu Aug 11 20:56:34 UTC 2011 Modified Files: src/sys/arch/sandpoint/conf: GENERIC Log Message: Add viaide for Iomega Storcenter, although a VT6410 driver still needs to be written. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sandpoint/conf/GENERIC 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/sandpoint/conf/GENERIC diff -u src/sys/arch/sandpoint/conf/GENERIC:1.59 src/sys/arch/sandpoint/conf/GENERIC:1.60 --- src/sys/arch/sandpoint/conf/GENERIC:1.59 Mon Apr 11 18:02:11 2011 +++ src/sys/arch/sandpoint/conf/GENERIC Thu Aug 11 20:56:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.59 2011/04/11 18:02:11 phx Exp $ +# $NetBSD: GENERIC,v 1.60 2011/08/11 20:56:34 phx Exp $ # # machine description file for GENERIC NAS # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.59 $ +#ident GENERIC-$Revision: 1.60 $ maxusers 32 @@ -197,6 +197,7 @@ cmdide* at pci? dev ? function ? # CMD tech IDE controllers iteide* at pci? dev ? function ? # IT Express IDE controllers satalink* at pci? dev ? function ? # SiI SATALink controllers +viaide* at pci? dev ? function ? # VIA IDE controllers # ATA (IDE) bus support atabus* at ata?
CVS commit: src/sys/compat/common
Module Name:src
Committed By: jmcneill
Date: Thu Aug 11 21:23:09 UTC 2011
Modified Files:
src/sys/compat/common: Makefile
Log Message:
add libcompat.o/.po targets for COMPAT_AS=obj
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/compat/common/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/compat/common/Makefile
diff -u src/sys/compat/common/Makefile:1.46 src/sys/compat/common/Makefile:1.47
--- src/sys/compat/common/Makefile:1.46 Mon Jan 17 15:57:04 2011
+++ src/sys/compat/common/Makefile Thu Aug 11 21:23:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2011/01/17 15:57:04 pooka Exp $
+# $NetBSD: Makefile,v 1.47 2011/08/11 21:23:09 jmcneill Exp $
LIB= compat
NOPIC= # defined
@@ -57,5 +57,15 @@
.undef DESTDIR
.include bsd.lib.mk
+lib${LIB}.o:: ${OBJS}
+ @echo building standard ${LIB} library
+ @rm -f lib${LIB}.o
+ @${LD} -r -o lib${LIB}.o `NM=${NM} ${LORDER} ${OBJS} | ${TSORT}`
+
+lib${LIB}.po:: ${POBJS}
+ @echo building profiled ${LIB} library
+ @rm -f lib${LIB}.po
+ @${LD} -r -o lib${LIB}.po `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}`
+
showsources: ${SRCS}
@echo ${.ALLSRC}
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915
Module Name:xsrc Committed By: joerg Date: Thu Aug 11 21:52:02 UTC 2011 Modified Files: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915: i830_texstate.c i915_texstate.c Log Message: Fix memset usage. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i830_texstate.c \ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i915_texstate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i830_texstate.c diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i830_texstate.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i830_texstate.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i830_texstate.c:1.1.1.4 Mon Jul 19 05:31:37 2010 +++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i830_texstate.c Thu Aug 11 21:52:01 2011 @@ -124,7 +124,7 @@ GLubyte border[4]; GLuint dst_x, dst_y; - memset(state, 0, sizeof(state)); + memset(state, 0, sizeof(*state)); /*We need to refcount these. */ Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i915_texstate.c diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i915_texstate.c:1.1.1.4 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i915_texstate.c:1.2 --- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i915_texstate.c:1.1.1.4 Mon Jul 19 05:31:37 2010 +++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/i915_texstate.c Thu Aug 11 21:52:01 2011 @@ -141,7 +141,7 @@ GLubyte border[4]; GLfloat maxlod; - memset(state, 0, sizeof(state)); + memset(state, 0, sizeof(*state)); /*We need to refcount these. */
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc Committed By: joerg Date: Thu Aug 11 21:59:46 UTC 2011 Modified Files: xsrc/external/mit/fontconfig/dist/src: fccache.c Log Message: Fix memset usage To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/fontconfig/dist/src/fccache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/dist/src/fccache.c diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.1.1.2 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.2 --- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.1.1.2 Sun Nov 21 06:35:32 2010 +++ xsrc/external/mit/fontconfig/dist/src/fccache.c Thu Aug 11 21:59:46 2011 @@ -1157,7 +1157,7 @@ MD5Transform(ctx-buf, (FcChar32 *) ctx-in); byteReverse((unsigned char *) ctx-buf, 4); memcpy(digest, ctx-buf, 16); -memset(ctx, 0, sizeof(ctx));/* In case it's sensitive */ +memset(ctx, 0, sizeof(*ctx));/* In case it's sensitive */ }
CVS commit: xsrc/external/mit/libXTrap/dist/src
Module Name:xsrc
Committed By: joerg
Date: Thu Aug 11 22:10:53 UTC 2011
Modified Files:
xsrc/external/mit/libXTrap/dist/src: XEConTxt.c
Log Message:
Fix memset usage
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libXTrap/dist/src/XEConTxt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXTrap/dist/src/XEConTxt.c
diff -u xsrc/external/mit/libXTrap/dist/src/XEConTxt.c:1.1.1.1 xsrc/external/mit/libXTrap/dist/src/XEConTxt.c:1.2
--- xsrc/external/mit/libXTrap/dist/src/XEConTxt.c:1.1.1.1 Wed Jul 30 02:44:23 2008
+++ xsrc/external/mit/libXTrap/dist/src/XEConTxt.c Thu Aug 11 22:10:52 2011
@@ -71,7 +71,7 @@
{
firsttime = False;
/* The first Trap Context is the Template (default) TC */
-(void)memset(tc,0L,sizeof(tc));
+(void)memset(tc,0L,sizeof(*tc));
tc-eventBase = 0x7FFFL;
tc-errorBase = 0x7FFFL;
tc-values.v.max_pkt_size = 0x7FFFL;
CVS commit: xsrc/external/mit/libXfont/dist/src/FreeType
Module Name:xsrc Committed By: joerg Date: Thu Aug 11 22:12:07 UTC 2011 Modified Files: xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c Log Message: Assume for a moment that the intention here is to do something useful. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.1.1.2 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.2 --- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.1.1.2 Wed Jun 10 07:33:40 2009 +++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Thu Aug 11 22:12:07 2011 @@ -125,7 +125,7 @@ FT_ULong len = sizeof(buff); FT_UShort result = 0; - if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, len ) ); + if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, len ) ) result = (FT_UShort)( (buff[0] 8) | buff[1] ); return result;
CVS commit: xsrc/external/mit/libxkbui/dist/src
Module Name:xsrc
Committed By: joerg
Date: Thu Aug 11 22:13:37 UTC 2011
Modified Files:
xsrc/external/mit/libxkbui/dist/src: XKBui.c
Log Message:
Fix logical vs bit op.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libxkbui/dist/src/XKBui.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libxkbui/dist/src/XKBui.c
diff -u xsrc/external/mit/libxkbui/dist/src/XKBui.c:1.1.1.1 xsrc/external/mit/libxkbui/dist/src/XKBui.c:1.2
--- xsrc/external/mit/libxkbui/dist/src/XKBui.c:1.1.1.1 Wed Jul 30 02:59:40 2008
+++ xsrc/external/mit/libxkbui/dist/src/XKBui.c Thu Aug 11 22:13:37 2011
@@ -104,7 +104,7 @@
char buf[20];
sprintf(buf,#%02x%02x%02x,(sdef.red8)0xff,
(sdef.green8)0xff,
- (sdef.blue8)0xff);
+ (sdef.blue8)0xff);
if (XAllocNamedColor(view-dpy,view-opts.cmap,buf,sdef,xdef)) {
xkb-geom-colors[i].pixel= sdef.pixel;
#ifdef DEBUG
CVS commit: xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals
Module Name:xsrc
Committed By: joerg
Date: Thu Aug 11 22:16:45 UTC 2011
Modified Files:
xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals:
mapdesc.cc
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals/mapdesc.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals/mapdesc.cc
diff -u xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals/mapdesc.cc:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals/mapdesc.cc:1.2
--- xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals/mapdesc.cc:1.1.1.2 Thu Jun 11 00:50:22 2009
+++ xsrc/external/mit/MesaLib/dist/src/glu/sgi/libnurbs/internals/mapdesc.cc Thu Aug 11 22:16:45 2011
@@ -90,7 +90,7 @@
void
Mapdesc::identify( REAL dest[MAXCOORDS][MAXCOORDS] )
{
-memset( dest, 0, sizeof( dest ) );
+memset( dest, 0, sizeof( *dest ) );
for( int i=0; i != hcoords; i++ )
dest[i][i] = 1.0;
}
CVS commit: xsrc/external/mit/xcb-util/dist/property
Module Name:xsrc
Committed By: joerg
Date: Thu Aug 11 22:26:13 UTC 2011
Modified Files:
xsrc/external/mit/xcb-util/dist/property: property.c
Log Message:
Fix memset usage
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xcb-util/dist/property/property.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xcb-util/dist/property/property.c
diff -u xsrc/external/mit/xcb-util/dist/property/property.c:1.1.1.1 xsrc/external/mit/xcb-util/dist/property/property.c:1.2
--- xsrc/external/mit/xcb-util/dist/property/property.c:1.1.1.1 Sat Jul 17 20:28:32 2010
+++ xsrc/external/mit/xcb-util/dist/property/property.c Thu Aug 11 22:26:13 2011
@@ -95,7 +95,7 @@
void
xcb_property_handlers_init(xcb_property_handlers_t *prophs, xcb_event_handlers_t *evenths)
{
-memset(prophs, 0, sizeof(prophs));
+memset(prophs, 0, sizeof(*prophs));
prophs-evenths = evenths;
xcb_event_set_property_notify_handler(evenths, handle_property_notify_event, prophs);
}
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: jmcneill
Date: Thu Aug 11 22:26:19 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: pmap.c
Log Message:
pmap_memory isn't a static array anymore so sizeof doesn't work on it
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/usermode/usermode/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/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.6 src/sys/arch/usermode/usermode/pmap.c:1.7
--- src/sys/arch/usermode/usermode/pmap.c:1.6 Wed Aug 10 01:32:44 2011
+++ src/sys/arch/usermode/usermode/pmap.c Thu Aug 11 22:26:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.6 2011/08/10 01:32:44 jmcneill Exp $ */
+/* $NetBSD: pmap.c,v 1.7 2011/08/11 22:26:18 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.6 2011/08/10 01:32:44 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.7 2011/08/11 22:26:18 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -45,6 +45,7 @@
struct pmap * const kernel_pmap_ptr = pmap_kernel_store;
static uint8_t *pmap_memory;
+static vsize_t pmap_memory_size = 1024 * MEMSIZE;
static vaddr_t virtual_avail, virtual_end;
static vaddr_t pmap_maxkvaddr;
@@ -53,12 +54,12 @@
void
pmap_bootstrap(void)
{
- pmap_memory = calloc(1, 1024 * MEMSIZE);
+ pmap_memory = calloc(1, pmap_memory_size);
if (pmap_memory == NULL)
panic(pmap_bootstrap: no memory);
virtual_avail = (vaddr_t)pmap_memory;
- virtual_end = virtual_avail + sizeof(pmap_memory);
+ virtual_end = virtual_avail + pmap_memory_size;
uvm_page_physload(atop(virtual_avail),
atop(virtual_end),
CVS commit: xsrc/external/mit/xinput/dist/src
Module Name:xsrc
Committed By: joerg
Date: Thu Aug 11 22:35:10 UTC 2011
Modified Files:
xsrc/external/mit/xinput/dist/src: xinput.c
Log Message:
Call print_version without argument and mark it as void.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xinput/dist/src/xinput.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinput/dist/src/xinput.c
diff -u xsrc/external/mit/xinput/dist/src/xinput.c:1.1.1.5 xsrc/external/mit/xinput/dist/src/xinput.c:1.2
--- xsrc/external/mit/xinput/dist/src/xinput.c:1.1.1.5 Thu Jun 17 03:00:36 2010
+++ xsrc/external/mit/xinput/dist/src/xinput.c Thu Aug 11 22:35:10 2011
@@ -140,7 +140,7 @@
static const char version_id[] = VERSION;
int
-print_version()
+print_version(void)
{
XExtensionVersion *version;
Display *display;
@@ -336,7 +336,7 @@
while((*func) == '-') func++;
if (strcmp(version, func) == 0) {
-return print_version(argv[0]);
+return print_version();
}
display = XOpenDisplay(NULL);
CVS commit: xsrc/external/mit/xsetpointer/dist
Module Name:xsrc
Committed By: joerg
Date: Thu Aug 11 22:37:06 UTC 2011
Modified Files:
xsrc/external/mit/xsetpointer/dist: xsetpointer.c
Log Message:
Fix format string
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xsetpointer/dist/xsetpointer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xsetpointer/dist/xsetpointer.c
diff -u xsrc/external/mit/xsetpointer/dist/xsetpointer.c:1.1.1.1 xsrc/external/mit/xsetpointer/dist/xsetpointer.c:1.2
--- xsrc/external/mit/xsetpointer/dist/xsetpointer.c:1.1.1.1 Wed Jul 30 04:38:39 2008
+++ xsrc/external/mit/xsetpointer/dist/xsetpointer.c Thu Aug 11 22:37:06 2011
@@ -103,7 +103,7 @@
for(loop=0; loopnum_devices; loop++)
{
if (list) {
- printf(%d: \%s\ [, devices[loop].id, devices[loop].name ? devices[loop].name : noname);
+ printf(%lu: \%s\ [, (unsigned long)devices[loop].id, devices[loop].name ? devices[loop].name : noname);
switch(devices[loop].use) {
case IsXPointer:
printf(XPointer]\n);
CVS commit: src/sys/conf
Module Name:src
Committed By: jmcneill
Date: Thu Aug 11 22:37:57 UTC 2011
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
let md makefile add newvers.sh flags by setting NVFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.144 src/sys/conf/Makefile.kern.inc:1.145
--- src/sys/conf/Makefile.kern.inc:1.144 Tue Aug 9 13:02:53 2011
+++ src/sys/conf/Makefile.kern.inc Thu Aug 11 22:37:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.144 2011/08/09 13:02:53 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.145 2011/08/11 22:37:57 jmcneill Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -281,9 +281,9 @@
MKREPRO?=no
.if ${MKREPRO} == yes
-_NVFLAGS=-r
+_NVFLAGS=${NVFLAGS} -r
.else
-_NVFLAGS=
+_NVFLAGS=${NVFLAGS}
.endif
.if !target(vers.o)
CVS commit: src/sys/arch/usermode/conf
Module Name:src
Committed By: jmcneill
Date: Thu Aug 11 22:38:25 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: Makefile.usermode
Log Message:
Instead of trying to override vers.o target, set NVFLAGS=-n
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/usermode/conf/Makefile.usermode
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.6 src/sys/arch/usermode/conf/Makefile.usermode:1.7
--- src/sys/arch/usermode/conf/Makefile.usermode:1.6 Thu Aug 11 22:30:41 2011
+++ src/sys/arch/usermode/conf/Makefile.usermode Thu Aug 11 22:38:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.6 2011/08/11 22:30:41 jmcneill Exp $
+# $NetBSD: Makefile.usermode,v 1.7 2011/08/11 22:38:25 jmcneill Exp $
MACHINE_ARCH= usermode
USETOOLS?= no
@@ -38,13 +38,7 @@
${_MKSHECHO}\
${CC} ${COPTS} -Wl,-Map,$@.map -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \
${CC} ${COPTS} -Wl,-Map,$@.map -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
-
-newvers: vers.o
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh $S/conf/osrelease.sh
- ${_MKMSG_CREATE} vers.c
- ${HOST_SH} $S/conf/newvers.sh -n ${_NVFLAGS}
- ${_MKTARGET_COMPILE}
- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
+NVFLAGS= -n
##
## (6) port specific target dependencies
CVS commit: src
Module Name:src
Committed By: apb
Date: Thu Aug 11 22:52:47 UTC 2011
Modified Files:
src/etc: rc rc.subr
src/share/man/man8: rc.subr.8
Log Message:
Allow echo -n to work as expected in rc.d scripts that are executed
by /etc/rc. Similarly for printf with a format that does not end with
\n. Previously, the partial line would not be visible on the console
until a newline was printed, possibly after an annoying delay.
This is done by adding echo() and printf() shell functions to rc.subr,
so that naive use of the echo and printf commands in rc.d scripts will
call these functions instead of the underlying commands. These shell
functions send a new nop metadata message after the partial line, and
the rc_postprocess function in /etc/rc disentangles the partial line of
plain output from the metadata nop.
Also add a -n option to the print_rc_normal function in rc.subr,
and make some cosmetic changes.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/etc/rc
cvs rdiff -u -r1.87 -r1.88 src/etc/rc.subr
cvs rdiff -u -r1.28 -r1.29 src/share/man/man8/rc.subr.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc
diff -u src/etc/rc:1.165 src/etc/rc:1.166
--- src/etc/rc:1.165 Fri Jun 4 18:42:54 2010
+++ src/etc/rc Thu Aug 11 22:52:47 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: rc,v 1.165 2010/06/04 18:42:54 christos Exp $
+# $NetBSD: rc,v 1.166 2011/08/11 22:52:47 apb Exp $
#
# rc --
# Run the scripts in /etc/rc.d with rcorder, and log output
@@ -24,6 +24,10 @@
: ${RC_LOG_FILE:=/var/run/rc.log}
+# rc.subr redefines echo and printf. Undo that here.
+unset echo ; unalias echo
+unset printf ; unalias printf
+
if ! checkyesno rc_configured; then
echo /etc/rc.conf is not configured. Multiuser boot aborted.
exit 1
@@ -194,9 +198,10 @@
;;
*${rc_metadata_prefix}*)
# magic string is present, but not at the start of
- # the line. Treat it like two separate lines.
+ # the line. Treat it as a partial line of
+ # ordinary data, followed by a line of metadata.
before=${line%${rc_metadata_prefix}*}
- rc_postprocess_plain_line ${before}
+ rc_postprocess_partial_line ${before}
after=${line#*${rc_metadata_prefix}}
rc_postprocess_metadata ${after}
;;
@@ -233,6 +238,22 @@
}
#
+# rc_postprocess_partial_line string
+# This is just like rc_postprocess_plain_line, except that
+# a newline is not appended to the string.
+#
+rc_postprocess_partial_line()
+{
+ local line=$1
+ rc_log_message_n ${line}
+ if $rc_silent; then
+ eval $rc_silent_cmd
+ else
+ printf %s ${line}
+ fi
+}
+
+#
# rc_postprocess_metadata string
# $1 is a string containing metadata from the rc_real_work()
# function. The rc_metadata_prefix marker should already
@@ -284,6 +305,9 @@
;;
esac
;;
+ nop)
+ # Do nothing.
+ ;;
note)
rc_log_message [NOTE: $args]
;;
@@ -323,7 +347,8 @@
#
# rc_log_message string [...]
-# write a message to the log file, or buffer it for later.
+# Write a message to the log file, or buffer it for later.
+# This function appends a newline to the message.
#
rc_log_message()
{
@@ -332,6 +357,16 @@
}
#
+# rc_log_message_n string [...]
+# Just like rc_log_message, except without appending a newline.
+#
+rc_log_message_n()
+{
+ _rc_log_buffer=${_rc_log_buffer}${*}
+ rc_log_flush
+}
+
+#
# rc_log_flush [OK|FORCE]
# save outstanding messages from $_rc_log_buffer to $RC_LOG_FILE.
#
Index: src/etc/rc.subr
diff -u src/etc/rc.subr:1.87 src/etc/rc.subr:1.88
--- src/etc/rc.subr:1.87 Thu Jun 9 14:52:01 2011
+++ src/etc/rc.subr Thu Aug 11 22:52:47 2011
@@ -1,6 +1,6 @@
-# $NetBSD: rc.subr,v 1.87 2011/06/09 14:52:01 christos Exp $
+# $NetBSD: rc.subr,v 1.88 2011/08/11 22:52:47 apb Exp $
#
-# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
+# Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
@@ -542,9 +542,11 @@
fi
for _elem in $_keywords; do
if [ $_elem = $rc_arg ]; then
- echo 12 \$${rcvar} is not enabled - see ${rcvar_manpage}.
- echo 12 Use the following if you wish to perform the operation:
- echo 12 $0 one${rc_arg}
+ cat 12 EOF
+\$${rcvar} is not enabled - see ${rcvar_manpage}.
+Use the following if you wish to perform the operation:
+ $0 one${rc_arg}
+EOF
exit 1
fi
done
@@ -1113,28 +1115,58 @@
# print, prefixing the output with $_rc_metadata_prefix.
#
if [ -n $_rc_postprocessor_fd ]; then
- printf %s%s\n $rc_metadata_prefix $1 \
+ command printf %s%s\n $rc_metadata_prefix $1 \
${_rc_postprocessor_fd}
fi
}
#
-# print_rc_normal string
+# _flush_rc_output
+# Arrange for output to be flushed, if we are running
+# inside /etc/rc with postprocessing.
+#
+_flush_rc_output()
+{
+ print_rc_metadata nop
+}
+
+#
+# print_rc_normal [-n] string
# Print the
CVS commit: src/sys/arch/usermode
Module Name:src
Committed By: jmcneill
Date: Thu Aug 11 23:04:44 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: GENERIC
src/sys/arch/usermode/dev: cpu.c
src/sys/arch/usermode/include: cpu.h
Log Message:
initialize lwp0 l_addr so we can switch back to it
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/usermode/conf/GENERIC
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/usermode/dev/cpu.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/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/usermode/conf/GENERIC
diff -u src/sys/arch/usermode/conf/GENERIC:1.7 src/sys/arch/usermode/conf/GENERIC:1.8
--- src/sys/arch/usermode/conf/GENERIC:1.7 Thu Aug 11 22:30:41 2011
+++ src/sys/arch/usermode/conf/GENERIC Thu Aug 11 23:04:43 2011
@@ -1,11 +1,13 @@
-# $NetBSD: GENERIC,v 1.7 2011/08/11 22:30:41 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.8 2011/08/11 23:04:43 jmcneill Exp $
include arch/usermode/conf/std.usermode
options INCLUDE_CONFIG_FILE
-#ident GENERIC-$Revision: 1.7 $
+#ident GENERIC-$Revision: 1.8 $
maxusers 32
+makeoptions DEBUG=-g3
+
#options MEMSIZE=65536 # amount of memory to allocate (in KB)
options MEMSIZE=131072
@@ -23,9 +25,6 @@
options NKMEMPAGES=256
-#options DDB
-#options DDB_HISTORY_SIZE=512
-
options COMPAT_BSDPTY
options COMPAT_50
Index: src/sys/arch/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.8 src/sys/arch/usermode/dev/cpu.c:1.9
--- src/sys/arch/usermode/dev/cpu.c:1.8 Wed Aug 10 01:32:44 2011
+++ src/sys/arch/usermode/dev/cpu.c Thu Aug 11 23:04:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.8 2011/08/10 01:32:44 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.9 2011/08/11 23:04:44 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.8 2011/08/10 01:32:44 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.9 2011/08/11 23:04:44 jmcneill Exp $);
#include sys/param.h
#include sys/conf.h
@@ -61,6 +61,8 @@
struct cpu_info *sc_ci;
} cpu_softc_t;
+static ucontext_t lwp0pcb;
+
CFATTACH_DECL_NEW(cpu, sizeof(cpu_softc_t), cpu_match, cpu_attach, NULL, NULL);
static int
@@ -86,9 +88,11 @@
sc-sc_ci = cpu_info_primary;
sc-sc_ci-ci_dev = 0;
sc-sc_ci-ci_self = cpu_info_primary;
-#if notyet
sc-sc_ci-ci_curlwp = lwp0;
-#endif
+
+ if (getcontext(lwp0pcb))
+ panic(getcontext failed);
+ uvm_lwp_setuarea(lwp0, (vaddr_t)lwp0pcb);
}
void
@@ -133,7 +137,7 @@
void
cpu_need_resched(struct cpu_info *ci, int flags)
{
- ci-ci_want_resched = 1;
+ ci-ci_want_resched |= flags;
}
void
Index: src/sys/arch/usermode/include/cpu.h
diff -u src/sys/arch/usermode/include/cpu.h:1.3 src/sys/arch/usermode/include/cpu.h:1.4
--- src/sys/arch/usermode/include/cpu.h:1.3 Wed Oct 21 21:12:04 2009
+++ src/sys/arch/usermode/include/cpu.h Thu Aug 11 23:04:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.3 2009/10/21 21:12:04 rmind Exp $ */
+/* $NetBSD: cpu.h,v 1.4 2011/08/11 23:04:44 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -46,9 +46,7 @@
int ci_want_resched;
volatile int ci_mtx_count;
volatile int ci_mtx_oldspl;
-#if notyet
lwp_t *ci_curlwp;
-#endif
lwp_t *ci_stash;
};
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc Committed By: joerg Date: Thu Aug 11 23:15:03 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: i830_lvds.c Log Message: Fix memset usage. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c:1.1.1.2 Tue Jun 9 02:54:33 2009 +++ xsrc/external/mit/xf86-video-intel/dist/src/i830_lvds.c Thu Aug 11 23:15:03 2011 @@ -430,7 +430,7 @@ } } state_name = malloc(strlen(ACPI_LID) + strlen(lid_dent-d_name) + 7); -memset(state_name, 0, sizeof(state_name)); +memset(state_name, 0, sizeof(*state_name)); strcat(state_name, ACPI_LID); strcat(state_name, lid_dent-d_name); strcat(state_name, /state);
CVS commit: src/external/mit/xorg
Module Name:src Committed By: joerg Date: Thu Aug 11 23:15:41 UTC 2011 Modified Files: src/external/mit/xorg/bin/bitmap: Makefile src/external/mit/xorg/bin/editres: Makefile src/external/mit/xorg/bin/fonttosfnt: Makefile src/external/mit/xorg/bin/twm: Makefile src/external/mit/xorg/bin/xedit/lisp: Makefile src/external/mit/xorg/bin/xkbcomp: Makefile src/external/mit/xorg/bin/xmh: Makefile src/external/mit/xorg/bin/xrandr: Makefile src/external/mit/xorg/bin/xwininfo: Makefile src/external/mit/xorg/lib/dri/i810: Makefile src/external/mit/xorg/lib/dri/i915: Makefile src/external/mit/xorg/lib/dri/i965: Makefile src/external/mit/xorg/lib/dri/libmesa: Makefile src/external/mit/xorg/lib/dri/mach64: Makefile src/external/mit/xorg/lib/dri/mga: Makefile src/external/mit/xorg/lib/dri/r128: Makefile src/external/mit/xorg/lib/dri/r200: Makefile src/external/mit/xorg/lib/dri/r300: Makefile src/external/mit/xorg/lib/dri/r600: Makefile src/external/mit/xorg/lib/dri/radeon: Makefile src/external/mit/xorg/lib/dri/savage: Makefile src/external/mit/xorg/lib/dri/sis: Makefile src/external/mit/xorg/lib/dri/tdfx: Makefile src/external/mit/xorg/lib/dri/unichrome: Makefile src/external/mit/xorg/lib/fontconfig/src: Makefile src/external/mit/xorg/lib/libGL: Makefile src/external/mit/xorg/lib/libGLU: Makefile src/external/mit/xorg/lib/libIntelXvMC: Makefile src/external/mit/xorg/lib/libOSMesa: Makefile src/external/mit/xorg/lib/libX11/dynamic: Makefile src/external/mit/xorg/lib/libX11/static: Makefile src/external/mit/xorg/lib/libX11/ximcp: Makefile src/external/mit/xorg/lib/libXaw: Makefile src/external/mit/xorg/lib/libXfont: Makefile src/external/mit/xorg/lib/libXi: Makefile src/external/mit/xorg/lib/libXrandr: Makefile src/external/mit/xorg/lib/libXt: Makefile src/external/mit/xorg/lib/libdrm: Makefile src/external/mit/xorg/lib/libdrm_intel: Makefile src/external/mit/xorg/lib/xcb-util/image: Makefile src/external/mit/xorg/lib/xcb-util/render-util: Makefile src/external/mit/xorg/server/drivers/xf86-video-ast: Makefile src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile src/external/mit/xorg/server/drivers/xf86-video-mach64: Makefile src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile src/external/mit/xorg/server/drivers/xf86-video-s3virge: Makefile src/external/mit/xorg/server/drivers/xf86-video-savage: Makefile src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile src/external/mit/xorg/server/xorg-server/Xi: Makefile src/external/mit/xorg/server/xorg-server/dix: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: Makefile Log Message: Various warning adjustments for clang To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/bitmap/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/editres/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fonttosfnt/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/twm/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xedit/lisp/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xkbcomp/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xmh/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xrandr/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xwininfo/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/i810/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/dri/i915/Makefile cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/dri/i965/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/libmesa/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/mach64/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/mga/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/r128/Makefile cvs rdiff -u -r1.7 -r1.8
CVS commit: src/sys/arch/usermode
Module Name:src
Committed By: jmcneill
Date: Fri Aug 12 00:57:25 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/arch/usermode/dev: clock.c cpu.c ttycons.c
src/sys/arch/usermode/include: cpu.h pcb.h
Added Files:
src/sys/arch/usermode/include: thunk.h
src/sys/arch/usermode/usermode: thunk.c
Log Message:
Clean up extern mess by adding an API for kernel components to call libc
functions. thunk.c is built with special cflags that makes it compile
against standard system headers instead of kernel ones.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/dev/clock.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/usermode/dev/cpu.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/dev/ttycons.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/include/cpu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/usermode/include/pcb.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/usermode/include/thunk.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/usermode/usermode/thunk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.7 src/sys/arch/usermode/conf/Makefile.usermode:1.8
--- src/sys/arch/usermode/conf/Makefile.usermode:1.7 Thu Aug 11 22:38:25 2011
+++ src/sys/arch/usermode/conf/Makefile.usermode Fri Aug 12 00:57:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.7 2011/08/11 22:38:25 jmcneill Exp $
+# $NetBSD: Makefile.usermode,v 1.8 2011/08/12 00:57:23 jmcneill Exp $
MACHINE_ARCH= usermode
USETOOLS?= no
@@ -18,6 +18,8 @@
CPPFLAGS+= -Dusermode
CPPFLAGS.init_main.c+= -Dmain=kernmain
+CPPFLAGS.thunk.c+= -U_KERNEL -I/usr/include
+
##
## (3) libkern and compat
##
@@ -27,14 +29,14 @@
##
## (4) local objects, compile rules, and dependencies
##
-MD_OBJS=
-MD_CFILES=
+MD_OBJS= thunk.o
+MD_CFILES= ${USERMODE}/usermode/thunk.c
MD_SFILES=
##
## (5) link settings
##
-SYSTEM_LD= @${_MKSHMSG}link ${.CUTDIR:T}/${.TARGET}; \
+SYSTEM_LD= @${_MKSHMSG}link ${.CURDIR:T}/${.TARGET}; \
${_MKSHECHO}\
${CC} ${COPTS} -Wl,-Map,$@.map -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \
${CC} ${COPTS} -Wl,-Map,$@.map -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
@@ -44,6 +46,9 @@
## (6) port specific target dependencies
##
+thunk.o: ${USERMODE}/usermode/thunk.c
+ ${CC} ${COPTS} -I${.CURDIR} -c -o $@ ${USERMODE}/usermode/thunk.c
+
##
## (7) misc settings
##
Index: src/sys/arch/usermode/dev/clock.c
diff -u src/sys/arch/usermode/dev/clock.c:1.5 src/sys/arch/usermode/dev/clock.c:1.6
--- src/sys/arch/usermode/dev/clock.c:1.5 Wed Aug 10 01:32:44 2011
+++ src/sys/arch/usermode/dev/clock.c Fri Aug 12 00:57:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.5 2011/08/10 01:32:44 jmcneill Exp $ */
+/* $NetBSD: clock.c,v 1.6 2011/08/12 00:57:24 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.5 2011/08/10 01:32:44 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.6 2011/08/12 00:57:24 jmcneill Exp $);
#include sys/param.h
#include sys/proc.h
@@ -37,6 +37,7 @@
#include sys/time.h
#include machine/mainbus.h
+#include machine/thunk.h
static int clock_match(device_t, cfdata_t, void *);
static void clock_attach(device_t, device_t, void *);
@@ -48,8 +49,6 @@
device_t sc_dev;
} clock_softc_t;
-extern int setitimer(int, const struct itimerval *, struct itimerval *);
-
static struct timecounter clock_timecounter = {
clock_getcounter, /* get_timecount */
0, /* no poll_pps */
@@ -91,7 +90,7 @@
itimer.it_interval.tv_sec = 0;
itimer.it_interval.tv_usec = 1;
itimer.it_value = itimer.it_interval;
- (void)setitimer(ITIMER_REAL, itimer, NULL);
+ thunk_setitimer(ITIMER_REAL, itimer, NULL);
tc_init(clock_timecounter);
}
@@ -114,9 +113,8 @@
static u_int
clock_getcounter(struct timecounter *tc)
{
- extern int gettimeofday(struct timeval *, void *);
struct timeval tv;
- gettimeofday(tv, NULL);
+ thunk_gettimeofday(tv, NULL);
return tv.tv_sec * 100 + tv.tv_usec;
}
Index: src/sys/arch/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.9 src/sys/arch/usermode/dev/cpu.c:1.10
--- src/sys/arch/usermode/dev/cpu.c:1.9 Thu Aug 11 23:04:44 2011
+++ src/sys/arch/usermode/dev/cpu.c Fri Aug 12 00:57:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.9 2011/08/11 23:04:44 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.10 2011/08/12 00:57:24 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.9 2011/08/11 23:04:44 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.10 2011/08/12 00:57:24 jmcneill Exp $);
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: mrg Date: Fri Aug 12 01:22:37 UTC 2011 Modified Files: src/sys/arch/sparc64/dev: pyro.c Log Message: print the ihandle passed in, not NULL. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/pyro.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/sparc64/dev/pyro.c diff -u src/sys/arch/sparc64/dev/pyro.c:1.8 src/sys/arch/sparc64/dev/pyro.c:1.9 --- src/sys/arch/sparc64/dev/pyro.c:1.8 Fri Jul 1 18:48:37 2011 +++ src/sys/arch/sparc64/dev/pyro.c Fri Aug 12 01:22:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pyro.c,v 1.8 2011/07/01 18:48:37 dyoung Exp $ */ +/* $NetBSD: pyro.c,v 1.9 2011/08/12 01:22:37 mrg Exp $ */ /* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */ /* @@ -546,7 +546,7 @@ int ino; ino = INTINO(ihandle); - DPRINTF(PDB_INTR, (%s: ih %lx; level %d ino %d, __func__, (u_long)ih, level, ino)); + DPRINTF(PDB_INTR, (%s: ih %lx; level %d ino %d, __func__, (u_long)ihandle, level, ino)); if (level == IPL_NONE) level = INTLEV(ihandle);
CVS commit: src
Module Name:src Committed By: riastradh Date: Fri Aug 12 03:26:51 UTC 2011 Modified Files: src: UPDATING Log Message: i386 and amd64 are on GCC 4.5 too now. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.226 src/UPDATING:1.227 --- src/UPDATING:1.226 Sat Aug 6 23:07:14 2011 +++ src/UPDATING Fri Aug 12 03:26:51 2011 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.226 2011/08/06 23:07:14 mrg Exp $ +$NetBSD: UPDATING,v 1.227 2011/08/12 03:26:51 riastradh Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -15,6 +15,10 @@ Recent changes: ^^^ +20110806: + i386 and amd64 have been changed to use GCC 4.5.3, so any + objdir or DESTDIR for them should be deleted before updating. + 20110805: The update to GCC 4.5.3 requires a non-trivial portion of the tree to be cleaned. Best to delete both objdir and
CVS commit: src/tests/include
Module Name:src
Committed By: riastradh
Date: Fri Aug 12 03:59:45 UTC 2011
Modified Files:
src/tests/include: t_paths.c
Log Message:
Need root for /dev/power.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/include/t_paths.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/include/t_paths.c
diff -u src/tests/include/t_paths.c:1.7 src/tests/include/t_paths.c:1.8
--- src/tests/include/t_paths.c:1.7 Sat Jul 23 14:28:28 2011
+++ src/tests/include/t_paths.c Fri Aug 12 03:59:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_paths.c,v 1.7 2011/07/23 14:28:28 hannken Exp $ */
+/* $NetBSD: t_paths.c,v 1.8 2011/08/12 03:59:44 riastradh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_paths.c,v 1.7 2011/07/23 14:28:28 hannken Exp $);
+__RCSID($NetBSD: t_paths.c,v 1.8 2011/08/12 03:59:44 riastradh Exp $);
#include sys/param.h
#include sys/stat.h
@@ -79,7 +79,7 @@
{ _PATH_MIXER, PATH_DEV },
{ _PATH_MIXER0, PATH_DEV },
{ _PATH_NOLOGIN, PATH_FILE },
- { _PATH_POWER, PATH_DEV },
+ { _PATH_POWER, PATH_DEV | PATH_ROOT },
{ _PATH_PRINTCAP, PATH_FILE },
{ _PATH_PUD, PATH_DEV | PATH_ROOT },
{ _PATH_PUFFS, PATH_DEV | PATH_ROOT },
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Fri Aug 12 04:14:00 UTC 2011
Modified Files:
src/tests/fs/psshfs: t_psshfs.sh
src/usr.sbin/puffs/mount_psshfs: node.c
Log Message:
Cache vattr in psshfs's setattr.
This means within the cache window, a setattr that wouldn't change the
remote file's attributes from our current view of them will not be
relayed to the server and wait for the server to answer. Thus, e.g., a
process with a periodic timer interrupt that calls open(2) in a loop
can make progress with much higher probability than without caching.
XXX The test case doesn't work, so it's currently disabled. It needs
to stop the child of sshd that is handling an sftp session, not sshd
itself, and it's not obvious how to do that.
ok pooka
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/psshfs/t_psshfs.sh
cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/puffs/mount_psshfs/node.c
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/psshfs/t_psshfs.sh
diff -u src/tests/fs/psshfs/t_psshfs.sh:1.5 src/tests/fs/psshfs/t_psshfs.sh:1.6
--- src/tests/fs/psshfs/t_psshfs.sh:1.5 Thu Mar 31 12:56:03 2011
+++ src/tests/fs/psshfs/t_psshfs.sh Fri Aug 12 04:14:00 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_psshfs.sh,v 1.5 2011/03/31 12:56:03 pooka Exp $
+# $NetBSD: t_psshfs.sh,v 1.6 2011/08/12 04:14:00 riastradh Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -235,6 +235,33 @@
stop_ssh
}
+atf_test_case setattr_cache cleanup
+setattr_cache_head() {
+ atf_set descr Checks that setattr caches
+ # Don't wait for the eternity that atf usually waits. Twenty
+ # seconds should be good enough, except maybe on a VAX...
+ atf_set timeout 20
+}
+setattr_cache_body() {
+ require_puffs
+ start_ssh
+ atf_check -s exit:0 mkdir root
+ atf_check -s exit:0 mkdir mnt
+ mount_psshfs root mnt
+ atf_check -s exit:0 -x ': mnt/loser'
+ atf_check -s exit:0 -o save:stat stat mnt/loser
+ # Oops -- this doesn't work. We need to stop the child of the
+ # sshd that is handling the sftp session.
+ atf_check -s exit:0 kill -STOP $(cat sshd.pid)
+ atf_check -s exit:0 -x ': mnt/loser'
+ atf_check -s exit:0 -o file:stat stat mnt/loser
+}
+setattr_cache_cleanup() {
+ umount mnt
+ kill -CONT $(cat sshd.pid)
+ stop_ssh
+}
+
# -
# Initialization.
# -
@@ -243,4 +270,5 @@
atf_add_test_case inode_nos
atf_add_test_case pwd
atf_add_test_case ls
+ #atf_add_test_case setattr_cache
}
Index: src/usr.sbin/puffs/mount_psshfs/node.c
diff -u src/usr.sbin/puffs/mount_psshfs/node.c:1.62 src/usr.sbin/puffs/mount_psshfs/node.c:1.63
--- src/usr.sbin/puffs/mount_psshfs/node.c:1.62 Fri Oct 29 16:13:51 2010
+++ src/usr.sbin/puffs/mount_psshfs/node.c Fri Aug 12 04:14:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: node.c,v 1.62 2010/10/29 16:13:51 pooka Exp $ */
+/* $NetBSD: node.c,v 1.63 2011/08/12 04:14:00 riastradh Exp $ */
/*
* Copyright (c) 2006-2009 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: node.c,v 1.62 2010/10/29 16:13:51 pooka Exp $);
+__RCSID($NetBSD: node.c,v 1.63 2011/08/12 04:14:00 riastradh Exp $);
#endif /* !lint */
#include assert.h
@@ -133,9 +133,57 @@
psshfs_node_setattr(struct puffs_usermount *pu, puffs_cookie_t opc,
const struct vattr *va, const struct puffs_cred *pcr)
{
- PSSHFSAUTOVAR(pu);
+ struct puffs_cc *pcc = puffs_cc_getcc(pu);
+ struct psshfs_ctx *pctx = puffs_getspecific(pu);
+ uint32_t reqid;
+ struct puffs_framebuf *pb;
struct vattr kludgeva;
struct puffs_node *pn = opc;
+ struct psshfs_node *psn = pn-pn_data;
+ int rv;
+
+ /*
+ * If we cached the remote attributes recently enough, and this
+ * setattr operation would change nothing that sftp actually
+ * records, then we can skip the sftp request. So first check
+ * whether we have the attributes cached, and then compare
+ * every field that we might send to the sftp server.
+ */
+
+ if (!psn-attrread || REFRESHTIMEOUT(pctx, time(NULL)-psn-attrread))
+ goto setattr;
+
+#define CHECK(FIELD, TYPE) do { \
+ if ((va-FIELD != (TYPE)PUFFS_VNOVAL) \
+ (va-FIELD != pn-pn_va.FIELD))\
+ goto setattr; \
+} while (0)
+
+#define CHECKID(FIELD, TYPE, DOMANGLE, MINE, MANGLED) do { \
+ if ((va-FIELD != (TYPE)PUFFS_VNOVAL) \
+ (pn-pn_va.FIELD != \
+ ((pctx-DOMANGLE (va-FIELD == pctx-MINE)) \
+ ? pctx-MANGLED \
+ : va-FIELD))) \
+ goto setattr; \
+} while (0)
+
+ CHECK(va_size, uint64_t);
+ CHECKID(va_uid, uid_t, domangleuid, myuid, mangleuid);
+ CHECKID(va_gid, gid_t, domanglegid, mygid, manglegid);
+ CHECK(va_mode, mode_t);
+ CHECK(va_atime.tv_sec, time_t);
+ CHECK(va_mtime.tv_sec, time_t);
+
+ /* Nothing to change. */
+
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: mrg
Date: Fri Aug 12 05:00:29 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: ebus_mainbus.c
Log Message:
use device_private() to find the matching pyro leaf, now that pyro
has been device_t-ified.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/dev/ebus_mainbus.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/sparc64/dev/ebus_mainbus.c
diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.5 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.6
--- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.5 Fri Jul 1 18:48:36 2011
+++ src/sys/arch/sparc64/dev/ebus_mainbus.c Fri Aug 12 05:00:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus_mainbus.c,v 1.5 2011/07/01 18:48:36 dyoung Exp $ */
+/* $NetBSD: ebus_mainbus.c,v 1.6 2011/08/12 05:00:29 mrg Exp $ */
/* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -98,7 +98,7 @@
for (i = 0; i pyro_cd.cd_ndevs; i++) {
device_t dt = pyro_cd.cd_devs[i];
- psc = (struct pyro_softc *)dt;
+ psc = device_private(dt);
if (psc psc-sc_ign == sc-sc_ign) {
sc-sc_bust = psc-sc_bustag;
sc-sc_csr = psc-sc_csr;
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Fri Aug 12 05:21:50 UTC 2011
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: privsep.c
Log Message:
Have privilege separation child process exit if the parent exits.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/crypto/dist/ipsec-tools/src/racoon/privsep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/privsep.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.21 src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.22
--- src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.21 Sun Mar 6 08:28:10 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/privsep.c Fri Aug 12 05:21:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: privsep.c,v 1.21 2011/03/06 08:28:10 tteras Exp $ */
+/* $NetBSD: privsep.c,v 1.22 2011/08/12 05:21:50 tteras Exp $ */
/* Id: privsep.c,v 1.15 2005/08/08 11:23:44 vanhu Exp */
@@ -67,6 +67,7 @@
#include admin.h
#include sockmisc.h
#include privsep.h
+#include session.h
static int privsep_sock[2] = { -1, -1 };
@@ -193,6 +194,13 @@
return 0;
}
+static int
+privsep_do_exit(void *ctx, int fd)
+{
+ kill(getpid(), SIGTERM);
+ return 0;
+}
+
int
privsep_init(void)
{
@@ -273,6 +281,7 @@
strerror(errno));
return -1;
}
+ monitor_fd(privsep_sock[1], privsep_do_exit, NULL, 0);
return 0;
break;
CVS commit: [ipsec-tools-0_8-branch] src/crypto/dist/ipsec-tools
Module Name:src Committed By: tteras Date: Fri Aug 12 05:42:16 UTC 2011 Modified Files: src/crypto/dist/ipsec-tools [ipsec-tools-0_8-branch]: Makefile.am Log Message: Create ChangeLog for proper CVS branch. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.6.1 src/crypto/dist/ipsec-tools/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/Makefile.am diff -u src/crypto/dist/ipsec-tools/Makefile.am:1.2 src/crypto/dist/ipsec-tools/Makefile.am:1.2.6.1 --- src/crypto/dist/ipsec-tools/Makefile.am:1.2 Tue Jan 20 14:36:08 2009 +++ src/crypto/dist/ipsec-tools/Makefile.am Fri Aug 12 05:42:16 2011 @@ -8,7 +8,7 @@ $(srcdir)/ChangeLog: @if test -d $(srcdir)/CVS; then \ - $(srcdir)/misc/cvs2cl.pl --follow-only TRUNK -I ChangeLog --utc -U $(srcdir)/misc/cvsusermap --group-by-author --fsf -T -l -d2006-09-10now --tag-regexp ^ipsec-tools --stdout $@ ; \ + $(srcdir)/misc/cvs2cl.pl --follow-only ipsec-tools-0_8-branch -I ChangeLog --utc -U $(srcdir)/misc/cvsusermap --group-by-author --fsf -T -l -d2006-09-10now --tag-regexp ^ipsec-tools --stdout $@ ; \ echo For older changes see ChangeLog.old $@ ; \ else \ echo A CVS checkout and perl is required to generate ChangeLog ; \
