CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: uebayasi Date: Sat Jun 22 06:23:28 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: lock_stubs.S Log Message: Use END() to set ELF symbol size. Set local data type/size too. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amd64/amd64/lock_stubs.S 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/lock_stubs.S diff -u src/sys/arch/amd64/amd64/lock_stubs.S:1.24 src/sys/arch/amd64/amd64/lock_stubs.S:1.25 --- src/sys/arch/amd64/amd64/lock_stubs.S:1.24 Wed Jan 12 23:12:11 2011 +++ src/sys/arch/amd64/amd64/lock_stubs.S Sat Jun 22 06:23:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.24 2011/01/12 23:12:11 joerg Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.25 2013/06/22 06:23:28 uebayasi Exp $ */ /*- * Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -68,6 +68,7 @@ ENTRY(mutex_enter) RET(1) 1: jmp _C_LABEL(mutex_vector_enter) +END(mutex_enter) /* * void mutex_exit(kmutex_t *mtx); @@ -86,6 +87,7 @@ ENTRY(mutex_exit) ret 1: jmp _C_LABEL(mutex_vector_exit) +END(mutex_exit) /* * void mutex_spin_enter(kmutex_t *mtx); @@ -110,6 +112,7 @@ ENTRY(mutex_spin_enter) RET(2) 1: jmp _C_LABEL(mutex_spin_retry) /* failed; hard case */ +END(mutex_spin_enter) /* * void mutex_spin_exit(kmutex_t *mtx); @@ -167,6 +170,8 @@ ENTRY(mutex_spin_exit) #endif /* DIAGNOSTIC */ +END(mutex_spin_exit) + /* * void rw_enter(krwlock_t *rwl, krw_t op); * @@ -203,6 +208,7 @@ ENTRY(rw_enter) RET(4) 3: jmp _C_LABEL(rw_vector_enter) +END(rw_enter) /* * void rw_exit(krwlock_t *rwl); @@ -241,6 +247,7 @@ ENTRY(rw_exit) ret 3: jmp _C_LABEL(rw_vector_exit) +END(rw_exit) /* * int rw_tryenter(krwlock_t *rwl, krw_t op); @@ -283,6 +290,7 @@ ENTRY(rw_tryenter) 4: xorl %eax, %eax jmp 3b +END(rw_tryenter) #endif /* LOCKDEBUG */ @@ -292,6 +300,7 @@ ENTRY(rw_tryenter) ENTRY(__cpu_simple_lock_init) movb $0, (%rdi) ret +END(__cpu_simple_lock_init) NENTRY(__cpu_simple_lock) movl $0x0100, %eax @@ -308,10 +317,12 @@ NENTRY(__cpu_simple_lock) cmpb $0, (%rdi) je 1b jmp 2b +END(__cpu_simple_lock) ENTRY(__cpu_simple_unlock) movb $0, (%rdi) ret +END(__cpu_simple_unlock) ENTRY(__cpu_simple_lock_try) movl $0x0100, %eax @@ -320,21 +331,26 @@ ENTRY(__cpu_simple_lock_try) movl $0, %eax setz %al RET(8) +END(__cpu_simple_lock_try) /* * Patchpoints to replace with NOP when ncpu == 1. */ #ifndef LOCKDEBUG + .type _C_LABEL(x86_lockpatch), @object LABEL(x86_lockpatch) .quad .Lpatch1, .Lpatch2, .Lpatch3, .Lpatch4 .quad .Lpatch5, .Lpatch6, .Lpatch7, .Lpatch8 .quad .Lpatch9 .quad 0 +END(x86_lockpatch) #endif + .type _C_LABEL(x86_retpatch), @object LABEL(x86_retpatch) #ifndef LOCKDEBUG .quad .Lret1, .Lret2, .Lret3, .Lret4, .Lret5, .Lret6 #endif .quad .Lret7, .Lret8 .quad 0 +END(x86_retpatch)
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 06:57:30 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: spl.S src/sys/arch/i386/i386: spl.S Log Message: Use END() to set ELF symbol size. Set some type info too. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/i386/spl.S 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/spl.S diff -u src/sys/arch/amd64/amd64/spl.S:1.26 src/sys/arch/amd64/amd64/spl.S:1.27 --- src/sys/arch/amd64/amd64/spl.S:1.26 Sat Nov 10 16:28:06 2012 +++ src/sys/arch/amd64/amd64/spl.S Sat Jun 22 06:57:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.26 2012/11/10 16:28:06 cherry Exp $ */ +/* $NetBSD: spl.S,v 1.27 2013/06/22 06:57:30 uebayasi Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -116,6 +116,7 @@ IDTVEC(softintr) popq %r15 /* unwind switchframe */ addq $(5 * 8),%rsp jmp *%r13 /* back to splx/doreti */ +END(Xsoftintr) /* * softintr_ret() @@ -130,6 +131,7 @@ NENTRY(softintr_ret) movl $0, L_CTXSWTCH(%rax) /* %rax from cpu_switchto */ cli jmp *%r13 /* back to splx/doreti */ +END(softintr_ret) /* * void softint_trigger(uintptr_t machdep); @@ -139,6 +141,7 @@ NENTRY(softintr_ret) NENTRY(softint_trigger) orl %edi,CPUVAR(IPENDING) /* atomic on local cpu */ ret +END(softint_trigger) /* @@ -153,6 +156,7 @@ IDTVEC(preemptrecurse) call _C_LABEL(kpreempt) cli jmp *%r13 +END(Xpreemptrecurse) /* * Xpreemptresume() @@ -172,6 +176,7 @@ IDTVEC(preemptresume) call _C_LABEL(preempt) # from user cli jmp *%r13 +END(Xpreemptresume) /* * int splraise(int s); @@ -182,6 +187,7 @@ ENTRY(splraise) cmoval %eax,%edi movl %edi,CPUVAR(ILEVEL) ret +END(splraise) /* * void spllower(int s); @@ -213,6 +219,7 @@ ENTRY(spllower) nop .align 16 #endif +END(spllower) LABEL(spllower_end) #endif /* !XEN */ @@ -247,10 +254,13 @@ ENTRY(cx8_spllower) ret 2: movq %r8,%rbx + .type _C_LABEL(cx8_spllower_patch), @function LABEL(cx8_spllower_patch) jmp _C_LABEL(Xspllower) .align 16 +END(cx8_spllower_patch) +END(cx8_spllower) LABEL(cx8_spllower_end) /* @@ -295,6 +305,7 @@ IDTVEC(spllower) popq %r13 popq %rbx ret +END(Xspllower) /* * Handle return from interrupt after device handler finishes. @@ -321,8 +332,9 @@ IDTVEC(doreti) 5: testb $SEL_RPL,TF_CS(%rsp) jz 6f - .globl doreti_checkast -doreti_checkast: + + .type _C_LABEL(doreti_checkast), @function +LABEL(doreti_checkast) movq CPUVAR(CURLWP),%r14 CHECK_ASTPENDING(%r14) je 3f @@ -344,3 +356,5 @@ doreti_checkast: call _C_LABEL(do_pmap_load) CLI(si) jmp doreti_checkast /* recheck ASTs */ +END(doreti_checkast) +END(Xdoreti) Index: src/sys/arch/i386/i386/spl.S diff -u src/sys/arch/i386/i386/spl.S:1.38 src/sys/arch/i386/i386/spl.S:1.39 --- src/sys/arch/i386/i386/spl.S:1.38 Sat Nov 10 16:28:06 2012 +++ src/sys/arch/i386/i386/spl.S Sat Jun 22 06:57:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.38 2012/11/10 16:28:06 cherry Exp $ */ +/* $NetBSD: spl.S,v 1.39 2013/06/22 06:57:30 uebayasi Exp $ */ /* * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: spl.S,v 1.38 2012/11/10 16:28:06 cherry Exp $); +__KERNEL_RCSID(0, $NetBSD: spl.S,v 1.39 2013/06/22 06:57:30 uebayasi Exp $); #include opt_vm86.h #include opt_ddb.h @@ -136,6 +136,8 @@ ENTRY(cx8_spllower) ret 2: popl %ebx + + .type _C_LABEL(cx8_spllower_patch), @function LABEL(cx8_spllower_patch) jmp _C_LABEL(Xspllower) .align 32 @@ -281,8 +283,8 @@ IDTVEC(doreti) #else jmp 6f #endif - .globl doreti_checkast -doreti_checkast: + .type _C_LABEL(doreti_checkast), @function +LABEL(doreti_checkast) CHECK_ASTPENDING(%eax) jz 3f CLEAR_ASTPENDING(%eax) @@ -294,6 +296,8 @@ doreti_checkast: addl $4,%esp CLI(%eax) jmp 5b +END(doreti_checkast) + 3: CHECK_DEFERRED_SWITCH jnz 9f
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: uebayasi Date: Sat Jun 22 07:31:36 UTC 2013 Modified Files: src/sys/arch/amd64/include: asm.h Log Message: Define IDTVEC_END(), from i386/asm.h. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/include/asm.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/include/asm.h diff -u src/sys/arch/amd64/include/asm.h:1.16 src/sys/arch/amd64/include/asm.h:1.17 --- src/sys/arch/amd64/include/asm.h:1.16 Fri Jun 21 02:47:06 2013 +++ src/sys/arch/amd64/include/asm.h Sat Jun 22 07:31:36 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.16 2013/06/21 02:47:06 uebayasi Exp $ */ +/* $NetBSD: asm.h,v 1.17 2013/06/22 07:31:36 uebayasi Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -79,9 +79,13 @@ #ifdef __STDC__ #define IDTVEC(name) \ ALIGN_TEXT; .globl X ## name; .type X ## name,@function; X ## name: +#define IDTVEC_END(name) \ + .size X ## name, . - X ## name #else #define IDTVEC(name) \ ALIGN_TEXT; .globl X/**/name; .type X/**/name,@function; X/**/name: +#define IDTVEC_END(name) \ + .size X/**/name, . - X/**/name #endif /* __STDC__ */ #endif /* _KERNEL */
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 08:48:48 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: vector.S src/sys/arch/i386/i386: vector.S Log Message: Use END()/IDTVEC_END() to set ELF symbol size. Set some type info too. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amd64/amd64/vector.S cvs rdiff -u -r1.60 -r1.61 src/sys/arch/i386/i386/vector.S 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/vector.S diff -u src/sys/arch/amd64/amd64/vector.S:1.42 src/sys/arch/amd64/amd64/vector.S:1.43 --- src/sys/arch/amd64/amd64/vector.S:1.42 Fri Nov 2 08:33:16 2012 +++ src/sys/arch/amd64/amd64/vector.S Sat Jun 22 08:48:48 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vector.S,v 1.42 2012/11/02 08:33:16 yamt Exp $ */ +/* $NetBSD: vector.S,v 1.43 2013/06/22 08:48:48 uebayasi Exp $ */ /*- * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -115,9 +115,11 @@ IDTVEC(trap00) ZTRAP(T_DIVIDE) +IDTVEC_END(trap00) IDTVEC(trap01) ZTRAP(T_TRCTRAP) +IDTVEC_END(trap01) IDTVEC(trap02) #if defined(XEN) @@ -152,6 +154,7 @@ IDTVEC(trap02) addq $TF_REGSIZE+16,%rsp iretq #endif /* defined(XEN) */ +IDTVEC_END(trap02) IDTVEC(trap03) #ifndef KDTRACE_HOOKS @@ -195,15 +198,19 @@ dtrace_invop_calltrap_addr: .zero 8 .text #endif +IDTVEC_END(trap03) IDTVEC(trap04) ZTRAP(T_OFLOW) +IDTVEC_END(trap04) IDTVEC(trap05) ZTRAP(T_BOUND) +IDTVEC_END(trap05) IDTVEC(trap06) ZTRAP(T_PRIVINFLT) +IDTVEC_END(trap06) IDTVEC(trap07) ZTRAP_NJ(T_ASTFLT) @@ -214,15 +221,19 @@ IDTVEC(trap07) movq CPUVAR(SELF),%rdi call _C_LABEL(fpudna) jmp .Lalltraps_checkusr +IDTVEC_END(trap07) IDTVEC(trap08) TRAP(T_DOUBLEFLT) +IDTVEC_END(trap08) IDTVEC(trap09) ZTRAP(T_FPOPFLT) +IDTVEC_END(trap09) IDTVEC(trap0a) TRAP(T_TSSFLT) +IDTVEC_END(trap0a) #ifdef XEN /* @@ -236,10 +247,12 @@ IDTVEC(trap0a) IDTVEC(trap0b) /* #NP() Segment not present */ TRAP_NJ(T_SEGNPFLT) jmp check_swapgs +IDTVEC_END(trap0b) /* #NP() Segment not present */ IDTVEC(trap0c) /* #SS() Stack exception */ TRAP_NJ(T_STKFLT) jmp check_swapgs +IDTVEC_END(trap0c) /* #SS() Stack exception */ IDTVEC(trap0d) /* #GP() General protection */ TRAP_NJ(T_PROTFLT) @@ -271,9 +284,11 @@ check_swapgs: jne 2b /* No - normal kernel fault */ jmp 1b /* Yes - restore %gs */ #endif +IDTVEC_END(trap0d) IDTVEC(trap0e) TRAP(T_PAGEFLT) +IDTVEC_END(trap0e) IDTVEC(intrspurious) IDTVEC(trap0f) @@ -283,6 +298,8 @@ IDTVEC(trap0f) movl CPUVAR(ILEVEL),%ebx #endif /* DIAGNOSTIC */ jmp .Lalltraps_checkusr +IDTVEC_END(trap0f) +IDTVEC_END(intrspurious) IDTVEC(trap10) ZTRAP_NJ(T_ARITHTRAP) @@ -299,16 +316,20 @@ IDTVEC(trap10) 1: STI(si) jmp calltrap +IDTVEC_END(trap10) IDTVEC(trap11) TRAP(T_ALIGNFLT) +IDTVEC_END(trap11) IDTVEC(trap12) ZTRAP(T_MCA) +IDTVEC_END(trap12) IDTVEC(trap13) ZTRAP_NJ(T_XMM) jmp .Ldo_fputrap +IDTVEC_END(trap13) IDTVEC(trap14) IDTVEC(trap15) @@ -324,6 +345,18 @@ IDTVEC(trap1e) IDTVEC(trap1f) /* 20 - 31 reserved for future exp */ ZTRAP(T_RESERVED) +IDTVEC_END(trap1f) +IDTVEC_END(trap1e) +IDTVEC_END(trap1d) +IDTVEC_END(trap1c) +IDTVEC_END(trap1b) +IDTVEC_END(trap1a) +IDTVEC_END(trap19) +IDTVEC_END(trap18) +IDTVEC_END(trap17) +IDTVEC_END(trap16) +IDTVEC_END(trap15) +IDTVEC_END(trap14) IDTVEC(exceptions) .quad _C_LABEL(Xtrap00), _C_LABEL(Xtrap01) @@ -342,6 +375,7 @@ IDTVEC(exceptions) .quad _C_LABEL(Xtrap1a), _C_LABEL(Xtrap1b) .quad _C_LABEL(Xtrap1c), _C_LABEL(Xtrap1d) .quad _C_LABEL(Xtrap1e), _C_LABEL(Xtrap1f) +IDTVEC_END(exceptions) /* * trap() calls here when it detects a fault in INTRFASTEXIT (loading the @@ -351,13 +385,15 @@ IDTVEC(exceptions) * Typically the code will have raised a SIGSEGV which will be actioned * by the code below. */ -_C_LABEL(trap_return_fault_return): .globl trap_return_fault_return + .type _C_LABEL(trap_return_fault_return), @function +LABEL(trap_return_fault_return) mov %rdi,%rsp /* frame for user return */ #ifdef DIAGNOSTIC /* We can't recover the saved %rbx, so suppress warning */ movl CPUVAR(ILEVEL),%ebx #endif /* DIAGNOSTIC */ jmp .Lalltraps_checkusr +END(trap_return_fault_return) /* * All traps go through here. Call the generic trap handler, and @@ -412,6 +448,7 @@ calltrap: 9: STI(si) call _C_LABEL(do_pmap_load) jmp .Lalltraps_checkast /* re-check ASTs */ +END(alltraps) #define __HAVE_GENERIC_SOFT_INTERRUPTS /* XXX */ @@ -451,6 +488,7 @@ IDTVEC(recurse_lapic_ipi) pushq $T_ASTFLT INTRENTRY jmp 1f +IDTVEC_END(recurse_lapic_ipi) IDTVEC(intr_lapic_ipi) pushq $0 @@ -471,6 +509,8 @@ IDTVEC(resume_lapic_ipi) 2: orl $(1 LIR_IPI),CPUVAR(IPENDING) INTRFASTEXIT +IDTVEC_END(resume_lapic_ipi) +IDTVEC_END(intr_lapic_ipi) #if defined(DDB) IDTVEC(intrddb) @@ -486,6 +526,7 @@ IDTVEC(intrddb)
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sat Jun 22 09:25:34 UTC 2013 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18847 Log Message: Import dhcpcd-6.0.1 with the following change: * Fix a compile issue on Big Endian machines Status: Vendor Tag: roy Release Tags: dhcpcd-6-0-1 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6rs.c U src/external/bsd/dhcpcd/dist/ipv6ns.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6ns.h U src/external/bsd/dhcpcd/dist/ipv6rs.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind No conflicts created by this import
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 13:09:08 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: mptramp.S src/sys/arch/i386/i386: mptramp.S Log Message: A few END() markers. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/amd64/mptramp.S cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/i386/mptramp.S 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/mptramp.S diff -u src/sys/arch/amd64/amd64/mptramp.S:1.14 src/sys/arch/amd64/amd64/mptramp.S:1.15 --- src/sys/arch/amd64/amd64/mptramp.S:1.14 Fri Apr 20 22:23:24 2012 +++ src/sys/arch/amd64/amd64/mptramp.S Sat Jun 22 13:09:07 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: mptramp.S,v 1.14 2012/04/20 22:23:24 rmind Exp $ */ +/* $NetBSD: mptramp.S,v 1.15 2013/06/22 13:09:07 uebayasi Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -119,7 +119,8 @@ .text .align 4,0x0 .code16 -_C_LABEL(cpu_spinup_trampoline): +/* XXX ENTRY() */ +LABEL(cpu_spinup_trampoline) cli xorw%ax,%ax movw%ax, %ds @@ -251,14 +252,16 @@ _C_LABEL(cpu_spinup_trampoline_end): #en movlPCB_CR0(%rsi),%eax movq%rax,%cr0 call _C_LABEL(cpu_hatch) +END(cpu_spinup_trampoline) .data -_C_LABEL(mp_pdirpa): +LABEL(mp_pdirpa) .quad 0 +END(mp_pdirpa) #ifdef MPDEBUG - .global _C_LABEL(cpu_trace) -_C_LABEL(cpu_trace): +LABEL(cpu_trace) .quad 0x40 .quad 0xff .quad 0xff +END(cpu_trace) #endif Index: src/sys/arch/i386/i386/mptramp.S diff -u src/sys/arch/i386/i386/mptramp.S:1.24 src/sys/arch/i386/i386/mptramp.S:1.25 --- src/sys/arch/i386/i386/mptramp.S:1.24 Fri Apr 20 22:23:24 2012 +++ src/sys/arch/i386/i386/mptramp.S Sat Jun 22 13:09:07 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: mptramp.S,v 1.24 2012/04/20 22:23:24 rmind Exp $ */ +/* $NetBSD: mptramp.S,v 1.25 2013/06/22 13:09:07 uebayasi Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -76,7 +76,7 @@ */ #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: mptramp.S,v 1.24 2012/04/20 22:23:24 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: mptramp.S,v 1.25 2013/06/22 13:09:07 uebayasi Exp $); #include opt_mpbios.h /* for MPDEBUG */ @@ -118,7 +118,8 @@ __KERNEL_RCSID(0, $NetBSD: mptramp.S,v .text .align 4,0x0 .code16 -_C_LABEL(cpu_spinup_trampoline): +/* XXX ENTRY() */ +LABEL(cpu_spinup_trampoline) cli xorw%ax,%ax movw%ax, %ds @@ -271,14 +272,16 @@ mp_cont: HALTT(0x30,%ecx) pushl %ecx call _C_LABEL(cpu_hatch) +END(cpu_spinup_trampoline) .data -_C_LABEL(mp_pdirpa): +LABEL(mp_pdirpa) .long 0 +END(mp_pdirpa) #ifdef MPDEBUG - .global _C_LABEL(cpu_trace) -_C_LABEL(cpu_trace): +LABEL(cpu_trace) .long 0x40 .long 0xff .long 0xff +END(cpu_trace) #endif
CVS commit: src/sys/arch/epoc32/epoc32
Module Name:src
Committed By: kiyohara
Date: Sat Jun 22 13:32:54 UTC 2013
Modified Files:
src/sys/arch/epoc32/epoc32: external_io.c external_io_asm.S
Log Message:
Fix bus_space_{read,write}_region_2.
Remove bus_space_{read,write}_2. ARM7 can't read/write half word access.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/epoc32/external_io.c \
src/sys/arch/epoc32/epoc32/external_io_asm.S
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/epoc32/epoc32/external_io.c
diff -u src/sys/arch/epoc32/epoc32/external_io.c:1.1 src/sys/arch/epoc32/epoc32/external_io.c:1.2
--- src/sys/arch/epoc32/epoc32/external_io.c:1.1 Sun Apr 28 12:11:26 2013
+++ src/sys/arch/epoc32/epoc32/external_io.c Sat Jun 22 13:32:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: external_io.c,v 1.1 2013/04/28 12:11:26 kiyohara Exp $ */
+/* $NetBSD: external_io.c,v 1.2 2013/06/22 13:32:54 kiyohara Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: external_io.c,v 1.1 2013/04/28 12:11:26 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: external_io.c,v 1.2 2013/06/22 13:32:54 kiyohara Exp $);
#include sys/param.h
#include sys/systm.h
@@ -74,7 +74,7 @@ struct bus_space external_bs_tag = {
/* read (single) */
external_bs_r_1,
- external_bs_r_2,
+ bs_notimpl_bs_r_2,
external_bs_r_4,
bs_notimpl_bs_r_8,
@@ -92,7 +92,7 @@ struct bus_space external_bs_tag = {
/* write (single) */
external_bs_w_1,
- external_bs_w_2,
+ bs_notimpl_bs_w_2,
external_bs_w_4,
bs_notimpl_bs_w_8,
@@ -130,7 +130,8 @@ struct bus_space external_bs_tag = {
/* bus space functions */
int
-external_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)
+external_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset,
+ bus_size_t size, bus_space_handle_t *nbshp)
{
*nbshp = bsh + offset;
@@ -154,8 +155,13 @@ external_bs_rr_2(void *cookie, bus_space
{
int i;
- for (i = 0; i count; i++)
- datap[i] = external_bs_r_2(cookie, bsh, offset + i);
+ for (i = 0; count - i 1 i count; i += 2)
+ *(uint32_t *)(datap[i]) =
+ external_bs_r_4(cookie, bsh, offset + (i 1));
+ for (; i count; i++)
+ datap[i] =
+ external_bs_r_1(cookie, bsh, offset + (i 1)) |
+ external_bs_r_1(cookie, bsh, offset + (i 1) + 1);
}
void
@@ -173,9 +179,16 @@ external_bs_wr_2(void *cookie, bus_space
bus_size_t offset, uint16_t const *datap, bus_size_t count)
{
int i;
+ uint16_t v;
- for (i = 0; i count; i++)
- external_bs_w_2(cookie, bsh, offset + i, datap[i]);
+ for (i = 0; count - i 1 i count; i += 2)
+ external_bs_w_4(cookie, bsh, offset + (i 1),
+ *(const uint32_t *)(datap[i]));
+ for (; i count; i++) {
+ v = datap[i];
+ external_bs_w_1(cookie, bsh, offset + (i 1), v 0xff);
+ external_bs_w_1(cookie, bsh, offset + (i 1) + 1, v 8);
+ }
}
void
@@ -194,6 +207,11 @@ external_bs_sr_2(void *cookie, bus_space
{
int i;
- for (i = 0; i count; i++)
- external_bs_w_2(cookie, bsh, offset + i, value);
+ for (i = 0; count - i 1 i count; i += 2)
+ external_bs_w_4(cookie, bsh, offset + (i 1),
+ value | (value 16));
+ for (; i count; i++) {
+ external_bs_w_1(cookie, bsh, offset + (i 1), value 0xff);
+ external_bs_w_1(cookie, bsh, offset + (i 1) + 1, value 8);
+ }
}
Index: src/sys/arch/epoc32/epoc32/external_io_asm.S
diff -u src/sys/arch/epoc32/epoc32/external_io_asm.S:1.1 src/sys/arch/epoc32/epoc32/external_io_asm.S:1.2
--- src/sys/arch/epoc32/epoc32/external_io_asm.S:1.1 Sun Apr 28 12:11:26 2013
+++ src/sys/arch/epoc32/epoc32/external_io_asm.S Sat Jun 22 13:32:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: external_io_asm.S,v 1.1 2013/04/28 12:11:26 kiyohara Exp $ */
+/* $NetBSD: external_io_asm.S,v 1.2 2013/06/22 13:32:54 kiyohara Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -47,13 +47,6 @@ ENTRY(external_bs_r_1)
ldrb r0, [r1, r2]
mov pc, lr
-ENTRY(external_bs_r_2)
- mov r2, r2, lsl r0
- ldr r0, [r1, r2]
- bic r0, r0, #0xff00
- bic r0, r0, #0x00ff
- mov pc, lr
-
ENTRY(external_bs_r_4)
mov r2, r2, lsl r0
ldr r0, [r1, r2]
@@ -68,13 +61,6 @@ ENTRY(external_bs_w_1)
strb r3, [r1, r2]
mov pc, lr
-ENTRY(external_bs_w_2)
- mov r3, r3, lsl #16
- orr r3, r3, r3, lsr #16
- mov r2, r2, lsl r0
- str r3, [r1, r2]
- mov pc, lr
-
ENTRY(external_bs_w_4)
mov r2, r2, lsl r0
str r3, [r1, r2]
CVS commit: src/sys/arch/epoc32/dev
Module Name:src
Committed By: kiyohara
Date: Sat Jun 22 13:36:17 UTC 2013
Modified Files:
src/sys/arch/epoc32/dev: etna.c
Log Message:
Series 5 avoids access into I/O space. I don't know this reason...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/dev/etna.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/epoc32/dev/etna.c
diff -u src/sys/arch/epoc32/dev/etna.c:1.1 src/sys/arch/epoc32/dev/etna.c:1.2
--- src/sys/arch/epoc32/dev/etna.c:1.1 Sun Apr 28 12:11:25 2013
+++ src/sys/arch/epoc32/dev/etna.c Sat Jun 22 13:36:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: etna.c,v 1.1 2013/04/28 12:11:25 kiyohara Exp $ */
+/* $NetBSD: etna.c,v 1.2 2013/06/22 13:36:16 kiyohara Exp $ */
/*
* Copyright (c) 2012 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: etna.c,v 1.1 2013/04/28 12:11:25 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: etna.c,v 1.2 2013/06/22 13:36:16 kiyohara Exp $);
#include sys/param.h
#include sys/bus.h
@@ -341,6 +341,13 @@ etna_io_alloc(pcmcia_chipset_handle_t pc
bus_size_t align, struct pcmcia_io_handle *pcihp)
{
struct etna_softc *sc = (struct etna_softc *)pch;
+ extern char epoc32_model[];
+
+ /*
+ * X: Series 5 can't allocate I/O map???
+ */
+ if (strcmp(epoc32_model, SERIES5 R1) == 0)
+ return -1;
memset(pcihp, 0, sizeof(*pcihp));
pcihp-iot = sc-sc_iot;
CVS commit: src/sys/arch/epoc32/dev
Module Name:src
Committed By: kiyohara
Date: Sat Jun 22 13:53:30 UTC 2013
Modified Files:
src/sys/arch/epoc32/dev: epockbd.c
Log Message:
Calculate correct response from keyboard. Some machines responds ugly scan
code.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/dev/epockbd.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/epoc32/dev/epockbd.c
diff -u src/sys/arch/epoc32/dev/epockbd.c:1.1 src/sys/arch/epoc32/dev/epockbd.c:1.2
--- src/sys/arch/epoc32/dev/epockbd.c:1.1 Sun Apr 28 12:11:25 2013
+++ src/sys/arch/epoc32/dev/epockbd.c Sat Jun 22 13:53:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: epockbd.c,v 1.1 2013/04/28 12:11:25 kiyohara Exp $ */
+/* $NetBSD: epockbd.c,v 1.2 2013/06/22 13:53:30 kiyohara Exp $ */
/*
* Copyright (c) 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: epockbd.c,v 1.1 2013/04/28 12:11:25 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: epockbd.c,v 1.2 2013/06/22 13:53:30 kiyohara Exp $);
#include sys/param.h
#include sys/bus.h
@@ -182,6 +182,13 @@ epockbd_cngetc(void *conscookie, u_int *
struct epockbd_softc *sc = conscookie;
uint8_t cmd, key, mask;
int column, row;
+#if 1
+ /*
+ * For some machines which return a strange response, it calculates
+ * using this variable.
+ */
+ int pc = 0, pr = 0;
+#endif
*type = 0;
*data = 0;
@@ -197,12 +204,23 @@ epockbd_cngetc(void *conscookie, u_int *
if (sc-sc_state[column] != key) {
row = sc-sc_state[column] ^ key;
sc-sc_state[column] = key;
- if (*data == 0) {
+#if 1
+ if (*data == 0 ||
+ (row == pr pc == 0
+ column == sc-sc_kbd_ncolumn - 1))
+#else
+ if (*data == 0)
+#endif
+ {
if (key row)
*type = WSCONS_EVENT_KEY_DOWN;
else
*type = WSCONS_EVENT_KEY_UP;
*data = EPOC2WS_KBD_DATA(row, column);
+#if 1
+pc = column;
+pr = row;
+#endif
}
}
}
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 15:13:56 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: locore.S src/sys/arch/i386/i386: locore.S Log Message: Use END() markers, etc. Pure ELF .symtab (size) changes. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.103 -r1.104 src/sys/arch/i386/i386/locore.S 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/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.70 src/sys/arch/amd64/amd64/locore.S:1.71 --- src/sys/arch/amd64/amd64/locore.S:1.70 Sun Jul 15 15:17:56 2012 +++ src/sys/arch/amd64/amd64/locore.S Sat Jun 22 15:13:56 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.70 2012/07/15 15:17:56 dsl Exp $ */ +/* $NetBSD: locore.S,v 1.71 2013/06/22 15:13:56 uebayasi Exp $ */ /* * Copyright-o-rama! @@ -187,6 +187,9 @@ /* Get definitions for IOM_BEGIN, IOM_END, and IOM_SIZE */ #include dev/isa/isareg.h +#define _RELOC(x) ((x) - KERNBASE) +#define RELOC(x) _RELOC(_C_LABEL(x)) + #ifdef XEN /* @@ -216,53 +219,92 @@ #if NLAPIC 0 .align NBPG - .globl _C_LABEL(local_apic), _C_LABEL(lapic_id), _C_LABEL(lapic_tpr) -_C_LABEL(local_apic): + .globl _C_LABEL(local_apic) + .globl _C_LABEL(lapic_id) + .globl _C_LABEL(lapic_tpr) + + .type _C_LABEL(local_apic), @object +LABEL(local_apic) .space LAPIC_ID -_C_LABEL(lapic_id): +END(local_apic) + .type _C_LABEL(lapic_id), @object +LABEL(lapic_id) .long 0x .space LAPIC_TPRI-(LAPIC_ID+4) -_C_LABEL(lapic_tpr): +END(lapic_id) + .type _C_LABEL(lapic_tpr), @object +LABEL(lapic_tpr) .space LAPIC_PPRI-LAPIC_TPRI +END(lapic_tpr) + .type _C_LABEL(lapic_ppr), @object _C_LABEL(lapic_ppr): .space LAPIC_ISR-LAPIC_PPRI +END(lapic_ppr) + .type _C_LABEL(lapic_isr), @object _C_LABEL(lapic_isr): .space NBPG-LAPIC_ISR +END(lapic_isr) #endif - .globl _C_LABEL(cpu_id),_C_LABEL(cpu_vendorname), _C_LABEL(cpu_brand_id) + .globl _C_LABEL(cpu_id) + .globl _C_LABEL(cpu_vendorname) + .globl _C_LABEL(cpu_brand_id) .globl _C_LABEL(cpuid_level) - .globl _C_LABEL(esym),_C_LABEL(eblob),_C_LABEL(boothowto) - .globl _C_LABEL(bootinfo),_C_LABEL(atdevbase) + .globl _C_LABEL(esym) + .globl _C_LABEL(eblob) + .globl _C_LABEL(boothowto) + .globl _C_LABEL(bootinfo) + .globl _C_LABEL(atdevbase) .globl _C_LABEL(PDPpaddr) - .globl _C_LABEL(biosbasemem),_C_LABEL(biosextmem) - .globl _C_LABEL(gdtstore),_C_LABEL(cputype) + .globl _C_LABEL(biosbasemem) + .globl _C_LABEL(biosextmem) + .globl _C_LABEL(gdtstore) + .globl _C_LABEL(cputype) -_C_LABEL(cputype): .long 0 # are we 386, 386sx, or 486, + .type _C_LABEL(cputype), @object +LABEL(cputype) .long 0 # are we 386, 386sx, or 486, # or Pentium, or.. -_C_LABEL(cpu_id): .long 0 # saved from `cpuid' instruction -_C_LABEL(cpuid_level): .long -1 # max. level accepted by 'cpuid' +END(cputype) + .type _C_LABEL(cpu_id), @object +LABEL(cpu_id) .long 0 # saved from `cpuid' instruction +END(cpu_id) + .type _C_LABEL(cpuid_level), @object +LABEL(cpuid_level) .long -1 # max. level accepted by 'cpuid' # instruction -_C_LABEL(cpu_vendorname): .space 16 # vendor string returned by `cpuid' +END(cpuid_level) + .type _C_LABEL(cpu_vendorname), @object +LABEL(cpu_vendorname) .space 16 # vendor string returned by `cpuid' # instruction -_C_LABEL(cpu_brand_id): .long 0 # brand ID from 'cpuid' instruction -_C_LABEL(esym): .quad 0 # ptr to end of syms -_C_LABEL(eblob): .quad 0 # ptr to end of modules -_C_LABEL(atdevbase): .quad 0 # location of start of iomem in virtual -_C_LABEL(PDPpaddr): .quad 0 # paddr of PTD, for libkvm +END(cpu_vendorname) + .type _C_LABEL(cpu_brand_id), @object +LABEL(cpu_brand_id) .long 0 # brand ID from 'cpuid' instruction +END(cpu_brand_id) + .type _C_LABEL(esym), @object +LABEL(esym) .quad 0 # ptr to end of syms +END(esym) + .type _C_LABEL(eblob), @object +LABEL(eblob) .quad 0 # ptr to end of modules +END(eblob) + .type _C_LABEL(atdevbase), @object +LABEL(atdevbase) .quad 0 # location of start of iomem in virtual +END(atdevbase) + .type _C_LABEL(PDPpaddr), @object +LABEL(PDPpaddr) .quad 0 # paddr of PTD, for libkvm +END(PDPpaddr) + .type _C_LABEL(biosbasemem), @object #ifndef REALBASEMEM -_C_LABEL(biosbasemem): .long 0 # base memory reported by BIOS +LABEL(biosbasemem) .long 0 # base memory reported by BIOS #else -_C_LABEL(biosbasemem): .long REALBASEMEM +LABEL(biosbasemem) .long REALBASEMEM #endif +END(biosbasemem) + .type _C_LABEL(biosextmem), @object #ifndef REALEXTMEM -_C_LABEL(biosextmem): .long 0 # extended memory reported by BIOS +LABEL(biosextmem) .long 0 # extended memory reported by BIOS #else -_C_LABEL(biosextmem): .long REALEXTMEM +LABEL(biosextmem) .long REALEXTMEM #endif - -#define _RELOC(x) ((x) - KERNBASE) -#define RELOC(x) _RELOC(_C_LABEL(x)) +END(biosextmem) #ifndef XEN .globl gdt64_lo @@ -271,30
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Jun 22 15:50:17 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: std.rpi Log Message: Enable ARM_HAS_VBAR since the arm1176 has a VBAR register. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.rpi 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/evbarm/conf/std.rpi diff -u src/sys/arch/evbarm/conf/std.rpi:1.7 src/sys/arch/evbarm/conf/std.rpi:1.8 --- src/sys/arch/evbarm/conf/std.rpi:1.7 Sat Mar 16 15:48:21 2013 +++ src/sys/arch/evbarm/conf/std.rpi Sat Jun 22 15:50:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: std.rpi,v 1.7 2013/03/16 15:48:21 skrll Exp $ +# $NetBSD: std.rpi,v 1.8 2013/06/22 15:50:17 matt Exp $ # # standard NetBSD/evbarm for Raspberry Pi options @@ -12,6 +12,7 @@ options __HAVE_CPU_COUNTER options __HAVE_FAST_SOFTINTS # should be in types.h options __HAVE_CPU_UAREA_ALLOC_IDLELWP options TPIDRPRW_IS_CURCPU +options ARM_HAS_VBAR options KERNEL_BASE_EXT=0xc000 options URTWN_DOTG_WORKAROUND
CVS commit: src/lib/libpam/modules/pam_login_access
Module Name:src Committed By: dholland Date: Sun Jun 23 01:44:23 UTC 2013 Modified Files: src/lib/libpam/modules/pam_login_access: login.access.5 Log Message: add missing word To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/lib/libpam/modules/pam_login_access/login.access.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpam/modules/pam_login_access/login.access.5 diff -u src/lib/libpam/modules/pam_login_access/login.access.5:1.1.1.1 src/lib/libpam/modules/pam_login_access/login.access.5:1.2 --- src/lib/libpam/modules/pam_login_access/login.access.5:1.1.1.1 Sun Dec 12 06:50:17 2004 +++ src/lib/libpam/modules/pam_login_access/login.access.5 Sun Jun 23 01:44:22 2013 @@ -16,7 +16,7 @@ combinations for which a login will be e .Pp When someone logs in, the .Nm -is scanned for the first entry that +file is scanned for the first entry that matches the (user, host) combination, or, in case of non-networked logins, the first entry that matches the (user, tty) combination. The
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: dholland
Date: Sun Jun 23 02:07:04 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs.h
Log Message:
typo in comment
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/ufs/lfs/lfs.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/ufs/lfs/lfs.h
diff -u src/sys/ufs/lfs/lfs.h:1.155 src/sys/ufs/lfs/lfs.h:1.156
--- src/sys/ufs/lfs/lfs.h:1.155 Wed Jun 19 17:51:26 2013
+++ src/sys/ufs/lfs/lfs.h Sun Jun 23 02:07:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.155 2013/06/19 17:51:26 dholland Exp $ */
+/* $NetBSD: lfs.h,v 1.156 2013/06/23 02:07:04 dholland Exp $ */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */
@@ -851,7 +851,7 @@ struct dlfs {
u_int32_t dlfs_inodefmt; /* 360: inode format version */
u_int32_t dlfs_interleave; /* 364: segment interleave */
u_int32_t dlfs_ident; /* 368: per-fs identifier */
- u_int32_t dlfs_fsbtodb; /* 372: fsbtodb abd dbtodsb shift constant */
+ u_int32_t dlfs_fsbtodb; /* 372: fsbtodb and dbtodsb shift constant */
u_int32_t dlfs_resvseg; /* 376: segments reserved for the cleaner */
int8_t dlfs_pad[128]; /* 380: round to 512 bytes */
/* Checksum -- last valid disk field. */
CVS commit: src/sys/lib/libkern
Module Name:src Committed By: riastradh Date: Sun Jun 23 02:38:22 UTC 2013 Modified Files: src/sys/lib/libkern: arc4random.c Log Message: Account bytes drawn from initial call to libkern arc4random. XXX This unlocked initialization looks rather bogus... To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/lib/libkern/arc4random.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/lib/libkern/arc4random.c diff -u src/sys/lib/libkern/arc4random.c:1.33 src/sys/lib/libkern/arc4random.c:1.34 --- src/sys/lib/libkern/arc4random.c:1.33 Sun Jun 23 02:35:24 2013 +++ src/sys/lib/libkern/arc4random.c Sun Jun 23 02:38:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arc4random.c,v 1.33 2013/06/23 02:35:24 riastradh Exp $ */ +/* $NetBSD: arc4random.c,v 1.34 2013/06/23 02:38:22 riastradh Exp $ */ /*- * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc. @@ -251,6 +251,7 @@ _arc4randbytes(void *p, size_t len) arc4_init(); /* avoid conditionalizing locking */ arc4randbytes_unlocked(p, len); + arc4_numbytes += len; return; } mutex_spin_enter(arc4_mtx);
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Sun Jun 23 02:39:32 UTC 2013 Modified Files: src/share/man/man9: cprng.9 Log Message: Fix dangling sentence vestige in cprng(9). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/cprng.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/cprng.9 diff -u src/share/man/man9/cprng.9:1.6 src/share/man/man9/cprng.9:1.7 --- src/share/man/man9/cprng.9:1.6 Thu Aug 23 11:59:02 2012 +++ src/share/man/man9/cprng.9 Sun Jun 23 02:39:32 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: cprng.9,v 1.6 2012/08/23 11:59:02 drochner Exp $ +.\ $NetBSD: cprng.9,v 1.7 2013/06/23 02:39:32 riastradh Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -116,7 +116,6 @@ The family of functions supply less strong random numbers, suitable for initialization vectors, nonces in certain protocols, and other similar purposes, using a faster but less secure stream-cipher generator. -stream-cipher generator. Calls to .Xr arc4random 9 should be replaced with calls to
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sun Jun 23 03:16:46 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: locore.S src/sys/arch/i386/i386: locore.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.104 -r1.105 src/sys/arch/i386/i386/locore.S 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/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.71 src/sys/arch/amd64/amd64/locore.S:1.72 --- src/sys/arch/amd64/amd64/locore.S:1.71 Sat Jun 22 15:13:56 2013 +++ src/sys/arch/amd64/amd64/locore.S Sun Jun 23 03:16:46 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.71 2013/06/22 15:13:56 uebayasi Exp $ */ +/* $NetBSD: locore.S,v 1.72 2013/06/23 03:16:46 uebayasi Exp $ */ /* * Copyright-o-rama! @@ -425,7 +425,7 @@ ENTRY(start) subl %ebx, (%edx) /* correct number of entries */ 1: - movl 16(%esp),%eax + movl 16(%esp),%eax testl %eax,%eax jz 1f addl $KERNBASE_LO,%eax @@ -554,7 +554,7 @@ ENTRY(start) leal (PROC0_PTP1_OFF)(%esi), %ebx /* - * Compute __data_start - KERNBASE. This can't be 4G, + * Compute __data_start - KERNBASE. This can't be 4G, * or we can't deal with it anyway, since we can't load it in * 32 bit mode. So use the bottom 32 bits. */ Index: src/sys/arch/i386/i386/locore.S diff -u src/sys/arch/i386/i386/locore.S:1.104 src/sys/arch/i386/i386/locore.S:1.105 --- src/sys/arch/i386/i386/locore.S:1.104 Sat Jun 22 15:13:55 2013 +++ src/sys/arch/i386/i386/locore.S Sun Jun 23 03:16:46 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.104 2013/06/22 15:13:55 uebayasi Exp $ */ +/* $NetBSD: locore.S,v 1.105 2013/06/23 03:16:46 uebayasi Exp $ */ /* * Copyright-o-rama! @@ -129,7 +129,7 @@ */ #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.104 2013/06/22 15:13:55 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: locore.S,v 1.105 2013/06/23 03:16:46 uebayasi Exp $); #include opt_compat_oldboot.h #include opt_ddb.h @@ -592,38 +592,38 @@ try586: /* Use the `cpuid' instruction. cmpl %eax,RELOC(nkptp)+1*4 jnz 1b - /* Clear tables */ - movl %esi,%edi + /* Clear tables */ + movl %esi,%edi xorl %eax,%eax cld - movl RELOC(tablesize),%ecx - shrl $2,%ecx + movl RELOC(tablesize),%ecx + shrl $2,%ecx rep stosl - leal (PROC0_PTP1_OFF)(%esi), %ebx + leal (PROC0_PTP1_OFF)(%esi), %ebx /* * Build initial page tables. */ - /* - * Compute __data_start - KERNBASE. This can't be 4G, + /* + * Compute __data_start - KERNBASE. This can't be 4G, * or we can't deal with it anyway, since we can't load it in * 32 bit mode. So use the bottom 32 bits. - */ - movl $RELOC(__data_start),%edx + */ + movl $RELOC(__data_start),%edx andl $~PGOFSET,%edx - /* - * Skip the first MB. - */ + /* + * Skip the first MB. + */ movl $_RELOC(KERNTEXTOFF),%eax movl %eax,%ecx shrl $(PGSHIFT-2),%ecx /* ((n PGSHIFT) 2) for # pdes */ #ifdef PAE - shll $1,%ecx /* pdes are twice larger with PAE */ + shll $1,%ecx /* pdes are twice larger with PAE */ #endif - addl %ecx,%ebx + addl %ecx,%ebx /* Map the kernel text read-only. */ movl %edx,%ecx @@ -648,24 +648,24 @@ try586: /* Use the `cpuid' instruction. /* * Construct a page table directory. */ - /* Set up top level entries for identity mapping */ - leal (PROC0_PDIR_OFF)(%esi),%ebx - leal (PROC0_PTP1_OFF)(%esi),%eax - orl $(PG_V|PG_KW), %eax - movl RELOC(nkptp)+1*4,%ecx + /* Set up top level entries for identity mapping */ + leal (PROC0_PDIR_OFF)(%esi),%ebx + leal (PROC0_PTP1_OFF)(%esi),%eax + orl $(PG_V|PG_KW), %eax + movl RELOC(nkptp)+1*4,%ecx fillkpt - /* Set up top level entries for actual kernel mapping */ - leal (PROC0_PDIR_OFF + L2_SLOT_KERNBASE*PDE_SIZE)(%esi),%ebx - leal (PROC0_PTP1_OFF)(%esi),%eax - orl $(PG_V|PG_KW), %eax - movl RELOC(nkptp)+1*4,%ecx + /* Set up top level entries for actual kernel mapping */ + leal (PROC0_PDIR_OFF + L2_SLOT_KERNBASE*PDE_SIZE)(%esi),%ebx + leal (PROC0_PTP1_OFF)(%esi),%eax + orl $(PG_V|PG_KW), %eax + movl RELOC(nkptp)+1*4,%ecx fillkpt /* Install a PDE recursively mapping page directory as a page table! */ - leal (PROC0_PDIR_OFF + PDIR_SLOT_PTE*PDE_SIZE)(%esi),%ebx - leal (PROC0_PDIR_OFF)(%esi),%eax - orl $(PG_V|PG_KW),%eax + leal (PROC0_PDIR_OFF + PDIR_SLOT_PTE*PDE_SIZE)(%esi),%ebx + leal (PROC0_PDIR_OFF)(%esi),%eax + orl $(PG_V|PG_KW),%eax movl $PDP_SIZE,%ecx fillkpt @@ -694,9 +694,9 @@ try586: /* Use the `cpuid' instruction. movl %esi,%eax # phys address of ptd in proc 0 movl %eax,%cr3 # load ptd addr into mmu - /* - * 2. Enable paging and the rest of it. - */ + /* + * 2. Enable paging and the rest of it. + */ movl %cr0,%eax # get control word # enable paging NPX emulation orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_WP|CR0_AM),%eax @@
CVS commit: src/sbin/newfs
Module Name:src
Committed By: dholland
Date: Sun Jun 23 04:14:28 UTC 2013
Modified Files:
src/sbin/newfs: mkfs.c
Log Message:
Revert accidental commit of the change for PR 47911; got rolled into
other stuff by mistake.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.117 src/sbin/newfs/mkfs.c:1.118
--- src/sbin/newfs/mkfs.c:1.117 Sun Jun 23 02:06:05 2013
+++ src/sbin/newfs/mkfs.c Sun Jun 23 04:14:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.117 2013/06/23 02:06:05 dholland Exp $ */
+/* $NetBSD: mkfs.c,v 1.118 2013/06/23 04:14:28 dholland Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = @(#)mkfs.c 8.11 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: mkfs.c,v 1.117 2013/06/23 02:06:05 dholland Exp $);
+__RCSID($NetBSD: mkfs.c,v 1.118 2013/06/23 04:14:28 dholland Exp $);
#endif
#endif /* not lint */
@@ -1257,7 +1257,7 @@ makedir(struct direct *protodir, int ent
if (isappleufs)
dirblksiz = APPLEUFS_DIRBLKSIZ;
- memset(buf, 0, dirblksiz);
+ memset(buf, 0, UFS_DIRBLKSIZ);
spcleft = dirblksiz;
for (cp = buf, i = 0; i entries - 1; i++) {
protodir[i].d_reclen = UFS_DIRSIZ(Oflag == 0, protodir[i], 0);
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: uebayasi Date: Sat Jun 22 06:23:28 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: lock_stubs.S Log Message: Use END() to set ELF symbol size. Set local data type/size too. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amd64/amd64/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 06:57:30 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: spl.S src/sys/arch/i386/i386: spl.S Log Message: Use END() to set ELF symbol size. Set some type info too. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/i386/spl.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: uebayasi Date: Sat Jun 22 07:31:36 UTC 2013 Modified Files: src/sys/arch/amd64/include: asm.h Log Message: Define IDTVEC_END(), from i386/asm.h. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 08:48:48 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: vector.S src/sys/arch/i386/i386: vector.S Log Message: Use END()/IDTVEC_END() to set ELF symbol size. Set some type info too. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amd64/amd64/vector.S cvs rdiff -u -r1.60 -r1.61 src/sys/arch/i386/i386/vector.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sat Jun 22 09:25:34 UTC 2013 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18847 Log Message: Import dhcpcd-6.0.1 with the following change: * Fix a compile issue on Big Endian machines Status: Vendor Tag: roy Release Tags: dhcpcd-6-0-1 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6rs.c U src/external/bsd/dhcpcd/dist/ipv6ns.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6ns.h U src/external/bsd/dhcpcd/dist/ipv6rs.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind No conflicts created by this import
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 13:09:08 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: mptramp.S src/sys/arch/i386/i386: mptramp.S Log Message: A few END() markers. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/amd64/mptramp.S cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/i386/mptramp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/epoc32/epoc32
Module Name:src
Committed By: kiyohara
Date: Sat Jun 22 13:32:54 UTC 2013
Modified Files:
src/sys/arch/epoc32/epoc32: external_io.c external_io_asm.S
Log Message:
Fix bus_space_{read,write}_region_2.
Remove bus_space_{read,write}_2. ARM7 can't read/write half word access.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/epoc32/external_io.c \
src/sys/arch/epoc32/epoc32/external_io_asm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/epoc32/dev
Module Name:src Committed By: kiyohara Date: Sat Jun 22 13:36:17 UTC 2013 Modified Files: src/sys/arch/epoc32/dev: etna.c Log Message: Series 5 avoids access into I/O space. I don't know this reason... To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/dev/etna.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/epoc32/dev
Module Name:src Committed By: kiyohara Date: Sat Jun 22 13:53:30 UTC 2013 Modified Files: src/sys/arch/epoc32/dev: epockbd.c Log Message: Calculate correct response from keyboard. Some machines responds ugly scan code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/dev/epockbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sat Jun 22 15:13:56 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: locore.S src/sys/arch/i386/i386: locore.S Log Message: Use END() markers, etc. Pure ELF .symtab (size) changes. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.103 -r1.104 src/sys/arch/i386/i386/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Jun 22 15:50:17 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: std.rpi Log Message: Enable ARM_HAS_VBAR since the arm1176 has a VBAR register. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.rpi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/modules/pam_login_access
Module Name:src Committed By: dholland Date: Sun Jun 23 01:44:23 UTC 2013 Modified Files: src/lib/libpam/modules/pam_login_access: login.access.5 Log Message: add missing word To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/lib/libpam/modules/pam_login_access/login.access.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: dholland Date: Sun Jun 23 02:06:06 UTC 2013 Modified Files: src/sbin/badsect: badsect.c src/sbin/clri: clri.c src/sbin/dump: ffs_inode.c src/sbin/fsck_ext2fs: inode.c setup.c utilities.c src/sbin/fsck_ffs: inode.c pass1.c pass5.c setup.c utilities.c src/sbin/fsdb: fsdb.c src/sbin/fsirand: fsirand.c src/sbin/newfs: mkfs.c src/sbin/newfs_ext2fs: mke2fs.c src/sbin/resize_ffs: resize_ffs.c src/sbin/scan_ffs: scan_ffs.c src/sbin/tunefs: tunefs.c src/sys/arch/hp700/stand/xxboot: readufs_ffs.c src/sys/arch/mvme68k/stand/installboot: installboot.c src/sys/arch/x68k/stand/boot_ufs: readufs_ffs.c src/sys/lib/libsa: ext2fs.c minixfs3.c minixfs3.h ufs.c src/sys/ufs/ext2fs: ext2fs.h ext2fs_alloc.c ext2fs_balloc.c ext2fs_inode.c ext2fs_vfsops.c src/sys/ufs/ffs: ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c ffs_vfsops.c ffs_wapbl.c fs.h src/usr.sbin/dumpfs: dumpfs.c src/usr.sbin/installboot: ext2fs.c ffs.c src/usr.sbin/makefs: ffs.c src/usr.sbin/makefs/ffs: ffs_alloc.c ffs_balloc.c mkfs.c src/usr.sbin/quotacheck: quotacheck.c Log Message: fsbtodb() - FFS_FSBTODB(), EXT2_FSBTODB(), or MFS_FSBTODB() dbtofsb() - FFS_DBTOFSB() or EXT2_DBTOFSB() (Christos already did the lfs ones a few days back) To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sbin/badsect/badsect.c cvs rdiff -u -r1.22 -r1.23 src/sbin/clri/clri.c cvs rdiff -u -r1.21 -r1.22 src/sbin/dump/ffs_inode.c cvs rdiff -u -r1.34 -r1.35 src/sbin/fsck_ext2fs/inode.c cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck_ext2fs/setup.c cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_ext2fs/utilities.c cvs rdiff -u -r1.66 -r1.67 src/sbin/fsck_ffs/inode.c cvs rdiff -u -r1.53 -r1.54 src/sbin/fsck_ffs/pass1.c cvs rdiff -u -r1.51 -r1.52 src/sbin/fsck_ffs/pass5.c cvs rdiff -u -r1.98 -r1.99 src/sbin/fsck_ffs/setup.c cvs rdiff -u -r1.61 -r1.62 src/sbin/fsck_ffs/utilities.c cvs rdiff -u -r1.47 -r1.48 src/sbin/fsdb/fsdb.c cvs rdiff -u -r1.30 -r1.31 src/sbin/fsirand/fsirand.c cvs rdiff -u -r1.116 -r1.117 src/sbin/newfs/mkfs.c cvs rdiff -u -r1.19 -r1.20 src/sbin/newfs_ext2fs/mke2fs.c cvs rdiff -u -r1.35 -r1.36 src/sbin/resize_ffs/resize_ffs.c cvs rdiff -u -r1.22 -r1.23 src/sbin/scan_ffs/scan_ffs.c cvs rdiff -u -r1.45 -r1.46 src/sbin/tunefs/tunefs.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp700/stand/xxboot/readufs_ffs.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/arch/mvme68k/stand/installboot/installboot.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/stand/boot_ufs/readufs_ffs.c cvs rdiff -u -r1.16 -r1.17 src/sys/lib/libsa/ext2fs.c cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libsa/minixfs3.c \ src/sys/lib/libsa/minixfs3.h cvs rdiff -u -r1.61 -r1.62 src/sys/lib/libsa/ufs.c cvs rdiff -u -r1.34 -r1.35 src/sys/ufs/ext2fs/ext2fs.h cvs rdiff -u -r1.44 -r1.45 src/sys/ufs/ext2fs/ext2fs_alloc.c cvs rdiff -u -r1.37 -r1.38 src/sys/ufs/ext2fs/ext2fs_balloc.c cvs rdiff -u -r1.79 -r1.80 src/sys/ufs/ext2fs/ext2fs_inode.c cvs rdiff -u -r1.170 -r1.171 src/sys/ufs/ext2fs/ext2fs_vfsops.c cvs rdiff -u -r1.135 -r1.136 src/sys/ufs/ffs/ffs_alloc.c cvs rdiff -u -r1.57 -r1.58 src/sys/ufs/ffs/ffs_balloc.c cvs rdiff -u -r1.113 -r1.114 src/sys/ufs/ffs/ffs_inode.c cvs rdiff -u -r1.124 -r1.125 src/sys/ufs/ffs/ffs_snapshot.c cvs rdiff -u -r1.284 -r1.285 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.19 -r1.20 src/sys/ufs/ffs/ffs_wapbl.c cvs rdiff -u -r1.61 -r1.62 src/sys/ufs/ffs/fs.h cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/dumpfs/dumpfs.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/installboot/ext2fs.c cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/installboot/ffs.c cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/makefs/ffs.c cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/makefs/ffs/ffs_alloc.c cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/makefs/ffs/ffs_balloc.c cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/makefs/ffs/mkfs.c cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/quotacheck/quotacheck.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: dholland Date: Sun Jun 23 02:07:04 UTC 2013 Modified Files: src/sys/ufs/lfs: lfs.h Log Message: typo in comment To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/ufs/lfs/lfs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: riastradh Date: Sun Jun 23 02:35:24 UTC 2013 Modified Files: src/sys/conf: files src/sys/dev: rndpseudo.c src/sys/kern: kern_rndq.c subr_cprng.c src/sys/lib/libkern: arc4random.c src/sys/rump/librump/rumpkern: Makefile.rumpkern cprng_stub.c src/sys/sys: cprng.h rnd.h src/usr.bin/fstat: misc.c Added Files: src/share/man/man9: rndsink.9 src/sys/kern: kern_rndsink.c src/sys/sys: rndsink.h Log Message: Rework rndsink(9) abstraction and adapt arc4random(9) and cprng(9). rndsink(9): - Simplify API. - Simplify locking scheme. - Add a man page. - Avoid races in destruction. - Avoid races in requesting entropy now and scheduling entropy later. Periodic distribution of entropy to sinks reduces the need for the last one, but this way we don't need to rely on periodic distribution (e.g., in a future tickless NetBSD). rndsinks_lock should probably eventually merge with the rndpool lock, but we'll put that off for now. cprng(9): - Make struct cprng_strong opaque. - Move rndpseudo.c parts that futz with cprng guts to subr_cprng.c. - Fix kevent locking. (Is kevent locking documented anywhere?) - Stub out rump cprng further until we can rumpify rndsink instead. - Strip code to grovel through struct cprng_strong in fstat. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/man/man9/rndsink.9 cvs rdiff -u -r1.1073 -r1.1074 src/sys/conf/files cvs rdiff -u -r1.12 -r1.13 src/sys/dev/rndpseudo.c cvs rdiff -u -r1.13 -r1.14 src/sys/kern/kern_rndq.c cvs rdiff -u -r0 -r1.1 src/sys/kern/kern_rndsink.c cvs rdiff -u -r1.17 -r1.18 src/sys/kern/subr_cprng.c cvs rdiff -u -r1.32 -r1.33 src/sys/lib/libkern/arc4random.c cvs rdiff -u -r1.127 -r1.128 src/sys/rump/librump/rumpkern/Makefile.rumpkern cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpkern/cprng_stub.c cvs rdiff -u -r1.6 -r1.7 src/sys/sys/cprng.h cvs rdiff -u -r1.37 -r1.38 src/sys/sys/rnd.h cvs rdiff -u -r0 -r1.1 src/sys/sys/rndsink.h cvs rdiff -u -r1.11 -r1.12 src/usr.bin/fstat/misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libkern
Module Name:src Committed By: riastradh Date: Sun Jun 23 02:38:22 UTC 2013 Modified Files: src/sys/lib/libkern: arc4random.c Log Message: Account bytes drawn from initial call to libkern arc4random. XXX This unlocked initialization looks rather bogus... To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/lib/libkern/arc4random.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: riastradh Date: Sun Jun 23 02:39:32 UTC 2013 Modified Files: src/share/man/man9: cprng.9 Log Message: Fix dangling sentence vestige in cprng(9). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/cprng.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: uebayasi Date: Sun Jun 23 03:16:46 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: locore.S src/sys/arch/i386/i386: locore.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/amd64/amd64/locore.S cvs rdiff -u -r1.104 -r1.105 src/sys/arch/i386/i386/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs
Module Name:src Committed By: dholland Date: Sun Jun 23 04:14:28 UTC 2013 Modified Files: src/sbin/newfs: mkfs.c Log Message: Revert accidental commit of the change for PR 47911; got rolled into other stuff by mistake. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sbin/newfs/mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
