CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 11 23:14:03 UTC 2013 Modified Files: src/sys/rump/include/rump: rumpdefs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/rump/include/rump/rumpdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/include/rump/rumpdefs.h diff -u src/sys/rump/include/rump/rumpdefs.h:1.28 src/sys/rump/include/rump/rumpdefs.h:1.29 --- src/sys/rump/include/rump/rumpdefs.h:1.28 Mon Dec 9 19:31:36 2013 +++ src/sys/rump/include/rump/rumpdefs.h Wed Dec 11 23:14:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdefs.h,v 1.28 2013/12/09 19:31:36 pooka Exp $ */ +/* $NetBSD: rumpdefs.h,v 1.29 2013/12/11 23:14:03 pooka Exp $ */ /* * AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -512,6 +512,9 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG, #define RUMP_KTRFAC_VER_MASK 0x0f00 #define RUMP_KTRFAC_VER_SHIFT 24 #define RUMP_KTRFAC_VERSION(tf) (((tf) & RUMP_KTRFAC_VER_MASK) >> RUMP_KTRFAC_VER_SHIFT) +#define RUMP_KTRFACv0 (0 << RUMP_KTRFAC_VER_SHIFT) +#define RUMP_KTRFACv1 (1 << RUMP_KTRFAC_VER_SHIFT) +#define RUMP_KTRFACv2 (2 << RUMP_KTRFAC_VER_SHIFT) /* NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp */ struct rump_modctl_load {
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Wed Dec 11 23:13:49 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: need to grab KTRFACv[n] too To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/include/rump/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.23 src/sys/rump/include/rump/makerumpdefs.sh:1.24 --- src/sys/rump/include/rump/makerumpdefs.sh:1.23 Mon Dec 9 19:31:00 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Wed Dec 11 23:13:48 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.23 2013/12/09 19:31:00 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.24 2013/12/11 23:13:48 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -107,6 +107,7 @@ fromvers ../../../sys/ktrace.h sed -n '/#define[ ]*KTROP_[A-Z_]/s/KTROP_/RUMP_&/gp' <../../../sys/ktrace.h | sed 's,/\*.*$,,' sed -n '/#define[ ]*KTR_[A-Z_]/s/KTR_/RUMP_&/gp' <../../../sys/ktrace.h | sed 's,/\*.*$,,' sed -n '/#define[ ]*KTRFAC_[A-Z_]/{s/KTRFAC_/RUMP_&/g;s/KTR_/RUMP_&/g;p;}' <../../../sys/ktrace.h | sed 's,/\*.*$,,' +sed -n '/#define[ ]*KTRFACv[0-9]/{s/KTRFACv/RUMP_&/g;s/KTRFAC_/RUMP_&/g;p;}' <../../../sys/ktrace.h | sed 's,/\*.*$,,' fromvers ../../../sys/module.h getstruct ../../../sys/module.h modctl_load
CVS commit: src/sys/arch/amd64
Module Name:src Committed By: dsl Date: Wed Dec 11 22:06:51 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: fpu.c src/sys/arch/amd64/include: fpu.h pcb.h Log Message: Remove the fields that were used to save the i387 fp state on interrupt. They were written but never read. Possibly they should be saved for 32 bit processes, but that might be a relic from real i387 where the fpu was actully asynchronous. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/amd64/fpu.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/include/fpu.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amd64/include/pcb.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/amd64/amd64/fpu.c diff -u src/sys/arch/amd64/amd64/fpu.c:1.43 src/sys/arch/amd64/amd64/fpu.c:1.44 --- src/sys/arch/amd64/amd64/fpu.c:1.43 Sun Dec 1 01:05:16 2013 +++ src/sys/arch/amd64/amd64/fpu.c Wed Dec 11 22:06:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.43 2013/12/01 01:05:16 christos Exp $ */ +/* $NetBSD: fpu.c,v 1.44 2013/12/11 22:06:51 dsl Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. All @@ -100,7 +100,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.43 2013/12/01 01:05:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.44 2013/12/11 22:06:51 dsl Exp $"); #include "opt_multiprocessor.h" @@ -192,8 +192,6 @@ fputrap(struct trapframe *frame) */ KASSERT(l == curlwp); fxsave(sfp); - pcb->pcb_savefpu_i387.fp_ex_tw = sfp->fp_fxsave.fx_ftw; - pcb->pcb_savefpu_i387.fp_ex_sw = sfp->fp_fxsave.fx_fsw; if (frame->tf_trapno == T_XMM) { mxcsr = sfp->fp_fxsave.fx_mxcsr; Index: src/sys/arch/amd64/include/fpu.h diff -u src/sys/arch/amd64/include/fpu.h:1.10 src/sys/arch/amd64/include/fpu.h:1.11 --- src/sys/arch/amd64/include/fpu.h:1.10 Sun Dec 1 01:05:16 2013 +++ src/sys/arch/amd64/include/fpu.h Wed Dec 11 22:06:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.h,v 1.10 2013/12/01 01:05:16 christos Exp $ */ +/* $NetBSD: fpu.h,v 1.11 2013/12/11 22:06:51 dsl Exp $ */ #ifndef _AMD64_FPU_H_ #define _AMD64_FPU_H_ @@ -34,11 +34,6 @@ struct savefpu { struct fxsave64 fp_fxsave; /* see above */ }; -struct savefpu_i387 { - uint16_t fp_ex_sw; /* saved status from last exception */ - uint16_t fp_ex_tw; /* saved tag from last exception */ -}; - /* * The i387 defaults to Intel extended precision mode and round to nearest, * with all exceptions masked. Index: src/sys/arch/amd64/include/pcb.h diff -u src/sys/arch/amd64/include/pcb.h:1.20 src/sys/arch/amd64/include/pcb.h:1.21 --- src/sys/arch/amd64/include/pcb.h:1.20 Sun Dec 1 01:05:16 2013 +++ src/sys/arch/amd64/include/pcb.h Wed Dec 11 22:06:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pcb.h,v 1.20 2013/12/01 01:05:16 christos Exp $ */ +/* $NetBSD: pcb.h,v 1.21 2013/12/11 22:06:51 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -92,8 +92,7 @@ struct pcb { uint64_t pcb_rsp; uint64_t pcb_rbp; uint64_t pcb_usersp; - uint32_t pcb_unused; /* unused */ - struct savefpu_i387 pcb_savefpu_i387; /* i387 status on last exception */ + uint32_t pcb_unused[2]; /* unused */ struct savefpu pcb_savefpu __aligned(16); /* floating point state */ uint32_t pcb_unused_1[4]; /* unused */ void *pcb_onfault; /* copyin/out fault recovery */
CVS commit: src/tests/lib/csu
Module Name:src Committed By: matt Date: Wed Dec 11 17:31:56 UTC 2013 Modified Files: src/tests/lib/csu: Makefile.check_stack Added Files: src/tests/lib/csu/arch/alpha: h_initfini_align.S src/tests/lib/csu/arch/arm: h_initfini_align.S src/tests/lib/csu/arch/mips: h_initfini_align.S src/tests/lib/csu/arch/powerpc: h_initfini_align.S src/tests/lib/csu/arch/vax: h_initfini_align.S Log Message: Add stack alignment checks for alpha, arm, mips, powerpc, and vax. Fix makefile to support MACHINE_CPU To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/csu/Makefile.check_stack cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/alpha/h_initfini_align.S cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/arm/h_initfini_align.S cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/mips/h_initfini_align.S cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/powerpc/h_initfini_align.S cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/vax/h_initfini_align.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/csu/Makefile.check_stack diff -u src/tests/lib/csu/Makefile.check_stack:1.1 src/tests/lib/csu/Makefile.check_stack:1.2 --- src/tests/lib/csu/Makefile.check_stack:1.1 Tue Nov 30 18:38:53 2010 +++ src/tests/lib/csu/Makefile.check_stack Wed Dec 11 17:31:55 2013 @@ -1,9 +1,14 @@ -# $NetBSD: Makefile.check_stack,v 1.1 2010/11/30 18:38:53 joerg Exp $ +# $NetBSD: Makefile.check_stack,v 1.2 2013/12/11 17:31:55 matt Exp $ .include +.if exists(${.PARSEDIR}/arch/${MACHINE_ARCH}) CSU_ARCHDIR= ${.PARSEDIR}/arch/${MACHINE_ARCH} .PATH: ${CSU_ARCHDIR} +.elif exists(${.PARSEDIR}/arch/${MACHINE_CPU}) +CSU_ARCHDIR= ${.PARSEDIR}/arch/${MACHINE_CPU} +.PATH: ${CSU_ARCHDIR} +.endif .if exists(${CSU_ARCHDIR}/h_initfini_align.S) SRCS_CHECK_STACK= h_initfini_align.S CPPFLAGS_CHECK_STACK+= -DCHECK_STACK_ALIGNMENT Added files: Index: src/tests/lib/csu/arch/alpha/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/alpha/h_initfini_align.S:1.1 --- /dev/null Wed Dec 11 17:31:56 2013 +++ src/tests/lib/csu/arch/alpha/h_initfini_align.S Wed Dec 11 17:31:55 2013 @@ -0,0 +1,16 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:55 matt Exp $ */ + +#include + +RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:55 matt Exp $") + +/* + * LINTSTUB: bool check_stack_alignment(void); + */ + +LEAF_NOPROFILE(check_stack_alignment, 0) + ldiq v0, 0 + and sp, 7, t0 + cmoveq t0, 1, v0 + ret +END(check_stack_alignment) Index: src/tests/lib/csu/arch/arm/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/arm/h_initfini_align.S:1.1 --- /dev/null Wed Dec 11 17:31:56 2013 +++ src/tests/lib/csu/arch/arm/h_initfini_align.S Wed Dec 11 17:31:56 2013 @@ -0,0 +1,20 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $ */ + +#include + +RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $") + +/* + * LINTSTUB: bool check_stack_alignment(void); + */ + +ARM_ENTRY(check_stack_alignment) +#ifdef __ARM_EABI__ + tst sp, #7 +#else + tst sp, #3 +#endif + movne r0, #0 + moveq r0, #1 + RET +END(check_stack_alignment) Index: src/tests/lib/csu/arch/mips/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/mips/h_initfini_align.S:1.1 --- /dev/null Wed Dec 11 17:31:56 2013 +++ src/tests/lib/csu/arch/mips/h_initfini_align.S Wed Dec 11 17:31:56 2013 @@ -0,0 +1,19 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $ */ + +#include + +RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $") + +/* + * LINTSTUB: bool check_stack_alignment(void); + */ + +LEAF_NOPROFILE(check_stack_alignment) +#ifdef __mips_o32 + andi v1,sp,3 +#else + andi v1,sp,7 +#endif + sltiu v0,v1,1 + jr ra +END(check_stack_alignment) Index: src/tests/lib/csu/arch/powerpc/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/powerpc/h_initfini_align.S:1.1 --- /dev/null Wed Dec 11 17:31:56 2013 +++ src/tests/lib/csu/arch/powerpc/h_initfini_align.S Wed Dec 11 17:31:56 2013 @@ -0,0 +1,17 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $ */ + +#include + +RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $") + +/* + * LINTSTUB: bool check_stack_alignment(void); + */ + +_ENTRY(check_stack_alignment) + li %r3,0 + andis. %r0,%r1,15 + bnelr %cr0 + li %r3,1 + blr +END(check_stack_alignment) Index: src/tests/lib/csu/arch/vax/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/vax/h_initfini_align.S:1.1 --- /dev/null Wed Dec 11 17:31:56 2013 +++ src/tests/lib/csu/arch/vax/h_initfini_align.S Wed Dec 11 17:31:56 2013 @@ -0,0 +1,17 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $ */ + +#include + +RCSID("$NetBSD: h_initfini_align.S,v 1.1 2013/12/11 17:31:56 matt Exp $") + +/* + * LINTSTUB: bool check_stack_alignment(void); + */ + +_ENTRY(check_stack_alignment, 0) + clrl %r0 + bi
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Dec 11 16:01:26 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket #1890 Fix typo in previous ticket To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.37 src/doc/CHANGES-5.3:1.1.2.38 --- src/doc/CHANGES-5.3:1.1.2.37 Mon Dec 9 20:25:59 2013 +++ src/doc/CHANGES-5.3 Wed Dec 11 16:01:26 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.37 2013/12/09 20:25:59 bouyer Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.38 2013/12/11 16:01:26 sborrill Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -635,6 +635,13 @@ usr.bin/gzip/Makefile1.17, 1.18 usr.bin/gzip/zmore1.4, 1.5 usr.bin/gzip/zmore.11.4 - Added zless(1) - comes in the lastest version of zmore(1) from OpenBSD + Added zless(1) - comes in the latest version of zmore(1) from OpenBSD [pettai, ticket #1889] +sys/arch/xen/xen/evtchn.c 1.70 + + Remove the "evtchn_do_event: handler %p didn't lower ipl %d %d\n" + printf as analysis shows it actually isn't a bug in the handler, + but related to spin mutexes. Fixes port-xen/46313 + [bouyer, ticket #1890] +
CVS commit: [netbsd-5] src/sys/arch/xen/xen
Module Name:src Committed By: sborrill Date: Wed Dec 11 16:00:46 UTC 2013 Modified Files: src/sys/arch/xen/xen [netbsd-5]: evtchn.c Log Message: Pull up the following revisions(s) (requested by bouyer in ticket #1890): sys/arch/xen/xen/evtchn.c: revision 1.70 Remove the "evtchn_do_event: handler %p didn't lower ipl %d %d\n" printf as analysis shows it actually isn't a bug in the handler, but related to spin mutexes. Fixes port-xen/46313 To generate a diff of this commit: cvs rdiff -u -r1.39.4.2 -r1.39.4.3 src/sys/arch/xen/xen/evtchn.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/xen/evtchn.c diff -u src/sys/arch/xen/xen/evtchn.c:1.39.4.2 src/sys/arch/xen/xen/evtchn.c:1.39.4.3 --- src/sys/arch/xen/xen/evtchn.c:1.39.4.2 Fri Nov 14 02:59:39 2008 +++ src/sys/arch/xen/xen/evtchn.c Wed Dec 11 16:00:46 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: evtchn.c,v 1.39.4.2 2008/11/14 02:59:39 snj Exp $ */ +/* $NetBSD: evtchn.c,v 1.39.4.3 2013/12/11 16:00:46 sborrill Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -64,7 +64,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.39.4.2 2008/11/14 02:59:39 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.39.4.3 2013/12/11 16:00:46 sborrill Exp $"); #include "opt_xen.h" #include "isa.h" @@ -301,13 +301,6 @@ splx: ih_fun = (void *)ih->ih_fun; ih_fun(ih->ih_arg, regs); cli(); - if (ci->ci_ilevel != i) { - printf("evtchn_do_event: " - "handler %p didn't lower " - "ipl %d %d\n", - ih_fun, ci->ci_ilevel, i); - ci->ci_ilevel = i; - } } hypervisor_enable_ipl(i); /* more pending IPLs may have been registered */
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Wed Dec 11 14:59:47 UTC 2013 Modified Files: src/games/fortune/datfiles: fortunes2 Log Message: remove duplicate To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.51 src/games/fortune/datfiles/fortunes2:1.52 --- src/games/fortune/datfiles/fortunes2:1.51 Wed Dec 11 14:56:10 2013 +++ src/games/fortune/datfiles/fortunes2 Wed Dec 11 14:59:47 2013 @@ -36648,10 +36648,6 @@ A: A dope ring. Q: Why do blondes put their hair in ponytails? A: To cover up the valve stem. - -Q: Why did the blonde get so excited after she finished her jigsaw - puzzle in only 6 months? -A: Because on the box it said "From 2-4 years". % Q: What do you call a blind pre-historic animal? A: Diyathinkhesaurus.
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Wed Dec 11 14:56:10 UTC 2013 Modified Files: src/games/fortune/datfiles: fortunes2 Log Message: another minor fix To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.50 src/games/fortune/datfiles/fortunes2:1.51 --- src/games/fortune/datfiles/fortunes2:1.50 Wed Dec 11 11:33:49 2013 +++ src/games/fortune/datfiles/fortunes2 Wed Dec 11 14:56:10 2013 @@ -36567,7 +36567,7 @@ Q: "How many Romulans does it take to sc A: "Twelve; one to screw the light-bulb in, and eleven to self-destruct the ship out of disgrace." - [Warning: do not tell this joke to Romulans or else be ready for + [Warning: do not tell this joke to Romulans unless ready for a fight. They consider it to be a disgrace, though it's pretty good for a LBJ. Ed.] %
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: wiz Date: Wed Dec 11 11:52:27 UTC 2013 Modified Files: src/games/fortune/datfiles: fortunes Log Message: Reinstate typo since kre claims it's by purpose. Discussion in PR 48442. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.55 src/games/fortune/datfiles/fortunes:1.56 --- src/games/fortune/datfiles/fortunes:1.55 Wed Dec 11 11:24:56 2013 +++ src/games/fortune/datfiles/fortunes Wed Dec 11 11:52:27 2013 @@ -13845,7 +13845,7 @@ April, June, and no wonder. all the rest have peanut butter except my father who wears red suspenders." % -This Fortune Examined By INSPECTOR NO. 2-14 +This Fortue Examined By INSPECTOR NO. 2-14 % This fortune cookie program is out of order. For those in desperate need, please use the program "randchar". This program generates random
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: wiz Date: Wed Dec 11 11:33:49 UTC 2013 Modified Files: src/games/fortune/datfiles: fortunes2 Log Message: Error and typo fixes from OpenBSD and FreeBSD via Henning Petersen in PR 48443. While here, remove a duplication, fix another typo, and don't claim that Mr. Sheperd was the first man in space. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.49 src/games/fortune/datfiles/fortunes2:1.50 --- src/games/fortune/datfiles/fortunes2:1.49 Wed Jul 24 06:57:09 2013 +++ src/games/fortune/datfiles/fortunes2 Wed Dec 11 11:33:49 2013 @@ -1803,7 +1803,7 @@ promised me faithfully that you'd be bac nine. It just can't take that long to play 18 holes of golf." "Honey, wait," said Harry. "Let me explain. I know what I promised you, but I have a very good reason for being late. Fred and I tee'd off -right on time and everything was find for the first three holes. Then, on +right on time and everything was fine for the first three holes. Then, on the fourth tee Fred had a stroke. I ran back to the clubhouse but couldn't find a doctor. And, by the time I got back to Fred, he was dead. So, for the next 15 holes, it was hit the ball, drag Fred, hit the ball, drag Fred... @@ -2210,7 +2210,7 @@ man. Mud-as-man alone could speak. "Certainly," said man. "Then I leave it to you to think of one for all of this," said God. And He went away. - -- Kurt Vonnegut, Between Time and Timbuktu" + -- Kurt Vonnegut, "Between Time and Timbuktu" % In the beginning there was data. The data was without form and null, and darkness was upon the face of the console; and the Spirit of @@ -9939,13 +9939,13 @@ Anti-trust laws should be approached wit Antonio Antonio Was tired of living alonio He thought he would woo Antonio Antonio -Miss Lucamy Lu,Rode of on his polo ponio +Miss Lucamy Lu,Rode off on his polo ponio Miss Lucamy Lucy Molonio. And found the maid In a bowery shade, Sitting and knitting alonio. Antonio Antonio Said if you will be my ownio -I'll love tou true Oh nonio Antonio +I'll love you true Oh nonio Antonio And buy for youYou're far too bleak and bonio An icery creamry conio. And all that I wish You singular fish @@ -9954,7 +9954,7 @@ Antonio Antonio Uttered a dismal moanio And went off and hid Or I'm told that he did -In the Antartical Zonio. +in the Antarctical Zonio. % ANTONYM: The opposite of the word you're trying to think of. @@ -11439,7 +11439,7 @@ after they got done, you wanted to be tr "The test or the room?" "The tests or the room? Vell, nah, about them I can't complain." "The nurses? The food?" asked Fats, but Bernard shook his head no. -Fats laughed and said, "Listen , Bernie, you went to the MBH, they did this +Fats laughed and said, "Listen, Bernie, you went to the MBH, they did this great workup, and when I asked you shy you came to the House of God, all you tell me is, 'Nah, I can't complain.' So why did you come here? Why, Bernie, why?" @@ -23432,7 +23432,8 @@ them scream. -- Sylvestre Matuschka, "the Hungarian Train Wreck Freak", escaped prison 1937, not heard from since % -Iam +I +am not very happy @@ -23446,7 +23447,7 @@ intellectual enlightenment % IBM: - [Internation Business Machines Corp.] Also known as Itty Bitty + [International Business Machines Corp.] Also known as Itty Bitty Machines or The Lawyer's Friend. The dominant force in computer marketing, having supplied worldwide some 75% of all known hardware and 10% of all software. To protect itself from the litigious envy @@ -23726,7 +23727,7 @@ we wouldn't reach a conclusion. If an average person on the subway turns to you, like an ancient mariner, and starts telling you her tale, you turn away or nod and hope she stops, not just because you fear she might be crazy. If she tells her tale on -camera, you might listen. Watching strangers on television , even +camera, you might listen. Watching strangers on television, even responding to them from a studio audience, we're disengaged - voyeurs collaborating with exhibitionists in rituals of sham community. Never have so many known so much about people for whom they cared so little. @@ -33925,7 +33926,7 @@ the code over again, since I also remove % Old age and treachery will overcome youth and skill. % -Old age is always fifteen years old than I am. +Old age is always fifteen years older than I am. -- B. Baruch % Old age is the harbor of all ills. @@ -36567,7 +36568,7 @@ A: "Twelve; one to screw the light-bulb the ship out of disgrace." [Warning: do not tell this joke to Romulans or else be ready for - a fight. They consider this it to be a dis
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: wiz Date: Wed Dec 11 11:24:56 UTC 2013 Modified Files: src/games/fortune/datfiles: fortunes Log Message: Error and typo fixes from OpenBSD and FreeBSD via Henning Petersen in PR 48442. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.54 src/games/fortune/datfiles/fortunes:1.55 --- src/games/fortune/datfiles/fortunes:1.54 Sun May 12 03:29:07 2013 +++ src/games/fortune/datfiles/fortunes Wed Dec 11 11:24:56 2013 @@ -3058,7 +3058,7 @@ Deliver yesterday, code today, think tom Demand the establishment of the government in its rightful home at Disneyland. % -Democracy is a device that insures we shall be governed no better than +Democracy is a device that ensures we shall be governed no better than we deserve. -- George Bernard Shaw % @@ -3489,7 +3489,7 @@ people wonder where the word "eggnog" co comes from the English word "egg", meaning "egg". I don't know where the "nog" comes from. -To make eggnog, you'll need rum, whiskey, wine gin and, if they are in +To make eggnog, you'll need rum, whiskey, wine, gin and, if they are in season, eggs... % Egotism is the anesthetic given by a kindly nature to relieve the pain @@ -4701,7 +4701,7 @@ God isn't dead, he just couldn't find a % God made machine language; all the rest is the work of man. % -God made the Idiot for practice, and then He made the School Board +God made the Idiot for practice, and then He made the School Board. -- Mark Twain % God made the integers; all else is the work of Man. @@ -5045,7 +5045,7 @@ I mean. The answer is hot tubs. A hot filled with water that you sit in naked with members of the opposite sex, none of whom is necessarily your spouse. After a few hours in their hot tubs, Californians don't give a damn about earthquakes or -mass murderers. They don't give a damn about anything , which is why +mass murderers. They don't give a damn about anything, which is why they are able to produce "Laverne and Shirley" week after week. -- Dave Barry, "The Taming of the Screw" % @@ -5271,7 +5271,7 @@ motto is: 'It is very difficult to disp Hier liegt ein Mann ganz ohnegleich; Im Leibe dick, an Suenden reich. Wir haben ihn in das Grab gesteckt, Here lies a man with sundry flaws -Weil es uns duenkt er sei verreckt. And numerous Sins upon his head; +Weil es uns duenkt, er sei verreckt. And numerous Sins upon his head; We buried him today because As far as we can tell, he's dead. -- PDQ Bach's epitaph, as requested by his cousin Betty-Sue @@ -5345,7 +5345,7 @@ because they are too busy applying littl object -- every board, washer, nail and screw -- in the entire store ... Let's say a piece in your toilet tank breaks, so you remove the broken part, take it to the home center, and ask an employee if he has -a replacement. The employee, who has never is his life even seen the +a replacement. The employee, who has never in his life even seen the inside of a toilet tank, will peer at the broken part in very much the same way that a member of a primitive Amazon jungle tribe would look at an electronic calculator, and then say, "We're expecting a shipment of @@ -6232,7 +6232,7 @@ the point where it would not run at all. Holes and the Fate of Stars" % I went to a job interview the other day, the guy asked me if I had any -questions , I said yes, just one, if you're in a car traveling at the +questions, I said yes, just one, if you're in a car traveling at the speed of light and you turn your headlights on, does anything happen? He said he couldn't answer that, I told him sorry, but I couldn't work @@ -7296,7 +7296,7 @@ my advice. In Tulsa, Oklahoma, it is against the law to open a soda bottle without the supervision of a licensed engineer. % -In West Union, Ohio, No married man can go flying without his spouse +In West Union, Ohio, no married man can go flying without his spouse along at any time, unless he has been married for more than 12 months. % Incumbent, n.: @@ -7887,7 +7887,7 @@ get a prompt, type like hell. % Just once, I wish we would encounter an alien menace that wasn't immune to bullets. - -- The Brigader, "Dr. Who" + -- The Brigadier, "Dr. Who" % Just out of curiosity does this actually mean something or have some of the few remaining bits of your brain just evaporated? @@ -8562,7 +8562,7 @@ given item. One is on the shelf; someon information you need is in the others. -- Ray Simard % -Many years ago in a period commonly know as Next Friday Afternoon, +Many years ago in a period commonly known as Next Friday Afternoon, there lived a King who was very Gloomy on Tuesday mornings because he was so Sad thinking about how Unhappy he had
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Wed Dec 11 09:45:02 UTC 2013 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: reregengen To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/kern/init_sysent.c cvs rdiff -u -r1.270 -r1.271 src/sys/kern/syscalls.c cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.96 -r1.97 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.266 -r1.267 src/sys/sys/syscall.h cvs rdiff -u -r1.249 -r1.250 src/sys/sys/syscallargs.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/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.279 src/sys/kern/init_sysent.c:1.280 --- src/sys/kern/init_sysent.c:1.279 Mon Dec 9 21:13:22 2013 +++ src/sys/kern/init_sysent.c Wed Dec 11 09:45:02 2013 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.279 2013/12/09 21:13:22 pooka Exp $ */ +/* $NetBSD: init_sysent.c,v 1.280 2013/12/11 09:45:02 pooka Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp + * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.279 2013/12/09 21:13:22 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.280 2013/12/11 09:45:02 pooka Exp $"); #include "opt_modular.h" #include "opt_ntp.h" Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.270 src/sys/kern/syscalls.c:1.271 --- src/sys/kern/syscalls.c:1.270 Mon Dec 9 21:13:22 2013 +++ src/sys/kern/syscalls.c Wed Dec 11 09:45:02 2013 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.270 2013/12/09 21:13:22 pooka Exp $ */ +/* $NetBSD: syscalls.c,v 1.271 2013/12/11 09:45:02 pooka Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp + * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.270 2013/12/09 21:13:22 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.271 2013/12/11 09:45:02 pooka Exp $"); #if defined(_KERNEL_OPT) #include "opt_modular.h" Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.71 src/sys/rump/include/rump/rump_syscalls.h:1.72 --- src/sys/rump/include/rump/rump_syscalls.h:1.71 Mon Dec 9 21:13:22 2013 +++ src/sys/rump/include/rump/rump_syscalls.h Wed Dec 11 09:45:02 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.71 2013/12/09 21:13:22 pooka Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.72 2013/12/11 09:45:02 pooka Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp + * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ @@ -572,6 +572,10 @@ #define RUMP_SYS_RENAME_EXTATTR_SET_FD rump___sysimpl_extattr_set_fd #endif +#ifndef RUMP_SYS_RENAME_UTRACE +#define RUMP_SYS_RENAME_UTRACE rump___sysimpl_utrace +#endif + #ifndef RUMP_SYS_RENAME_UMASK #define RUMP_SYS_RENAME_UMASK rump___sysimpl_umask #endif @@ -838,6 +842,7 @@ int rump_sys___getcwd(char *, size_t) __ int rump_sys_fchroot(int) __RENAME(RUMP_SYS_RENAME_FCHROOT); int rump_sys_lchflags(const char *, u_long) __RENAME(RUMP_SYS_RENAME_LCHFLAGS); int rump_sys_issetugid(void) __RENAME(RUMP_SYS_RENAME_ISSETUGID); +int rump_sys_utrace(const char *, void *, size_t) __RENAME(RUMP_SYS_RENAME_UTRACE); int rump_sys_kqueue(void) __RENAME(RUMP_SYS_RENAME_KQUEUE); int rump_sys_kevent(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *) __RENAME(RUMP_SYS_RENAME_KEVENT); int rump_sys_fsync_range(int, int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_FSYNC_RANGE); Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.96 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.97 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.96 Mon Dec 9 21:13:22 2013 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Wed Dec 11 09:45:02 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.96 2013/12/09 21:13:22 pooka Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.97 2013/12/11 09:45:02 pooka Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp + * created from NetBSD: syscalls.master,v 1.266
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Wed Dec 11 09:40:56 UTC 2013 Modified Files: src/sys/kern: syscalls.master Log Message: create rump kernel wrapper for utrace() too To generate a diff of this commit: cvs rdiff -u -r1.265 -r1.266 src/sys/kern/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/syscalls.master diff -u src/sys/kern/syscalls.master:1.265 src/sys/kern/syscalls.master:1.266 --- src/sys/kern/syscalls.master:1.265 Mon Dec 9 17:13:17 2013 +++ src/sys/kern/syscalls.master Wed Dec 11 09:40:56 2013 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp $ + $NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -594,7 +594,7 @@ #endif 304 STD RUMP { int|sys||lchflags(const char *path, u_long flags); } 305 NOERR RUMP { int|sys||issetugid(void); } -306 STD { int|sys||utrace(const char *label, void *addr, \ +306 STD RUMP { int|sys||utrace(const char *label, void *addr, \ size_t len); } 307 STD { int|sys||getcontext(struct __ucontext *ucp); } 308 STD { int|sys||setcontext(const struct __ucontext *ucp); }