Re: CVS commit: src/sys/arch/sparc
Does sparc do early console at all? Martin
re: CVS commit: src/sys/arch/sparc
Does sparc do early console at all? yes, it uses the prom console. my ss20 hangs at boot with -current: 3312000+121480 [213328+209074]=0x3adad4 OBP version 3, revision 2.25 (plugin rev 2) [ hang ] i think the cn_tab changes should be reverted, as well as the -fno-common change. perhaps -fno-common could remain on platforms known to work and we can switch others over when they're working. -current has been pretty broken recently, let's not make it worse with this cleanup change. .mrg.
re: CVS commit: src/sys/arch/sparc
Does sparc do early console at all? yes, it uses the prom console. my ss20 hangs at boot with -current: Ah, yes, that counts. 3312000+121480 [213328+209074]=0x3adad4 OBP version 3, revision 2.25 (plugin rev 2) [ hang ] Ok, but fixing as the other matt suggested should be easy. i think the cn_tab changes should be reverted, as well as the -fno-common change. perhaps -fno-common could remain on platforms known to work and we can switch others over when they're working. I like the -no-common one, and fallout is easy to fix... if it is so easy, why hasn't someone done it already? it's not like normal development -- this hangs the machine hard and you have to go reset by hand. this isn't like openssl where we're actively trying to upgrade something that is out of date before release, but is just a basic and simple clean up that doesn't really change anything. as such, and because it is such a simple change (one line!), reverting is easy and to me the clear way forward... even if that means reverting sparc cn_tab changes and putting a sparc conditional on Makefile.kern.conf.. i have *much* more important things to worry about in port sparc land than unnecessary clean up where i'd have to sit in my hot noisy machine room to reset it each time. and that's when i can find time for sparc... .mrg.
Re: CVS commit: src/sys/arch/sparc
On Jul 31, 9:40am, mar...@duskware.de (Martin Husemann) wrote: -- Subject: Re: CVS commit: src/sys/arch/sparc | Does sparc do early console at all? I don't know. Perhaps it is easiest to make cn_tab MD. christos
Re: CVS commit: src/sys/arch/sparc
On Tue, Jul 31, 2012 at 07:14:03PM +1000, matthew green wrote: I like the -no-common one, and fallout is easy to fix... if it is so easy, why hasn't someone done it already? it's not like normal development -- this hangs the machine hard and you have to go reset by hand. If the intent of adding -fno-common is to remove issues with common data, then it is really doing the wrong thing. You really need to error 'common' data items, not convert them to bss. That might need a check later on the generated files. David -- David Laight: da...@l8s.co.uk
Re: CVS commit: src/sys/arch/sparc
On Tue, Jul 31, 2012 at 11:16:44AM +0100, David Laight wrote: If the intent of adding -fno-common is to remove issues with common data, then it is really doing the wrong thing. You really need to error 'common' data items, not convert them to bss. That might need a check later on the generated files. er wot? The issues are multiply defined symbols, and switching them from common to bss does in fact cause them to error out. That's the point. -- David A. Holland dholl...@netbsd.org
Re: CVS commit: src/sys/arch/sparc
christos@ wrote: On Jul 30, 11:37am, m...@3am-software.com (Matt Thomas) wrote: -- Subject: Re: CVS commit: src/sys/arch/sparc | | On Jul 30, 2012, at 10:29 AM, Christos Zoulas wrote: | | Module Name: src | Committed By: christos | Date: Mon Jul 30 17:29:55 UTC 2012 | Modified Files: |src/sys/arch/sparc/dev: kd.c |src/sys/arch/sparc/sparc: machdep.c | | Log Message: | move cn_tab initializationt to cpu_startup | | cn_tab was used for early console access | cpu_startup is too late. | | it needs to be done sometime before main is | called. Should we make cn_tab md, and let the ports initialize it themselves? Any better ideas? Why don't you guys (as core? or individual developer?) post an announcement that mentions benefit of -fno-common and ask Tier II users to fix possible fallout, before putting random MD fixes that would cause annoying silent hangs? For sparc, the correct place seems in sparc/autoconf.c:bootstrap(). For sun2 it's sun2/locore2.c:_bootstrap(). Most other m68k ports foo_init() for pre-main initialization. --- Izumi Tsutsui
Re: CVS commit: src/sys
On Tue, Jul 31, 2012 at 03:50:39PM +, Manuel Bouyer wrote: Apply back changes that were reverted on Jul 24 and Jul 26 (general ata/wdc cleanup and SATA PMP support), now that I'm back to fix the fallouts. What about the fallout (that on inspection of the code I'm fairly sure exists) that won't be immediately detected? The drive_type change is far too significant to be applied with other unrelated changes as well. Jonathan Kollasch
Re: CVS commit: src/sys
On Tue, 31 Jul 2012, Jonathan A. Kollasch wrote: On Tue, Jul 31, 2012 at 03:50:39PM +, Manuel Bouyer wrote: Apply back changes that were reverted on Jul 24 and Jul 26 (general ata/wdc cleanup and SATA PMP support), now that I'm back to fix the fallouts. What about the fallout (that on inspection of the code I'm fairly sure exists) that won't be immediately detected? The drive_type change is far too significant to be applied with other unrelated changes as well. Did you fix the problem with drives disappearing in amd64? -- Hisashi T Fujinaka - ht...@twofifty.com BSEE(6/86) + BSChem(3/95) + BAEnglish(8/95) + MSCS(8/03) + $2.50 = latte
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Tue Jul 31 06:54:17 UTC 2012 Modified Files: src/sys/arch/arm/arm: bcopyinout.S Log Message: Use bcopyinout_xscale.S for armv6+ platforms since they have the needed instructions. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm/bcopyinout.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/arm/arm/bcopyinout.S diff -u src/sys/arch/arm/arm/bcopyinout.S:1.17 src/sys/arch/arm/arm/bcopyinout.S:1.18 --- src/sys/arch/arm/arm/bcopyinout.S:1.17 Sun Jan 18 01:19:32 2009 +++ src/sys/arch/arm/arm/bcopyinout.S Tue Jul 31 06:54:16 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: bcopyinout.S,v 1.17 2009/01/18 01:19:32 bjh21 Exp $ */ +/* $NetBSD: bcopyinout.S,v 1.18 2012/07/31 06:54:16 matt Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -43,11 +43,15 @@ #include machine/asm.h #include machine/cpu.h -#ifdef __XSCALE__ +#if defined(__XSCALE__) || defined(_ARM_ARCH_6) +/* + * armv6 and v7 have pld and strd so they can use the xscale + * bcopyinout as well. + */ #include bcopyinout_xscale.S #else -RCSID($NetBSD: bcopyinout.S,v 1.17 2009/01/18 01:19:32 bjh21 Exp $) +RCSID($NetBSD: bcopyinout.S,v 1.18 2012/07/31 06:54:16 matt Exp $) .text .align 0
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src
Committed By: matt
Date: Tue Jul 31 06:56:57 UTC 2012
Modified Files:
src/sys/arch/arm/include/arm32: frame.h
Log Message:
whitespace cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/include/arm32/frame.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/arm/include/arm32/frame.h
diff -u src/sys/arch/arm/include/arm32/frame.h:1.23 src/sys/arch/arm/include/arm32/frame.h:1.24
--- src/sys/arch/arm/include/arm32/frame.h:1.23 Sun Jan 18 01:19:33 2009
+++ src/sys/arch/arm/include/arm32/frame.h Tue Jul 31 06:56:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.23 2009/01/18 01:19:33 bjh21 Exp $ */
+/* $NetBSD: frame.h,v 1.24 2012/07/31 06:56:57 matt Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -315,7 +315,7 @@ LOCK_CAS_DEBUG_LOCALS
stmia sp, {r0-r12}; /* Push the user mode registers */ \
add r0, sp, #(4*13); /* Adjust the stack pointer */ \
stmia r0, {r13-r14}^; /* Push the user mode registers */ \
-mov r0, r0; /* NOP for previous instruction */ \
+ mov r0, r0; /* NOP for previous instruction */ \
mrs r0, spsr_all; /* Put the SPSR on the stack */ \
str r0, [sp, #-4]!
@@ -325,10 +325,10 @@ LOCK_CAS_DEBUG_LOCALS
*/
#define PULLFRAME \
-ldr r0, [sp], #0x0004; /* Get the SPSR from stack */ \
-msr spsr_all, r0; \
-ldmia sp, {r0-r14}^; /* Restore registers (usr mode) */ \
-mov r0, r0; /* NOP for previous instruction */ \
+ ldr r0, [sp], #0x0004; /* Get the SPSR from stack */ \
+ msr spsr_all, r0; \
+ ldmia sp, {r0-r14}^; /* Restore registers (usr mode) */ \
+ mov r0, r0; /* NOP for previous instruction */ \
add sp, sp, #(4*17); /* Adjust the stack pointer */ \
ldr lr, [sp], #0x0004 /* Pull the return address */
@@ -362,7 +362,7 @@ LOCK_CAS_DEBUG_LOCALS
stmia sp, {r0-r12}; /* Push the user mode registers */ \
add r0, sp, #(4*13); /* Adjust the stack pointer */ \
stmia r0, {r13-r14}^; /* Push the user mode registers */ \
-mov r0, r0; /* NOP for previous instruction */ \
+ mov r0, r0; /* NOP for previous instruction */ \
mrs r0, spsr_all; /* Put the SPSR on the stack */ \
str r0, [sp, #-4]!
@@ -374,10 +374,10 @@ LOCK_CAS_DEBUG_LOCALS
*/
#define PULLFRAMEFROMSVCANDEXIT \
-ldr r0, [sp], #0x0004; /* Get the SPSR from stack */ \
-msr spsr_all, r0; /* restore SPSR */ \
-ldmia sp, {r0-r14}^; /* Restore registers (usr mode) */ \
-mov r0, r0; /* NOP for previous instruction */ \
+ ldr r0, [sp], #0x0004; /* Get the SPSR from stack */ \
+ msr spsr_all, r0; /* restore SPSR */ \
+ ldmia sp, {r0-r14}^; /* Restore registers (usr mode) */ \
+ mov r0, r0; /* NOP for previous instruction */ \
add sp, sp, #(4*15); /* Adjust the stack pointer */ \
ldmia sp, {sp, lr, pc}^ /* Restore lr and exit */
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Tue Jul 31 07:21:06 UTC 2012 Modified Files: src/sys/arch/arm/include: cdefs.h Log Message: If we are using EABI (aapcs-linux), then ALIGNBYTES needs to deal with 8-byte long types. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/cdefs.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/arm/include/cdefs.h diff -u src/sys/arch/arm/include/cdefs.h:1.5 src/sys/arch/arm/include/cdefs.h:1.6 --- src/sys/arch/arm/include/cdefs.h:1.5 Thu Jul 12 21:29:04 2012 +++ src/sys/arch/arm/include/cdefs.h Tue Jul 31 07:21:06 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.5 2012/07/12 21:29:04 matt Exp $ */ +/* $NetBSD: cdefs.h,v 1.6 2012/07/31 07:21:06 matt Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ @@ -26,6 +26,10 @@ #define _ARM_ARCH_4T #endif +#ifdef __ARM_EABI__ +#define __ALIGNBYTES (8 - 1) +#else #define __ALIGNBYTES (sizeof(int) - 1) +#endif #endif /* !_MACHINE_CDEFS_H_ */
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Tue Jul 31 07:23:16 UTC 2012
Modified Files:
src/sys/arch/arm/include: frame.h
src/sys/arch/arm/include/arm32: frame.h
Log Message:
Make trapframe/irqframe an even number of words (make adjustments for
the filler word).
Improve the comments in PUSH/PULL macros.
Use the armv6+ CPS instruction if we can.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/frame.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/arm32/frame.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/arm/include/frame.h
diff -u src/sys/arch/arm/include/frame.h:1.13 src/sys/arch/arm/include/frame.h:1.14
--- src/sys/arch/arm/include/frame.h:1.13 Sun Feb 19 21:06:05 2012
+++ src/sys/arch/arm/include/frame.h Tue Jul 31 07:23:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.13 2012/02/19 21:06:05 rmind Exp $ */
+/* $NetBSD: frame.h,v 1.14 2012/07/31 07:23:16 matt Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -67,6 +67,7 @@ typedef struct trapframe {
register_t tf_r12;
register_t tf_usr_sp;
register_t tf_usr_lr;
+ register_t tf_fill;
register_t tf_svc_sp; /* Not used on arm26 */
register_t tf_svc_lr; /* Not used on arm26 */
register_t tf_pc;
Index: src/sys/arch/arm/include/arm32/frame.h
diff -u src/sys/arch/arm/include/arm32/frame.h:1.24 src/sys/arch/arm/include/arm32/frame.h:1.25
--- src/sys/arch/arm/include/arm32/frame.h:1.24 Tue Jul 31 06:56:57 2012
+++ src/sys/arch/arm/include/arm32/frame.h Tue Jul 31 07:23:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.24 2012/07/31 06:56:57 matt Exp $ */
+/* $NetBSD: frame.h,v 1.25 2012/07/31 07:23:16 matt Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -71,6 +71,7 @@ typedef struct irqframe {
unsigned int if_r12;
unsigned int if_usr_sp;
unsigned int if_usr_lr;
+ unsigned int if_fill;
unsigned int if_svc_sp;
unsigned int if_svc_lr;
unsigned int if_pc;
@@ -311,13 +312,13 @@ LOCK_CAS_DEBUG_LOCALS
#define PUSHFRAME \
str lr, [sp, #-4]!; /* Push the return address */ \
- sub sp, sp, #(4*17); /* Adjust the stack pointer */ \
+ sub sp, sp, #(4*18); /* Adjust the stack pointer */ \
stmia sp, {r0-r12}; /* Push the user mode registers */ \
add r0, sp, #(4*13); /* Adjust the stack pointer */ \
stmia r0, {r13-r14}^; /* Push the user mode registers */ \
mov r0, r0; /* NOP for previous instruction */ \
- mrs r0, spsr_all; /* Put the SPSR on the stack */ \
- str r0, [sp, #-4]!
+ mrs r0, spsr_all; /* Get the SPSR */ \
+ str r0, [sp, #-4]! /* Push the SPSR on the stack */
/*
* PULLFRAME - macro to pull a trap frame from the stack in the current mode
@@ -325,12 +326,12 @@ LOCK_CAS_DEBUG_LOCALS
*/
#define PULLFRAME \
- ldr r0, [sp], #0x0004; /* Get the SPSR from stack */ \
+ ldr r0, [sp], #0x0004; /* Pop the SPSR from stack */ \
msr spsr_all, r0; \
ldmia sp, {r0-r14}^; /* Restore registers (usr mode) */ \
mov r0, r0; /* NOP for previous instruction */ \
- add sp, sp, #(4*17); /* Adjust the stack pointer */ \
- ldr lr, [sp], #0x0004 /* Pull the return address */
+ add sp, sp, #(4*18); /* Adjust the stack pointer */ \
+ ldr lr, [sp], #0x0004 /* Pop the return address */
/*
* PUSHFRAMEINSVC - macro to push a trap frame on the stack in SVC32 mode
@@ -343,19 +344,28 @@ LOCK_CAS_DEBUG_LOCALS
* SA110 rev 2 STM^ bug
*/
+#ifdef _ARM_ARCH_6
+#define SET_CPSR_MODE(tmp, mode) \
+ cps #(mode)
+#else
+#define SET_CPSR_MODE(tmp, mode) \
+ mrs tmp, cpsr; /* Get the CPSR */ \
+ bic tmp, tmp, #(PSR_MODE); /* Fix for SVC mode */ \
+ orr tmp, tmp, #(mode); \
+ msr cpsr_c, tmp /* Punch into SVC mode */
+#endif
+
#define PUSHFRAMEINSVC \
stmdb sp, {r0-r3}; /* Save 4 registers */ \
mov r0, lr; /* Save xxx32 r14 */ \
mov r1, sp; /* Save xxx32 sp */ \
mrs r3, spsr; /* Save xxx32 spsr */ \
- mrs r2, cpsr; /* Get the CPSR */ \
- bic r2, r2, #(PSR_MODE); /* Fix for SVC mode */ \
- orr r2, r2, #(PSR_SVC32_MODE); \
- msr cpsr_c, r2; /* Punch into SVC mode */ \
+ SET_CPSR_MODE(r2, PSR_SVC32_MODE); \
mov r2, sp; /* Save SVC sp */ \
str r0, [sp, #-4]!; /* Push return address */ \
str lr, [sp, #-4]!; /* Push SVC lr */ \
str r2, [sp, #-4]!; /* Push SVC sp */ \
+ sub sp, sp, #4; /* Keep stack aligned */ \
msr spsr_all, r3; /* Restore correct spsr */ \
ldmdb r1, {r0-r3}; /* Restore 4 regs from xxx mode */ \
sub sp, sp, #(4*15); /* Adjust the stack pointer */ \
@@ -363,8 +373,8 @@ LOCK_CAS_DEBUG_LOCALS
add r0, sp, #(4*13); /* Adjust the stack pointer */ \
stmia r0, {r13-r14}^; /* Push the user mode registers */ \
mov r0, r0; /*
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Tue Jul 31 07:39:57 UTC 2012 Modified Files: src/sys/arch/arm/include: armreg.h Log Message: Add MON32 mode (just for completeness). To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/arm/include/armreg.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/arm/include/armreg.h diff -u src/sys/arch/arm/include/armreg.h:1.56 src/sys/arch/arm/include/armreg.h:1.57 --- src/sys/arch/arm/include/armreg.h:1.56 Mon Jul 23 15:51:48 2012 +++ src/sys/arch/arm/include/armreg.h Tue Jul 31 07:39:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.56 2012/07/23 15:51:48 skrll Exp $ */ +/* $NetBSD: armreg.h,v 1.57 2012/07/31 07:39:56 matt Exp $ */ /* * Copyright (c) 1998, 2001 Ben Harris @@ -75,6 +75,7 @@ #define PSR_FIQ32_MODE 0x0011 #define PSR_IRQ32_MODE 0x0012 #define PSR_SVC32_MODE 0x0013 +#define PSR_MON32_MODE 0x0016 #define PSR_ABT32_MODE 0x0017 #define PSR_UND32_MODE 0x001b #define PSR_SYS32_MODE 0x001f
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: wen
Date: Tue Jul 31 07:49:46 UTC 2012
Modified Files:
src/distrib/notes/common: main
Log Message:
Added myself to the list of NetBSD Developers.
To generate a diff of this commit:
cvs rdiff -u -r1.487 -r1.488 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.487 src/distrib/notes/common/main:1.488
--- src/distrib/notes/common/main:1.487 Tue Apr 17 14:11:59 2012
+++ src/distrib/notes/common/main Tue Jul 31 07:49:45 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.487 2012/04/17 14:11:59 khorben Exp $
+.\ $NetBSD: main,v 1.488 2012/07/31 07:49:45 wen Exp $
.\
.\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -1181,6 +1181,7 @@ If you're one of them, and would like to
.It Ta John Heasley Ta Mt h...@netbsd.org
.It Ta Lars Heidieker Ta Mt p...@netbsd.org
.It Ta Geert Hendrickx Ta Mt g...@netbsd.org
+.It Ta Wen Heping Ta Mt w...@netbsd.org
.It Ta Ren\('e Hexel Ta Mt r...@netbsd.org
.It Ta Iain Hibbert Ta Mt plu...@netbsd.org
.It Ta Kouichirou Hiratsuka Ta Mt h...@netbsd.org
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src
Committed By: matt
Date: Tue Jul 31 08:01:30 UTC 2012
Modified Files:
src/sys/arch/arm/include/arm32: frame.h
Log Message:
Only do the SA110 user register save workaround on kernel using SA110s.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/include/arm32/frame.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/arm/include/arm32/frame.h
diff -u src/sys/arch/arm/include/arm32/frame.h:1.25 src/sys/arch/arm/include/arm32/frame.h:1.26
--- src/sys/arch/arm/include/arm32/frame.h:1.25 Tue Jul 31 07:23:16 2012
+++ src/sys/arch/arm/include/arm32/frame.h Tue Jul 31 08:01:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.25 2012/07/31 07:23:16 matt Exp $ */
+/* $NetBSD: frame.h,v 1.26 2012/07/31 08:01:30 matt Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -117,6 +117,7 @@ void validate_trapframe(trapframe_t *, i
#include opt_multiprocessor.h
#include opt_cpuoptions.h
#include opt_arm_debug.h
+#include opt_cputypes.h
#include machine/cpu.h
@@ -305,17 +306,26 @@ LOCK_CAS_DEBUG_LOCALS
/*
* PUSHFRAME - macro to push a trap frame on the stack in the current mode
* Since the current mode is used, the SVC lr field is not defined.
- *
+ */
+
+#ifdef CPU_SA110
+/*
* NOTE: r13 and r14 are stored separately as a work around for the
* SA110 rev 2 STM^ bug
*/
+#define PUSHUSERREGS \
+ stmia sp, {r0-r12}; /* Push the user mode registers */ \
+ add r0, sp, #(4*13); /* Adjust the stack pointer */ \
+ stmia r0, {r13-r14}^ /* Push the user mode registers */
+#else
+#define PUSHUSERREGS \
+ stmia sp, {r0-r14}^ /* Push the user mode registers */
+#endif
#define PUSHFRAME \
str lr, [sp, #-4]!; /* Push the return address */ \
sub sp, sp, #(4*18); /* Adjust the stack pointer */ \
- stmia sp, {r0-r12}; /* Push the user mode registers */ \
- add r0, sp, #(4*13); /* Adjust the stack pointer */ \
- stmia r0, {r13-r14}^; /* Push the user mode registers */ \
+ PUSHUSERREGS; /* Push the user mode registers */ \
mov r0, r0; /* NOP for previous instruction */ \
mrs r0, spsr_all; /* Get the SPSR */ \
str r0, [sp, #-4]! /* Push the SPSR on the stack */
@@ -369,9 +379,7 @@ LOCK_CAS_DEBUG_LOCALS
msr spsr_all, r3; /* Restore correct spsr */ \
ldmdb r1, {r0-r3}; /* Restore 4 regs from xxx mode */ \
sub sp, sp, #(4*15); /* Adjust the stack pointer */ \
- stmia sp, {r0-r12}; /* Push the user mode registers */ \
- add r0, sp, #(4*13); /* Adjust the stack pointer */ \
- stmia r0, {r13-r14}^; /* Push the user mode registers */ \
+ PUSHUSERREGS; /* Push the user mode registers */ \
mov r0, r0; /* NOP for previous instruction */ \
mrs r0, spsr_all; /* Get the SPSR */ \
str r0, [sp, #-4]! /* Push the SPSR onto the stack */
CVS commit: [netbsd-6] src/lib/libc/arch/arm/gen
Module Name:src Committed By: martin Date: Tue Jul 31 08:13:09 UTC 2012 Modified Files: src/lib/libc/arch/arm/gen [netbsd-6]: Makefile.inc Log Message: Backout #416 (requested by skrll in ticket #416): lib/libc/arch/arm/gen/Makefile.inc: revision 1.18 Backout previous (pulled up via #416) - it causes major regressions and needs more thought. To generate a diff of this commit: cvs rdiff -u -r1.16.8.1 -r1.16.8.2 src/lib/libc/arch/arm/gen/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/arm/gen/Makefile.inc diff -u src/lib/libc/arch/arm/gen/Makefile.inc:1.16.8.1 src/lib/libc/arch/arm/gen/Makefile.inc:1.16.8.2 --- src/lib/libc/arch/arm/gen/Makefile.inc:1.16.8.1 Mon Jul 16 22:03:06 2012 +++ src/lib/libc/arch/arm/gen/Makefile.inc Tue Jul 31 08:13:09 2012 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.16.8.1 2012/07/16 22:03:06 riz Exp $ +# $NetBSD: Makefile.inc,v 1.16.8.2 2012/07/31 08:13:09 martin Exp $ -SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c \ +SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c divsi3.S \ fabs.c flt_rounds.c # Common ieee754 constants and functions
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 08:14:32 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Remove note for #416, it has been backed out To generate a diff of this commit: cvs rdiff -u -r1.1.2.165 -r1.1.2.166 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.165 src/doc/CHANGES-6.0:1.1.2.166 --- src/doc/CHANGES-6.0:1.1.2.165 Mon Jul 30 08:39:04 2012 +++ src/doc/CHANGES-6.0 Tue Jul 31 08:14:32 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.165 2012/07/30 08:39:04 martin Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.166 2012/07/31 08:14:32 martin Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6315,10 +6315,6 @@ xsrc/external/mit/xorg-server/dist/hw/xf Fix colors on suncg6. [macallan, ticket #415] -lib/libc/arch/arm/gen/Makefile.inc 1.17 - - Fix ARM static binaries. - [reinoud, ticket #416] sys/dev/ldvar.h 1.21
CVS commit: [netbsd-6] src/sys/arch/luna68k/luna68k
Module Name:src
Committed By: martin
Date: Tue Jul 31 08:22:06 UTC 2012
Modified Files:
src/sys/arch/luna68k/luna68k [netbsd-6]: locore.s machdep.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #453):
sys/arch/luna68k/luna68k/machdep.c: revision 1.91
sys/arch/luna68k/luna68k/locore.s: revision 1.49
Handle bootarg strings passed from firmware prompt properly on LUNA-II.
LUNA-II seems to use a different vector from LUNA to pass bootargs.
Now we can specify RB_ASKNAME and RB_SINGLE at boot on LUNA-II.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.47.2.1 -r1.47.2.2 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/arch/luna68k/luna68k/machdep.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/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.47.2.1 src/sys/arch/luna68k/luna68k/locore.s:1.47.2.2
--- src/sys/arch/luna68k/luna68k/locore.s:1.47.2.1 Wed Jul 25 21:30:35 2012
+++ src/sys/arch/luna68k/luna68k/locore.s Tue Jul 31 08:22:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.47.2.1 2012/07/25 21:30:35 martin Exp $ */
+/* $NetBSD: locore.s,v 1.47.2.2 2012/07/31 08:22:06 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -136,13 +136,6 @@ ASENTRY_NOPROFILE(start)
RELOC(hwplanemask,%a0)
movl %d5,%a0@ | save hwplanemask
- movl #0x4100,%a0 | argument of 'x' command on boot
- movl %a0@(212),%a0 | (char *)base[53]
- RELOC(bootarg,%a1)
- movl #63,%d0
-1: movb %a0@+,%a1@+ | copy to bootarg
- dbra %d0,1b | upto 63 characters
-
movl #CACHE_OFF,%d0
movc %d0,%cacr | clear and disable on-chip cache(s)
@@ -169,6 +162,23 @@ Lstart0:
movl %d2,%a0@
/*
+ * save argument of 'x' command on boot per machine type
+ * XXX: assume CPU_68040 is LUNA-II
+ */
+ movl #0x4100,%a0
+ cmpl #CPU_68040,%d0 | 68040?
+ jne 1f | no, assume 68030 LUNA
+ movl %a0@(8),%a0 | arg at (char *)base[2] on LUNA-II
+ jra Lstart1
+1:
+ movl %a0@(212),%a0 | arg at (char *)base[53] on LUNA
+Lstart1:
+ RELOC(bootarg,%a1)
+ movl #63,%d0
+1: movb %a0@+,%a1@+ | copy to bootarg
+ dbra %d0,1b | upto 63 characters
+
+ /*
* Now that we know what CPU we have, initialize the address error
* and bus error handlers in the vector table:
*
Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.89 src/sys/arch/luna68k/luna68k/machdep.c:1.89.2.1
--- src/sys/arch/luna68k/luna68k/machdep.c:1.89 Mon Dec 12 19:03:10 2011
+++ src/sys/arch/luna68k/luna68k/machdep.c Tue Jul 31 08:22:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.89 2011/12/12 19:03:10 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.89.2.1 2012/07/31 08:22:06 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.89 2011/12/12 19:03:10 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.89.2.1 2012/07/31 08:22:06 martin Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -188,15 +188,17 @@ luna68k_init(void)
boothowto = 0;
i = 0;
/*
- * 'bootarg' has;
+ * 'bootarg' on LUNA has:
* args of x command ENADDR=addr HOST=host SERVER=name
* where addr is MAC address of which network loader used (not
* necessarily same as one at 0x4101.FFE0), host and name
- * are the values of HOST and SERVER environment variables,
+ * are the values of HOST and SERVER environment variables.
+ *
+ * 'bootarg' on LUNA-II has args of x command only.
*
* NetBSD/luna68k cares only the first argment; any of sda.
*/
- for (cp = bootarg; *cp != ' '; cp++) {
+ for (cp = bootarg; *cp != ' ' *cp != 0; cp++) {
BOOT_FLAG(*cp, boothowto);
if (i++ = sizeof(bootarg))
break;
CVS commit: [netbsd-6] src
Module Name:src Committed By: martin Date: Tue Jul 31 08:48:10 UTC 2012 Modified Files: src/doc [netbsd-6]: 3RDPARTY src/share/zoneinfo [netbsd-6]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Pullup the import tzdata2012d from ftp://ftp.iana.org/tz/releases/tzdata2012d.tar.gz Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. [#455, via patch, requested by apb] To generate a diff of this commit: cvs rdiff -u -r1.909.2.8 -r1.909.2.9 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30 -r1.1.1.30.4.1 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.2 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.1 -r1.1.1.50.4.2 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.1 -r1.23.4.2 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.24 -r1.1.1.24.4.1 src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.8 -r1.1.1.8.4.1 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.44.4.1 -r1.1.1.44.4.2 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.4 -r1.1.1.4.8.1 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.19 -r1.1.1.19.4.1 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.18.4.1 -r1.1.1.18.4.2 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.49.4.2 -r1.1.1.49.4.3 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.46.4.1 -r1.1.1.46.4.2 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.5 -r1.1.1.5.8.1 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.42.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.39.4.2 -r1.1.1.39.4.3 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.8 src/doc/3RDPARTY:1.909.2.9 --- src/doc/3RDPARTY:1.909.2.8 Wed Jun 13 19:28:55 2012 +++ src/doc/3RDPARTY Tue Jul 31 08:48:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.8 2012/06/13 19:28:55 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.9 2012/07/31 08:48:09 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1144,7 +1144,7 @@ Added changes from a5 - a12 manually. Package: tz Version: tzcode2012b / tzdata2012b -Current Vers: tzcode2011i / tzdata2012b +Current Vers: tzcode2012c / tzdata2012d Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://elsie.nci.nih.gov/pub/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.30 src/share/zoneinfo/africa:1.1.1.30.4.1 --- src/share/zoneinfo/africa:1.1.1.30 Mon Oct 10 19:14:52 2011 +++ src/share/zoneinfo/africa Tue Jul 31 08:48:09 2012 @@ -1,5 +1,4 @@ # pre -# @(#)africa 8.33 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -238,7 +237,7 @@ Rule Egypt 2006 only - Sep 21 23:00s 0 - # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. # From Jesper Norgaard Welen (2007-08-15): [The following agree:] -# http://www.nentjes.info/Bill/bill5.htm +# http://www.nentjes.info/Bill/bill5.htm # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm @@ -292,18 +291,18 @@ Rule Egypt 2007 only - Sep Thu=1 23:00s # in September. # From Steffen Thorsen (2009-08-11): -# We have been able to confirm the August change with the Egyptian Cabinet +# We have been able to confirm the August change with the Egyptian Cabinet # Information and Decision Support Center: # a href=http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html; # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html # /a -# +# # The Middle East News Agency # a href=http://www.mena.org.eg/index.aspx; # http://www.mena.org.eg/index.aspx # /a # also reports Egypt starts winter time on August 21 -# today in article numbered 71, 11/08/2009 12:25 GMT. +# today in article numbered 71, 11/08/2009 12:25 GMT. # Only the title above
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 09:12:32 UTC 2012 Modified Files: src/doc [netbsd-6]: 3RDPARTY Log Message: Fix previous To generate a diff of this commit: cvs rdiff -u -r1.909.2.9 -r1.909.2.10 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.909.2.9 src/doc/3RDPARTY:1.909.2.10 --- src/doc/3RDPARTY:1.909.2.9 Tue Jul 31 08:48:09 2012 +++ src/doc/3RDPARTY Tue Jul 31 09:12:31 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.909.2.9 2012/07/31 08:48:09 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.909.2.10 2012/07/31 09:12:31 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1143,7 +1143,7 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2012b / tzdata2012b +Version: tzcode2011i / tzdata2012d Current Vers: tzcode2012c / tzdata2012d Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Tue Jul 31 09:23:10 UTC 2012
Modified Files:
src/etc: daily
Log Message:
PR/46757: Check for fetch_pkg_vulnerabilities unset first.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/etc/daily
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.84 src/etc/daily:1.85
--- src/etc/daily:1.84 Mon Jul 30 18:13:38 2012
+++ src/etc/daily Tue Jul 31 05:23:09 2012
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.84 2012/07/30 22:13:38 jdf Exp $
+# $NetBSD: daily,v 1.85 2012/07/31 09:23:09 christos Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -246,8 +246,8 @@ if checkyesno run_fsck; then
fsck -n -f ${run_fsck_flags} | grep -v '^\*\* Phase'
fi
-echo
if checkyesno run_rdist [ -f /etc/Distfile ]; then
+ echo
echo Running rdist:
if [ -d /var/log/rdist ]; then
logf=$(date +%Y.%b.%d)
@@ -260,13 +260,13 @@ fi
if pkg_info ${_compat_K_flag} -q -E '*'; then
echo
echo Fetching package vulnerabilities database:
- if checkyesno fetch_pkg_vulnerabilities; then
- ( umask 022 pkg_admin ${_compat_K_flag} \
- fetch-pkg-vulnerabilities -u )
- elif [ -z $fetch_pkg_vulnerabilities ]; then
+ if [ -z fetch_pkg_vulnerabilities ]; then
echo fetch_pkg_vulnerabilities is not set in daily.conf(5).
echo You should set it to YES to enable vulnerability checks
echo or set it to NO to get rid of this warning.
+ elif checkyesno fetch_pkg_vulnerabilities; then
+ ( umask 022 pkg_admin ${_compat_K_flag} \
+ fetch-pkg-vulnerabilities -u )
fi
fi
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 09:27:27 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets #453 and #455 To generate a diff of this commit: cvs rdiff -u -r1.1.2.166 -r1.1.2.167 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.166 src/doc/CHANGES-6.0:1.1.2.167 --- src/doc/CHANGES-6.0:1.1.2.166 Tue Jul 31 08:14:32 2012 +++ src/doc/CHANGES-6.0 Tue Jul 31 09:27:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.166 2012/07/31 08:14:32 martin Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.167 2012/07/31 09:27:27 martin Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6640,3 +6640,55 @@ sys/arch/dreamcast/dev/gdrom.c 1.35 - Add #ifdef GDROMDEBUGTOC for dumping out the gdrom TOC values [abs, ticket #451] +sys/arch/luna68k/luna68k/locore.s 1.49 +sys/arch/luna68k/luna68k/machdep.c 1.91 + + Handle bootarg strings passed from firmware prompt properly on LUNA-II. + LUNA-II seems to use a different vector from LUNA to pass bootargs. + + Now we can specify RB_ASKNAME and RB_SINGLE at boot on LUNA-II. + [tsutsui, ticket #453] + +doc/3RDPARTY:1.951 +share/zoneinfo/Makefile: 1.43 +share/zoneinfo/africa: 1.1.1.31 +share/zoneinfo/antarctica: 1.1.1.21 +share/zoneinfo/asia: 1.1.1.52 +share/zoneinfo/australasia: 1.25 +share/zoneinfo/backward: 1.1.1.25 +share/zoneinfo/etcetera: 1.1.1.9 +share/zoneinfo/europe: 1.1.1.46 +share/zoneinfo/factory: 1.1.1.5 +share/zoneinfo/iso3166.tab: 1.1.1.20 +share/zoneinfo/leapseconds: 1.1.1.20 +share/zoneinfo/northamerica: 1.1.1.52 +share/zoneinfo/pacificnew: 1.1.1.5 +share/zoneinfo/solar87: 1.1.1.5 +share/zoneinfo/solar88: 1.1.1.5 +share/zoneinfo/solar89: 1.1.1.5 +share/zoneinfo/southamerica: 1.1.1.48 +share/zoneinfo/systemv: 1.1.1.6 +share/zoneinfo/yearistype.sh: 1.7 +share/zoneinfo/zone.tab: 1.1.1.42 + + Import tzdata2012d from ftp://ftp.iana.org/tz/releases/tzdata2012d.tar.gz + + Major changes from tzdata2011b to tzdata2011c: + africa + Summer time changes for Morocco (to start late April 2012) + + asia + Changes for 2012 for Gaza the West Bank (Hebron) and Syria + + northamerica + Haiti following US/Canada rules for 2012 (and we're assuming, + for now anyway, for the future). + + Major changes from tzdata2011c to tzdata2011d: + + Morocco does not observe DST from Jul 20 03:00 to + Aug 20 02:00 [2012]. + + Infrastructure changes to accommodate how the tz + code and data are released on IANA. + [apb, ticket #455]
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64
Module Name:src
Committed By: christos
Date: Tue Jul 31 10:33:45 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile
crypto.inc ghash-sparcv9.S
Log Message:
- -m64 is needed for ghash
- add montgomery multiplication assembly
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile:1.2 Sun Jun 5 19:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile Tue Jul 31 06:33:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/05 23:09:50 spz Exp $
+# $NetBSD: Makefile,v 1.3 2012/07/31 10:33:45 christos Exp $
.include bsd.own.mk
@@ -9,7 +9,8 @@ regen:
for i in $$(find ${OPENSSLSRC} -name \*sparcv9\*.pl); do \
j=$$(basename $$i .pl).S; \
case $$j in \
- sha*) perl $$i $$j;; \
+ ghash*|sha*) perl $$i $$j;; \
*) perl $$i -m64 $$j;; \
esac; \
done
+foo:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.2 Mon Jul 30 09:53:19 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Tue Jul 31 06:33:45 2012
@@ -1,3 +1,3 @@
-CPUID_SRCS = sparcv9cap.c sparccpuid.S
+CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
CPUID = yes
.include ../../crypto.inc
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S:1.1 Thu Jul 26 15:58:41 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S Tue Jul 31 06:33:45 2012
@@ -0,0 +1,250 @@
+.section .text,#alloc,#execinstr
+
+.align 64
+rem_4bit:
+ .long 0,0,471859200,0,943718400,0,610271232,0
+ .long 1887436800,0,1822425088,0,1220542464,0,1423966208,0
+ .long 3774873600,0,4246732800,0,3644850176,0,3311403008,0
+ .long 2441084928,0,2376073216,0,2847932416,0,3051356160,0
+.type rem_4bit,#object
+.size rem_4bit,(.-rem_4bit)
+
+.globl gcm_ghash_4bit
+.align 32
+gcm_ghash_4bit:
+ save %sp,-112,%sp
+ ldub [%i2+15],%l1
+ ldub [%i0+15],%l2
+ ldub [%i0+14],%l3
+ add %i3,%i2,%i3
+ add %i1,8,%l6
+
+1: call .+8
+ add %o7,rem_4bit-1b,%l4
+
+.Louter:
+ xor %l2,%l1,%l1
+ and %l1,0xf0,%l0
+ and %l1,0x0f,%l1
+ sll %l1,4,%l1
+ ldx [%l6+%l1],%o1
+ ldx [%i1+%l1],%o0
+
+ ldub [%i2+14],%l1
+
+ ldx [%l6+%l0],%o3
+ and %o1,0xf,%l5
+ ldx [%i1+%l0],%o2
+ sll %l5,3,%l5
+ ldx [%l4+%l5],%o4
+ srlx %o1,4,%o1
+ mov 13,%l7
+ sllx %o0,60,%o5
+ xor %o3,%o1,%o1
+ srlx %o0,4,%o0
+ xor %o1,%o5,%o1
+
+ xor %l3,%l1,%l1
+ and %o1,0xf,%l5
+ and %l1,0xf0,%l0
+ and %l1,0x0f,%l1
+ ba .Lghash_inner
+ sll %l1,4,%l1
+.align 32
+.Lghash_inner:
+ ldx [%l6+%l1],%o3
+ sll %l5,3,%l5
+ xor %o2,%o0,%o0
+ ldx [%i1+%l1],%o2
+ srlx %o1,4,%o1
+ xor %o4,%o0,%o0
+ ldx [%l4+%l5],%o4
+ sllx %o0,60,%o5
+ xor %o3,%o1,%o1
+ ldub [%i2+%l7],%l1
+ srlx %o0,4,%o0
+ xor %o1,%o5,%o1
+ ldub [%i0+%l7],%l3
+ xor %o2,%o0,%o0
+ and %o1,0xf,%l5
+
+ ldx [%l6+%l0],%o3
+ sll %l5,3,%l5
+ xor %o4,%o0,%o0
+ ldx [%i1+%l0],%o2
+ srlx %o1,4,%o1
+ ldx [%l4+%l5],%o4
+ sllx %o0,60,%o5
+ xor %l3,%l1,%l1
+ srlx %o0,4,%o0
+ and %l1,0xf0,%l0
+ addcc %l7,-1,%l7
+ xor %o1,%o5,%o1
+ and %l1,0x0f,%l1
+ xor %o3,%o1,%o1
+ sll %l1,4,%l1
+ blu .Lghash_inner
+ and %o1,0xf,%l5
+
+ ldx [%l6+%l1],%o3
+ sll %l5,3,%l5
+ xor %o2,%o0,%o0
+ ldx [%i1+%l1],%o2
+ srlx %o1,4,%o1
+ xor %o4,%o0,%o0
+ ldx [%l4+%l5],%o4
+ sllx %o0,60,%o5
+ xor %o3,%o1,%o1
+ srlx %o0,4,%o0
+ xor %o1,%o5,%o1
+ xor %o2,%o0,%o0
+
+ add %i2,16,%i2
+ cmp %i2,%i3
+ be,pn %icc,.Ldone
+ and %o1,0xf,%l5
+
+ ldx [%l6+%l0],%o3
+ sll %l5,3,%l5
+ xor %o4,%o0,%o0
+ ldx [%i1+%l0],%o2
+ srlx %o1,4,%o1
+ ldx [%l4+%l5],%o4
+ sllx %o0,60,%o5
+ xor %o3,%o1,%o1
+ ldub [%i2+15],%l1
+ srlx %o0,4,%o0
+ xor %o1,%o5,%o1
+ xor %o2,%o0,%o0
+ stx %o1,[%i0+8]
+ xor %o4,%o0,%o0
+ stx %o0,[%i0]
+ srl %o1,8,%l3
+ and %o1,0xff,%l2
+ ba .Louter
+ and %l3,0xff,%l3
+.align 32
+.Ldone:
+ ldx [%l6+%l0],%o3
+ sll %l5,3,%l5
+ xor %o4,%o0,%o0
+ ldx
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64
Module Name:src
Committed By: christos
Date: Tue Jul 31 11:08:35 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
Log Message:
add this directory to the search path
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.3 Tue Jul 31 06:33:45 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Tue Jul 31 07:08:34 2012
@@ -1,3 +1,4 @@
+.PATH.S: ${.PARSEDIR}
CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
CPUID = yes
.include ../../crypto.inc
CVS commit: src/etc
Module Name:src Committed By: jdf Date: Tue Jul 31 12:11:50 UTC 2012 Modified Files: src/etc: weekly Log Message: Call `makemandb -f -q` instead of `makemandb -f`, as Edgar Fu� proposed for daily. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/weekly Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/weekly diff -u src/etc/weekly:1.27 src/etc/weekly:1.28 --- src/etc/weekly:1.27 Sat Jun 2 15:52:24 2012 +++ src/etc/weekly Tue Jul 31 12:11:50 2012 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: weekly,v 1.27 2012/06/02 15:52:24 christos Exp $ +# $NetBSD: weekly,v 1.28 2012/07/31 12:11:50 jdf Exp $ # from: @(#)weekly 8.2 (Berkeley) 1/2/94 # @@ -94,7 +94,7 @@ if checkyesno rebuild_mandb; then echo if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then echo Rebuilding man page index: - (umask 022; nice -n 5 /usr/sbin/makemandb -f) + (umask 022; nice -n 5 /usr/sbin/makemandb -f -q) else echo Not rebuilding man page index fi
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: martin
Date: Tue Jul 31 13:35:48 UTC 2012
Modified Files:
src/sys/arch/sparc64/dev: consinit.c
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
Set up cn_tab in bootstrap() instead of initializing it statically.
Fixes -Wno-common fallout, idea from tsutsui.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc64/dev/consinit.c
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/sparc64/sparc64/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/consinit.c
diff -u src/sys/arch/sparc64/dev/consinit.c:1.25 src/sys/arch/sparc64/dev/consinit.c:1.26
--- src/sys/arch/sparc64/dev/consinit.c:1.25 Wed Mar 18 10:22:36 2009
+++ src/sys/arch/sparc64/dev/consinit.c Tue Jul 31 13:35:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.25 2009/03/18 10:22:36 cegger Exp $ */
+/* $NetBSD: consinit.c,v 1.26 2012/07/31 13:35:48 martin Exp $ */
/*-
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.25 2009/03/18 10:22:36 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.26 2012/07/31 13:35:48 martin Exp $);
#include opt_ddb.h
#include pcons.h
@@ -81,13 +81,6 @@ struct consdev consdev_prom = {
.cn_pollc = prom_cnpollc,
};
-/*
- * The console table pointer is statically initialized
- * to point to the PROM (output only) table, so that
- * early calls to printf will work.
- */
-struct consdev *cn_tab = consdev_prom;
-
void
prom_cnprobe(struct consdev *cd)
{
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.188 src/sys/arch/sparc64/sparc64/autoconf.c:1.189
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.188 Sun Jul 29 18:05:46 2012
+++ src/sys/arch/sparc64/sparc64/autoconf.c Tue Jul 31 13:35:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.188 2012/07/29 18:05:46 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.189 2012/07/31 13:35:48 martin Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.188 2012/07/29 18:05:46 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.189 2012/07/31 13:35:48 martin Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -280,6 +280,7 @@ bootstrap(void *o0, void *bootargs, void
extern void* get_romtba(void);
extern void OF_val2sym32(void *);
extern void OF_sym2val32(void *);
+ extern struct consdev consdev_prom;
/* Save OpenFrimware entry point */
romp = ofw;
@@ -290,6 +291,7 @@ bootstrap(void *o0, void *bootargs, void
console_node = OF_instance_to_package(promops.po_stdout);
/* Initialize the PROM console so printf will not panic */
+ cn_tab = consdev_prom;
(*cn_tab-cn_init)(cn_tab);
DPRINTF(ACDB_BOOTARGS,
CVS commit: src/sbin/newfs_msdos
Module Name:src Committed By: jakllsch Date: Tue Jul 31 13:52:45 UTC 2012 Modified Files: src/sbin/newfs_msdos: newfs_msdos.c Log Message: Use correct values for minimum and maximum cluster counts for the various FAT types. These values come from a publically-avaliable document of an infallible source that must not be named due to a violation of the document's license restrictions. This is justified by interoperability concerns. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sbin/newfs_msdos/newfs_msdos.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_msdos/newfs_msdos.c diff -u src/sbin/newfs_msdos/newfs_msdos.c:1.37 src/sbin/newfs_msdos/newfs_msdos.c:1.38 --- src/sbin/newfs_msdos/newfs_msdos.c:1.37 Wed Jul 4 18:35:58 2012 +++ src/sbin/newfs_msdos/newfs_msdos.c Tue Jul 31 13:52:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: newfs_msdos.c,v 1.37 2012/07/04 18:35:58 jakllsch Exp $ */ +/* $NetBSD: newfs_msdos.c,v 1.38 2012/07/31 13:52:44 jakllsch Exp $ */ /* * Copyright (c) 1998 Robert Nordier @@ -33,7 +33,7 @@ static const char rcsid[] = $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $; #else -__RCSID($NetBSD: newfs_msdos.c,v 1.37 2012/07/04 18:35:58 jakllsch Exp $); +__RCSID($NetBSD: newfs_msdos.c,v 1.38 2012/07/31 13:52:44 jakllsch Exp $); #endif #endif /* not lint */ @@ -74,11 +74,11 @@ __RCSID($NetBSD: newfs_msdos.c,v 1.37 2 #define DEFRDE 512 /* default root directory entries */ #define RESFTE 2 /* reserved FAT entries */ #define MINCLS12 1 /* minimum FAT12 clusters */ -#define MINCLS16 0x1000 /* minimum FAT16 clusters */ -#define MINCLS32 2 /* minimum FAT32 clusters */ -#define MAXCLS12 0xfed /* maximum FAT12 clusters */ -#define MAXCLS16 0xfff5 /* maximum FAT16 clusters */ -#define MAXCLS32 0xff5 /* maximum FAT32 clusters */ +#define MINCLS16 0xff5 /* minimum FAT16 clusters */ +#define MINCLS32 0xfff5 /* minimum FAT32 clusters */ +#define MAXCLS12 0xff4 /* maximum FAT12 clusters */ +#define MAXCLS16 0xfff4 /* maximum FAT16 clusters */ +#define MAXCLS32 0xff4 /* maximum FAT32 clusters */ #define mincls(fat) ((fat) == 12 ? MINCLS12 : \ (fat) == 16 ? MINCLS16 : \
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: martin
Date: Tue Jul 31 14:23:34 UTC 2012
Modified Files:
src/sys/arch/sparc/sparc: autoconf.c machdep.c
Log Message:
Move cn_tab initialization to bootstrap()
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/sys/arch/sparc/sparc/autoconf.c
cvs rdiff -u -r1.322 -r1.323 src/sys/arch/sparc/sparc/machdep.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/sparc/sparc/autoconf.c
diff -u src/sys/arch/sparc/sparc/autoconf.c:1.244 src/sys/arch/sparc/sparc/autoconf.c:1.245
--- src/sys/arch/sparc/sparc/autoconf.c:1.244 Sun Jul 29 18:05:46 2012
+++ src/sys/arch/sparc/sparc/autoconf.c Tue Jul 31 14:23:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.244 2012/07/29 18:05:46 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.245 2012/07/31 14:23:33 martin Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.244 2012/07/29 18:05:46 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.245 2012/07/31 14:23:33 martin Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -266,6 +266,8 @@ void
bootstrap(void)
{
extern uint8_t u0[];
+ extern struct consdev consdev_prom;
+
#if NKSYMS || defined(DDB) || defined(MODULAR)
struct btinfo_symtab *bi_sym;
#else
@@ -273,6 +275,7 @@ bootstrap(void)
#endif
struct btinfo_boothowto *bi_howto;
+ cn_tab = consdev_prom;
prom_init();
/* Find the number of CPUs as early as possible */
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.322 src/sys/arch/sparc/sparc/machdep.c:1.323
--- src/sys/arch/sparc/sparc/machdep.c:1.322 Mon Jul 30 17:29:55 2012
+++ src/sys/arch/sparc/sparc/machdep.c Tue Jul 31 14:23:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.322 2012/07/30 17:29:55 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.323 2012/07/31 14:23:34 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.322 2012/07/30 17:29:55 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.323 2012/07/31 14:23:34 martin Exp $);
#include opt_compat_netbsd.h
#include opt_compat_sunos.h
@@ -152,8 +152,6 @@ struct extent *dvmamap24;
void dumpsys(void);
void stackdump(void);
-extern struct consdev *cn_tab, consdev_prom;
-
/*
* Machine-dependent startup code
*/
@@ -169,7 +167,6 @@ cpu_startup(void)
paddr_t pa;
char pbuf[9];
- cn_tab = consdev_prom;
#ifdef DEBUG
pmapdebug = 0;
#endif
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: matt Date: Tue Jul 31 15:47:58 UTC 2012 Modified Files: src/sys/arch/arm/include/arm32: frame.h Log Message: Add code to make sure the trapframe is aligned to a doubleword boundary. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/include/arm32/frame.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/arm/include/arm32/frame.h diff -u src/sys/arch/arm/include/arm32/frame.h:1.26 src/sys/arch/arm/include/arm32/frame.h:1.27 --- src/sys/arch/arm/include/arm32/frame.h:1.26 Tue Jul 31 08:01:30 2012 +++ src/sys/arch/arm/include/arm32/frame.h Tue Jul 31 15:47:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: frame.h,v 1.26 2012/07/31 08:01:30 matt Exp $ */ +/* $NetBSD: frame.h,v 1.27 2012/07/31 15:47:58 matt Exp $ */ /* * Copyright (c) 1994-1997 Mark Brinicombe. @@ -372,6 +372,8 @@ LOCK_CAS_DEBUG_LOCALS mrs r3, spsr; /* Save xxx32 spsr */ \ SET_CPSR_MODE(r2, PSR_SVC32_MODE); \ mov r2, sp; /* Save SVC sp */ \ + tst sp, #4; /* check for alignment */ \ + subne sp, sp, #4; /* adjust if not aligned */ \ str r0, [sp, #-4]!; /* Push return address */ \ str lr, [sp, #-4]!; /* Push SVC lr */ \ str r2, [sp, #-4]!; /* Push SVC sp */ \
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: bouyer
Date: Tue Jul 31 15:59:57 UTC 2012
Modified Files:
src/sys/dev/scsipi: atapi_wdc.c
Log Message:
Move a check for the drive type to the right place. This bug would cause
ATA drives to not be detected when the PATA (or emulated PATA) bus is shared
with an ATAPI device.
Should fix the problem reported by various peoples.
Thanks to Onno van der Linden and vano...@free.fr for pointing out the
code in error.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/scsipi/atapi_wdc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/atapi_wdc.c
diff -u src/sys/dev/scsipi/atapi_wdc.c:1.118 src/sys/dev/scsipi/atapi_wdc.c:1.119
--- src/sys/dev/scsipi/atapi_wdc.c:1.118 Tue Jul 31 15:50:37 2012
+++ src/sys/dev/scsipi/atapi_wdc.c Tue Jul 31 15:59:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_wdc.c,v 1.118 2012/07/31 15:50:37 bouyer Exp $ */
+/* $NetBSD: atapi_wdc.c,v 1.119 2012/07/31 15:59:57 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atapi_wdc.c,v 1.118 2012/07/31 15:50:37 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: atapi_wdc.c,v 1.119 2012/07/31 15:59:57 bouyer Exp $);
#ifndef ATADEBUG
#define ATADEBUG
@@ -198,13 +198,6 @@ wdc_atapi_get_params(struct scsipi_chann
struct ata_channel *chp = atac-atac_channels[chan-chan_channel];
struct ata_command ata_c;
- /* if no ATAPI device detected at wdc attach time, skip */
- if (chp-ch_drive[drive].drive_type != ATA_DRIVET_ATAPI) {
- ATADEBUG_PRINT((wdc_atapi_get_params: drive %d not present\n,
- drive), DEBUG_PROBE);
- return -1;
- }
-
memset(ata_c, 0, sizeof(struct ata_command));
ata_c.r_command = ATAPI_SOFT_RESET;
ata_c.r_st_bmask = 0;
@@ -259,6 +252,13 @@ wdc_atapi_probe_device(struct atapibus_s
if (scsipi_lookup_periph(chan, target, 0) != NULL)
return;
+ /* if no ATAPI device detected at wdc attach time, skip */
+ if (drvp-drive_type != ATA_DRIVET_ATAPI) {
+ ATADEBUG_PRINT((wdc_atapi_probe_device:
+ drive %d not present\n, target), DEBUG_PROBE);
+ return;
+ }
+
if (wdc_atapi_get_params(chan, target, id) == 0) {
#ifdef ATAPI_DEBUG_PROBE
printf(%s drive %d: cmdsz 0x%x drqtype 0x%x\n,
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: martin
Date: Tue Jul 31 16:38:37 UTC 2012
Modified Files:
src/sys/arch/sparc/sparc: cpu.c timer_msiiep.c
Log Message:
Make KRUPS kernel buildable again
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/sparc/timer_msiiep.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/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.236 src/sys/arch/sparc/sparc/cpu.c:1.237
--- src/sys/arch/sparc/sparc/cpu.c:1.236 Sun Jul 29 00:04:05 2012
+++ src/sys/arch/sparc/sparc/cpu.c Tue Jul 31 16:38:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.236 2012/07/29 00:04:05 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.237 2012/07/31 16:38:37 martin Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.236 2012/07/29 00:04:05 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.237 2012/07/31 16:38:37 martin Exp $);
#include opt_multiprocessor.h
#include opt_lockdebug.h
@@ -1058,8 +1058,10 @@ int hypersparc_getmid(void);
#define cypress_getmid hypersparc_getmid
int viking_getmid(void);
+#if (defined(SUN4M) !defined(MSIIEP)) || defined(SUN4D)
extern int (*moduleerr_handler)(void);
int viking_module_error(void);
+#endif
struct module_info module_unknown = {
CPUTYP_UNKNOWN,
@@ -1706,7 +1708,7 @@ turbosparc_hotfix(struct cpu_info *sc)
}
#endif /* SUN4M */
-#if defined(SUN4M)
+#if defined(SUN4M) !defined(MSIIEP)
struct module_info module_viking = {
CPUTYP_UNKNOWN, /* set in cpumatch() */
VAC_NONE,
@@ -1733,9 +1735,9 @@ struct module_info module_viking = {
pmap_zero_page4m,
pmap_copy_page4m
};
-#endif /* SUN4M */
+#endif /* SUN4M !defined(MSIIEP) */
-#if defined(SUN4M) || defined(SUN4D)
+#if (defined(SUN4M) !defined(MSIIEP)) || defined(SUN4D)
void
cpumatch_viking(struct cpu_info *sc, struct module_info *mp, int node)
{
@@ -1953,7 +1955,7 @@ struct cpu_conf {
{ CPU_SUN4C, 9, 0, ANY, ANY, W8601/8701 or MB86903, module_sun4c },
#endif
-#if defined(SUN4M)
+#if defined(SUN4M) !defined(MSIIEP)
{ CPU_SUN4M, 0, 4, 0, 4, MB86904, module_swift },
{ CPU_SUN4M, 0, 5, 0, 5, MB86907, module_turbosparc },
{ CPU_SUN4M, 1, 1, 1, 0, CY7C601/604, module_cypress },
Index: src/sys/arch/sparc/sparc/timer_msiiep.c
diff -u src/sys/arch/sparc/sparc/timer_msiiep.c:1.26 src/sys/arch/sparc/sparc/timer_msiiep.c:1.27
--- src/sys/arch/sparc/sparc/timer_msiiep.c:1.26 Sun Jul 17 23:18:23 2011
+++ src/sys/arch/sparc/sparc/timer_msiiep.c Tue Jul 31 16:38:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_msiiep.c,v 1.26 2011/07/17 23:18:23 mrg Exp $ */
+/* $NetBSD: timer_msiiep.c,v 1.27 2012/07/31 16:38:37 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: timer_msiiep.c,v 1.26 2011/07/17 23:18:23 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: timer_msiiep.c,v 1.27 2012/07/31 16:38:37 martin Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -86,6 +86,7 @@ static int clockintr_msiiep(void *);
static int statintr_msiiep(void *);
static u_int timer_get_timecount(struct timecounter *);
+void* sched_cookie;
static struct intrhand level10 = { .ih_fun = clockintr_msiiep };
static struct intrhand level14 = { .ih_fun = statintr_msiiep };
CVS commit: src/share/man/man4
Module Name:src Committed By: njoly Date: Tue Jul 31 17:18:36 UTC 2012 Modified Files: src/share/man/man4: malo.4 Log Message: Tweak hardware list to make it render nicely with mandoc. - Move offset argument before columns values. - Use Ta macro for cells separation. - Add a few Em macros to the header line. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/malo.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/malo.4 diff -u src/share/man/man4/malo.4:1.2 src/share/man/man4/malo.4:1.3 --- src/share/man/man4/malo.4:1.2 Mon Jul 30 19:03:39 2012 +++ src/share/man/man4/malo.4 Tue Jul 31 17:18:36 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: malo.4,v 1.2 2012/07/30 19:03:39 wiz Exp $ +.\ $NetBSD: malo.4,v 1.3 2012/07/31 17:18:36 njoly Exp $ .\ $OpenBSD: malo.4,v 1.35 2010/11/01 17:59:09 jmc Exp $ .\ .\ Copyright (c) 2006 Theo de Raadt. @@ -123,10 +123,10 @@ The following cards are among those supp .Nm driver: .Pp -.Bl -column -compact Microcom Travelcard MALO111 CardBus a/b/g -offset 6n -.It Em Card Chip Bus Standard -.It Netgear WG311v3 88W8335 PCI b/g -.It Tenda TWL542P 88W8335 PCI b/g +.Bl -column -offset 6n -compact Microcom Travelcard MALO111 CardBus a/b/g +.It Em Card Ta Em Chip Ta Em Bus Ta Em Standard +.It Netgear WG311v3 Ta 88W8335 Ta PCI Ta b/g +.It Tenda TWL542P Ta 88W8335 Ta PCI Ta b/g .El .Sh EXAMPLES The following
CVS commit: othersrc/external/bsd/xzmem/dist
Module Name:othersrc Committed By: wiz Date: Tue Jul 31 18:21:23 UTC 2012 Modified Files: othersrc/external/bsd/xzmem/dist: libxzmem.3 Log Message: The man page is called zlib(3), not libz(3). To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/xzmem/dist/libxzmem.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/xzmem/dist/libxzmem.3 diff -u othersrc/external/bsd/xzmem/dist/libxzmem.3:1.1.1.1 othersrc/external/bsd/xzmem/dist/libxzmem.3:1.2 --- othersrc/external/bsd/xzmem/dist/libxzmem.3:1.1.1.1 Tue Jul 31 05:09:25 2012 +++ othersrc/external/bsd/xzmem/dist/libxzmem.3 Tue Jul 31 18:21:22 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: libxzmem.3,v 1.1.1.1 2012/07/31 05:09:25 agc Exp $ +.\ $NetBSD: libxzmem.3,v 1.2 2012/07/31 18:21:22 wiz Exp $ .\ .\ Copyright (c) 2012 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -56,7 +56,7 @@ is a library interface to enable LZMA co on in-memory strings. The library interface to the two functions has been designed to have the same function signatures as -.Xr libz 3 , +.Xr zlib 3 , thereby easing source code migration to using LZMA compression. The @@ -97,12 +97,12 @@ If the value .Dq ZLIB_ERROR_EMULATION is set in the environment, then internal LZMA errors will be mapped into -.Xr libz 3 +.Xr zlib 3 values, to aid in code migration. .Sh SEE ALSO .Xr xz 1 , .Xr liblzma 3 , -.Xr libz 3 +.Xr zlib 3 .Sh HISTORY The .Nm
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: martin
Date: Tue Jul 31 20:12:28 UTC 2012
Modified Files:
src/sys/arch/sparc/sparc: cpu.c
Log Message:
Ifdef MSIIEP differently, so krups actually boots again.
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/arch/sparc/sparc/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.237 src/sys/arch/sparc/sparc/cpu.c:1.238
--- src/sys/arch/sparc/sparc/cpu.c:1.237 Tue Jul 31 16:38:37 2012
+++ src/sys/arch/sparc/sparc/cpu.c Tue Jul 31 20:12:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.237 2012/07/31 16:38:37 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.238 2012/07/31 20:12:27 martin Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.237 2012/07/31 16:38:37 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.238 2012/07/31 20:12:27 martin Exp $);
#include opt_multiprocessor.h
#include opt_lockdebug.h
@@ -1708,7 +1708,7 @@ turbosparc_hotfix(struct cpu_info *sc)
}
#endif /* SUN4M */
-#if defined(SUN4M) !defined(MSIIEP)
+#if defined(SUN4M)
struct module_info module_viking = {
CPUTYP_UNKNOWN, /* set in cpumatch() */
VAC_NONE,
@@ -1735,9 +1735,9 @@ struct module_info module_viking = {
pmap_zero_page4m,
pmap_copy_page4m
};
-#endif /* SUN4M !defined(MSIIEP) */
+#endif /* SUN4M */
-#if (defined(SUN4M) !defined(MSIIEP)) || defined(SUN4D)
+#if defined(SUN4M) || defined(SUN4D)
void
cpumatch_viking(struct cpu_info *sc, struct module_info *mp, int node)
{
@@ -1758,7 +1758,9 @@ static int mxcc = -1;
sc-flags |= CPUFLG_CACHE_MANDATORY;
sc-zero_page = pmap_zero_page_viking_mxcc;
sc-copy_page = pmap_copy_page_viking_mxcc;
+#if !defined(MSIIEP)
moduleerr_handler = viking_module_error;
+#endif
/*
* Ok to cache PTEs; set the flag here, so we don't
@@ -1816,6 +1818,7 @@ viking_getmid(void)
return (0);
}
+#if !defined(MSIIEP)
int
viking_module_error(void)
{
@@ -1845,6 +1848,7 @@ viking_module_error(void)
}
return (fatal);
}
+#endif /* MSIIEP */
#endif /* SUN4M || SUN4D */
#if defined(SUN4D)
@@ -1955,7 +1959,7 @@ struct cpu_conf {
{ CPU_SUN4C, 9, 0, ANY, ANY, W8601/8701 or MB86903, module_sun4c },
#endif
-#if defined(SUN4M) !defined(MSIIEP)
+#if defined(SUN4M)
{ CPU_SUN4M, 0, 4, 0, 4, MB86904, module_swift },
{ CPU_SUN4M, 0, 5, 0, 5, MB86907, module_turbosparc },
{ CPU_SUN4M, 1, 1, 1, 0, CY7C601/604, module_cypress },
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src Committed By: matt Date: Wed Aug 1 00:45:18 UTC 2012 Modified Files: src/sys/arch/powerpc/include/booke: spr.h Log Message: Fix some copypaste bugs. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/booke/spr.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/powerpc/include/booke/spr.h diff -u src/sys/arch/powerpc/include/booke/spr.h:1.10 src/sys/arch/powerpc/include/booke/spr.h:1.11 --- src/sys/arch/powerpc/include/booke/spr.h:1.10 Wed Jul 18 20:46:36 2012 +++ src/sys/arch/powerpc/include/booke/spr.h Wed Aug 1 00:45:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.10 2012/07/18 20:46:36 matt Exp $ */ +/* $NetBSD: spr.h,v 1.11 2012/08/01 00:45:18 matt Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -111,14 +111,14 @@ #define ESR_ST 0x0080 /* 8: Store operation */ #define ESR_DLK 0x0020 /* 10: dcache exception */ #define ESR_ILK 0x0010 /* 11: icache exception */ -#define ESR_AP 0x0010 /* 12: Auxiliary Processor operation exception */ -#define ESR_PUO 0x0010 /* 13: Program Unimplemented Operation exception */ +#define ESR_AP 0x0008 /* 12: Auxiliary Processor operation exception */ +#define ESR_PUO 0x0004 /* 13: Program Unimplemented Operation exception */ #define ESR_BO 0x0002 /* 14: Byte ordering exception */ #define ESR_PIE 0x0002 /* 14: Program Imprecise Exception */ #define ESR_SPV 0x0080 /* 24: SPE exception */ -#define ESR_VLEMI 0x0080 /* 26: VLE exception */ -#define ESR_MIF 0x0080 /* 30: VLE Misaligned Instruction Fetch */ -#define ESR_XTE 0x0080 /* 31: eXternal Transaction Error */ +#define ESR_VLEMI 0x0020 /* 26: VLE exception */ +#define ESR_MIF 0x0002 /* 30: VLE Misaligned Instruction Fetch */ +#define ESR_XTE 0x0001 /* 31: eXternal Transaction Error */ #define SPR_IVPR 63 /* E... Interrupt Vector Prefix Reg. */ #define SPR_USPRG0 256 /* E4.. User SPR General 0 */ #define SPR_USPRG3 259 /* E... User SPR General 3 */
CVS commit: src/doc
Module Name:src Committed By: taca Date: Wed Aug 1 01:49:01 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: Update current versions: o ISC DHCP: 4.1-ESV-R6/4.2.4-P1 o tcp_wrappers 7.6-ipv6.4 o OpenLDAP 2.4.32 To generate a diff of this commit: cvs rdiff -u -r1.953 -r1.954 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.953 src/doc/3RDPARTY:1.954 --- src/doc/3RDPARTY:1.953 Fri Jul 27 18:21:59 2012 +++ src/doc/3RDPARTY Wed Aug 1 01:49:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.953 2012/07/27 18:21:59 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.954 2012/08/01 01:49:01 taca Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -268,7 +268,7 @@ src/lib/libc/db/db2netbsd. Package: dhcp Version: 3.0.3 -Current Vers: 4.1-ESV-R4/4.2.3-P2 +Current Vers: 4.1-ESV-R6/4.2.4-P1 Maintainer: mellon Archive Site: ftp://ftp.isc.org/isc/dhcp/ Home Page: http://www.isc.org/software/dhcp/ @@ -636,7 +636,7 @@ tree. Package: libwrap Version: tcp_wrappers 7.6 w/ large amount of IPv6 changes -Current Vers: tcp_wrappers 7.6-ipv6.1 +Current Vers: tcp_wrappers 7.6-ipv6.4 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://ftp.porcupine.org/pub/security/ Home Page: ftp://ftp.porcupine.org/pub/security/ @@ -782,7 +782,7 @@ We have lots of local fixes. Package: OpenLDAP Version: 2.4.23 -Current Vers: 2.4.30 +Current Vers: 2.4.32 Maintainer: OpenLDAP Foundation Archive Site: http://www.openldap.org/ Home Page: http://www.openldap.org/
CVS commit: src/usr.bin/pr
Module Name:src
Committed By: ginsbach
Date: Wed Aug 1 02:27:48 UTC 2012
Modified Files:
src/usr.bin/pr: pr.c
Log Message:
Minor tweaks to usage:
- Sort options to match pr(1) SYNOPSIS (suggested by wiz)
- Add missing -T timefmt option
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/pr/pr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pr/pr.c
diff -u src/usr.bin/pr/pr.c:1.23 src/usr.bin/pr/pr.c:1.24
--- src/usr.bin/pr/pr.c:1.23 Tue Jul 24 02:13:04 2012
+++ src/usr.bin/pr/pr.c Wed Aug 1 02:27:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pr.c,v 1.23 2012/07/24 02:13:04 ginsbach Exp $ */
+/* $NetBSD: pr.c,v 1.24 2012/08/01 02:27:48 ginsbach Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -45,7 +45,7 @@ __COPYRIGHT(@(#) Copyright (c) 1993\
#if 0
from: static char sccsid[] = @(#)pr.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: pr.c,v 1.23 2012/07/24 02:13:04 ginsbach Exp $);
+__RCSID($NetBSD: pr.c,v 1.24 2012/08/01 02:27:48 ginsbach Exp $);
#endif
#endif /* not lint */
@@ -1612,11 +1612,14 @@ static void
usage(void)
{
(void)fputs(
- usage: pr [+page] [-col] [-adFmrt] [-e[ch][gap]] [-h header]\n,errf);
+ usage: pr [+page] [-col] [-adFfmprt] [-e[ch][gap]] [-h header]\n,
+ errf);
(void)fputs(
- [-i[ch][gap]] [-l line] [-n[ch][width]] [-o offset]\n,errf);
+ [-i[ch][gap]] [-l line] [-n[ch][width]] [-o offset]\n,
+ errf);
(void)fputs(
- [-s[ch]] [-w width] [-fp] [-] [file ...]\n, errf);
+ [-s[ch]] [-T timefmt] [-w width] [-] [file ...]\n,
+ errf);
}
/*
CVS commit: src/usr.bin/pr
Module Name:src Committed By: ginsbach Date: Wed Aug 1 02:36:17 UTC 2012 Modified Files: src/usr.bin/pr: pr.1 Log Message: - Fix optional argument options (e, i, n, s) in SYNOPSIS and DESCRIPTION + First three take two optional arguments + All require no space between option and optional argument(s) + Make sure that -e and -i similarly describe optional [char] and [gap] To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.bin/pr/pr.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/pr/pr.1 diff -u src/usr.bin/pr/pr.1:1.21 src/usr.bin/pr/pr.1:1.22 --- src/usr.bin/pr/pr.1:1.21 Fri Jul 27 20:49:48 2012 +++ src/usr.bin/pr/pr.1 Wed Aug 1 02:36:17 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: pr.1,v 1.21 2012/07/27 20:49:48 wiz Exp $ +.\ $NetBSD: pr.1,v 1.22 2012/08/01 02:36:17 ginsbach Exp $ .\ .\ Copyright (c) 1991 Keith Muller. .\ Copyright (c) 1993 @@ -35,7 +35,7 @@ .\ .\ from: @(#)pr.1 8.1 (Berkeley) 6/6/93 .\ -.Dd May 4, 2012 +.Dd July 31, 2012 .Dt PR 1 .Os .Sh NAME @@ -47,18 +47,15 @@ .Op Fl Ar column .Op Fl adFfmprt .Oo -.Fl e -.Oo Ar char Oc Ns Op Ar gap +.Fl e Ns Oo Ar char Oc Ns Op Ar gap .Oc .Op Fl h Ar header .Oo -.Fl i -.Oo Ar char Oc Ns Op Ar gap +.Fl i Ns Oo Ar char Oc Ns Op Ar gap .Oc .Op Fl l Ar lines .Oo -.Fl n -.Oo Ar char Oc Ns Op Ar width +.Fl n Ns Oo Ar char Oc Ns Op Ar width .Oc .Op Fl o Ar offset .Oo @@ -135,7 +132,7 @@ An extra character is output following every .Aq newline found in the input. -.It Fl e Ar \[char\]\[gap\] +.It Fl e Ns Oo Ar char Oc Ns Op Ar gap Expand each input .Aq tab to the next greater column @@ -155,6 +152,12 @@ number of If any nondigit character, .Ar char , is specified, it is used as the input tab character. +If the first character of +.Ar char +is a digit then +.Ar char +is treated as +.Ar gap . .It Fl F Use a .Aq Em form-feed @@ -174,7 +177,7 @@ Use the string to replace the .Ar file name in the header line. -.It Fl i Ar \[char\]\[gap\] +.It Fl i Ns Oo Ar char Oc Ns Op Ar gap In output, replace multiple .Ao space Ac Ns s with @@ -228,7 +231,7 @@ The options and .Fl i are assumed. -.It Fl n Ar \[char\]\[width\] +.It Fl n Ns Oo Ar char Oc Ns Op Ar width Provide .Ar width digit line numbering. @@ -271,7 +274,7 @@ to be read on .Pa /dev/tty . .It Fl r Write no diagnostic reports on failure to open a file. -.It Fl s Op Ar char +.It Fl s Ns Op Ar char Separate text columns by the single character .Ar char instead of by the appropriate number of
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Wed Aug 1 04:20:05 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC Log Message: Enable FFS_EI (let's be more endian tolerant). To generate a diff of this commit: cvs rdiff -u -r1.358 -r1.359 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1076 -r1.1077 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.358 src/sys/arch/amd64/conf/GENERIC:1.359 --- src/sys/arch/amd64/conf/GENERIC:1.358 Mon Jul 30 19:40:51 2012 +++ src/sys/arch/amd64/conf/GENERIC Wed Aug 1 04:20:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.358 2012/07/30 19:40:51 degroote Exp $ +# $NetBSD: GENERIC,v 1.359 2012/08/01 04:20:04 matt Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.358 $ +#ident GENERIC-$Revision: 1.359 $ maxusers 64 # estimated number of users @@ -160,7 +160,7 @@ file-system PTYFS # /dev/ptm support # File system options options QUOTA # legacy UFS quotas options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independent support +options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support # Note that UFS_DIRHASH is suspected of causing kernel memory corruption. # It is not recommended for general use. Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1076 src/sys/arch/i386/conf/GENERIC:1.1077 --- src/sys/arch/i386/conf/GENERIC:1.1076 Mon Jul 30 19:40:52 2012 +++ src/sys/arch/i386/conf/GENERIC Wed Aug 1 04:20:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1076 2012/07/30 19:40:52 degroote Exp $ +# $NetBSD: GENERIC,v 1.1077 2012/08/01 04:20:05 matt Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1076 $ +#ident GENERIC-$Revision: 1.1077 $ maxusers 64 # estimated number of users @@ -184,7 +184,7 @@ file-system TMPFS # Efficient memory fi # File system options options QUOTA # legacy UFS quotas options QUOTA2 # new, in-filesystem UFS quotas -#options FFS_EI # FFS Endian Independent support +options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental options NFSSERVER # Network File System server
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src
Committed By: matt
Date: Wed Aug 1 05:40:20 UTC 2012
Modified Files:
src/sys/arch/arm/include/arm32: frame.h
Log Message:
Shrink PUSHFRAMEINSVC by 4 more instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/include/arm32/frame.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/arm/include/arm32/frame.h
diff -u src/sys/arch/arm/include/arm32/frame.h:1.27 src/sys/arch/arm/include/arm32/frame.h:1.28
--- src/sys/arch/arm/include/arm32/frame.h:1.27 Tue Jul 31 15:47:58 2012
+++ src/sys/arch/arm/include/arm32/frame.h Wed Aug 1 05:40:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.27 2012/07/31 15:47:58 matt Exp $ */
+/* $NetBSD: frame.h,v 1.28 2012/08/01 05:40:20 matt Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -371,13 +371,10 @@ LOCK_CAS_DEBUG_LOCALS
mov r1, sp; /* Save xxx32 sp */ \
mrs r3, spsr; /* Save xxx32 spsr */ \
SET_CPSR_MODE(r2, PSR_SVC32_MODE); \
- mov r2, sp; /* Save SVC sp */ \
- tst sp, #4; /* check for alignment */ \
- subne sp, sp, #4; /* adjust if not aligned */ \
- str r0, [sp, #-4]!; /* Push return address */ \
- str lr, [sp, #-4]!; /* Push SVC lr */ \
- str r2, [sp, #-4]!; /* Push SVC sp */ \
- sub sp, sp, #4; /* Keep stack aligned */ \
+ bic r2, sp, #7; /* Align new SVC sp */ \
+ str r0, [r2, #-4]!; /* Push return address */ \
+ stmdb r2!, {sp, lr}; /* Push SVC sp, lr */ \
+ sub sp, r2, #4; /* Keep stack aligned */ \
msr spsr_all, r3; /* Restore correct spsr */ \
ldmdb r1, {r0-r3}; /* Restore 4 regs from xxx mode */ \
sub sp, sp, #(4*15); /* Adjust the stack pointer */ \
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Wed Aug 1 05:42:56 UTC 2012 Modified Files: src/sys/arch/arm/arm: syscall.c Log Message: Make sure copyargs is 64-bit aligned (for EABI) To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/arm/syscall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/syscall.c diff -u src/sys/arch/arm/arm/syscall.c:1.53 src/sys/arch/arm/arm/syscall.c:1.54 --- src/sys/arch/arm/arm/syscall.c:1.53 Sun Feb 19 21:06:04 2012 +++ src/sys/arch/arm/arm/syscall.c Wed Aug 1 05:42:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.53 2012/02/19 21:06:04 rmind Exp $ */ +/* $NetBSD: syscall.c,v 1.54 2012/08/01 05:42:56 matt Exp $ */ /*- * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.53 2012/02/19 21:06:04 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.54 2012/08/01 05:42:56 matt Exp $); #include sys/device.h #include sys/errno.h @@ -211,7 +211,8 @@ syscall(struct trapframe *frame, lwp_t * int error; u_int nargs; register_t *args; - register_t copyargs[2+SYS_MAXSYSARGS]; + uint64_t copyargs64[sizeof(register_t)*(2+SYS_MAXSYSARGS+1)/sizeof(uint64_t)]; + register_t *copyargs = (register_t *)copyargs64; register_t rval[2]; ksiginfo_t ksi; const uint32_t os_mask = insn SWI_OS_MASK;
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Tue Jul 31 06:54:17 UTC 2012 Modified Files: src/sys/arch/arm/arm: bcopyinout.S Log Message: Use bcopyinout_xscale.S for armv6+ platforms since they have the needed instructions. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm/bcopyinout.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/arm/include/arm32
Module Name:src Committed By: matt Date: Tue Jul 31 06:56:57 UTC 2012 Modified Files: src/sys/arch/arm/include/arm32: frame.h Log Message: whitespace cleanup To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/include/arm32/frame.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/arm/include
Module Name:src Committed By: matt Date: Tue Jul 31 07:21:06 UTC 2012 Modified Files: src/sys/arch/arm/include: cdefs.h Log Message: If we are using EABI (aapcs-linux), then ALIGNBYTES needs to deal with 8-byte long types. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/include/cdefs.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/arm/include
Module Name:src Committed By: matt Date: Tue Jul 31 07:23:16 UTC 2012 Modified Files: src/sys/arch/arm/include: frame.h src/sys/arch/arm/include/arm32: frame.h Log Message: Make trapframe/irqframe an even number of words (make adjustments for the filler word). Improve the comments in PUSH/PULL macros. Use the armv6+ CPS instruction if we can. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/frame.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/include/arm32/frame.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/arm/include
Module Name:src Committed By: matt Date: Tue Jul 31 07:39:57 UTC 2012 Modified Files: src/sys/arch/arm/include: armreg.h Log Message: Add MON32 mode (just for completeness). To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/arm/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: wen Date: Tue Jul 31 07:49:46 UTC 2012 Modified Files: src/distrib/notes/common: main Log Message: Added myself to the list of NetBSD Developers. To generate a diff of this commit: cvs rdiff -u -r1.487 -r1.488 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: matt Date: Tue Jul 31 08:01:30 UTC 2012 Modified Files: src/sys/arch/arm/include/arm32: frame.h Log Message: Only do the SA110 user register save workaround on kernel using SA110s. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/include/arm32/frame.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/lib/libc/arch/arm/gen
Module Name:src Committed By: martin Date: Tue Jul 31 08:13:09 UTC 2012 Modified Files: src/lib/libc/arch/arm/gen [netbsd-6]: Makefile.inc Log Message: Backout #416 (requested by skrll in ticket #416): lib/libc/arch/arm/gen/Makefile.inc: revision 1.18 Backout previous (pulled up via #416) - it causes major regressions and needs more thought. To generate a diff of this commit: cvs rdiff -u -r1.16.8.1 -r1.16.8.2 src/lib/libc/arch/arm/gen/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 08:14:32 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Remove note for #416, it has been backed out To generate a diff of this commit: cvs rdiff -u -r1.1.2.165 -r1.1.2.166 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/luna68k/luna68k
Module Name:src Committed By: martin Date: Tue Jul 31 08:22:06 UTC 2012 Modified Files: src/sys/arch/luna68k/luna68k [netbsd-6]: locore.s machdep.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #453): sys/arch/luna68k/luna68k/machdep.c: revision 1.91 sys/arch/luna68k/luna68k/locore.s: revision 1.49 Handle bootarg strings passed from firmware prompt properly on LUNA-II. LUNA-II seems to use a different vector from LUNA to pass bootargs. Now we can specify RB_ASKNAME and RB_SINGLE at boot on LUNA-II. Should be pulled up to netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.47.2.1 -r1.47.2.2 src/sys/arch/luna68k/luna68k/locore.s cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/arch/luna68k/luna68k/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src
Module Name:src Committed By: martin Date: Tue Jul 31 08:48:10 UTC 2012 Modified Files: src/doc [netbsd-6]: 3RDPARTY src/share/zoneinfo [netbsd-6]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Pullup the import tzdata2012d from ftp://ftp.iana.org/tz/releases/tzdata2012d.tar.gz Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. [#455, via patch, requested by apb] To generate a diff of this commit: cvs rdiff -u -r1.909.2.8 -r1.909.2.9 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.30 -r1.1.1.30.4.1 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.19.4.1 -r1.1.1.19.4.2 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.1 -r1.1.1.50.4.2 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.1 -r1.23.4.2 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.24 -r1.1.1.24.4.1 src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.8 -r1.1.1.8.4.1 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.44.4.1 -r1.1.1.44.4.2 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.4 -r1.1.1.4.8.1 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.19 -r1.1.1.19.4.1 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.18.4.1 -r1.1.1.18.4.2 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.49.4.2 -r1.1.1.49.4.3 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.46.4.1 -r1.1.1.46.4.2 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.5 -r1.1.1.5.8.1 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.42.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.39.4.2 -r1.1.1.39.4.3 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 09:12:32 UTC 2012 Modified Files: src/doc [netbsd-6]: 3RDPARTY Log Message: Fix previous To generate a diff of this commit: cvs rdiff -u -r1.909.2.9 -r1.909.2.10 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: christos Date: Tue Jul 31 09:23:10 UTC 2012 Modified Files: src/etc: daily Log Message: PR/46757: Check for fetch_pkg_vulnerabilities unset first. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/etc/daily Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Tue Jul 31 09:27:27 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets #453 and #455 To generate a diff of this commit: cvs rdiff -u -r1.1.2.166 -r1.1.2.167 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64
Module Name:src Committed By: christos Date: Tue Jul 31 10:33:45 UTC 2012 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile crypto.inc ghash-sparcv9.S Log Message: - -m64 is needed for ghash - add montgomery multiplication assembly To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ghash-sparcv9.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64
Module Name:src Committed By: christos Date: Tue Jul 31 11:08:35 UTC 2012 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc Log Message: add this directory to the search path To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: jdf Date: Tue Jul 31 12:11:50 UTC 2012 Modified Files: src/etc: weekly Log Message: Call `makemandb -f -q` instead of `makemandb -f`, as Edgar Fu� proposed for daily. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/weekly Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: martin Date: Tue Jul 31 13:35:48 UTC 2012 Modified Files: src/sys/arch/sparc64/dev: consinit.c src/sys/arch/sparc64/sparc64: autoconf.c Log Message: Set up cn_tab in bootstrap() instead of initializing it statically. Fixes -Wno-common fallout, idea from tsutsui. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc64/dev/consinit.c cvs rdiff -u -r1.188 -r1.189 src/sys/arch/sparc64/sparc64/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs_msdos
Module Name:src Committed By: jakllsch Date: Tue Jul 31 13:52:45 UTC 2012 Modified Files: src/sbin/newfs_msdos: newfs_msdos.c Log Message: Use correct values for minimum and maximum cluster counts for the various FAT types. These values come from a publically-avaliable document of an infallible source that must not be named due to a violation of the document's license restrictions. This is justified by interoperability concerns. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sbin/newfs_msdos/newfs_msdos.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/sparc/sparc
Module Name:src Committed By: martin Date: Tue Jul 31 14:23:34 UTC 2012 Modified Files: src/sys/arch/sparc/sparc: autoconf.c machdep.c Log Message: Move cn_tab initialization to bootstrap() To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/sys/arch/sparc/sparc/autoconf.c cvs rdiff -u -r1.322 -r1.323 src/sys/arch/sparc/sparc/machdep.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/arm/include/arm32
Module Name:src Committed By: matt Date: Tue Jul 31 15:47:58 UTC 2012 Modified Files: src/sys/arch/arm/include/arm32: frame.h Log Message: Add code to make sure the trapframe is aligned to a doubleword boundary. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/include/arm32/frame.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: bouyer Date: Tue Jul 31 15:50:37 UTC 2012 Modified Files: src/sys/arch/acorn32/eb7500atx: rside.c src/sys/arch/acorn32/mainbus: wdc_pioc.c src/sys/arch/acorn32/podulebus: icside.c rapide.c simide.c src/sys/arch/amiga/dev: efa.c wdc_amiga.c wdc_buddha.c src/sys/arch/arm/gemini: obio_wdc.c src/sys/arch/atari/dev: wdc_mb.c src/sys/arch/evbarm/iq31244: wdc_obio.c src/sys/arch/evbarm/tsarm: wdc_ts.c src/sys/arch/evbppc/mpc85xx: wdc_obio.c src/sys/arch/i386/pci: gcscide.c src/sys/arch/i386/pnpbios: pciide_pnpbios.c src/sys/arch/landisk/dev: wdc_obio.c src/sys/arch/mac68k/obio: wdc_obio.c src/sys/arch/macppc/dev: kauai.c wdc_obio.c src/sys/arch/mips/adm5120/dev: wdc_extio.c src/sys/arch/mmeye/dev: wdc_mainbus.c src/sys/arch/prep/pnpbus: wdc_pnpbus.c src/sys/conf: files src/sys/dev/ata: ata.c ata_wdc.c atavar.h files.ata sata_subr.c satapmpreg.h satavar.h wd.c src/sys/dev/ic: ahcisata_core.c ahcisatavar.h mvsata.c ninjaata32.c siisata.c wdc.c wdc_upc.c wdcvar.h src/sys/dev/isa: wdc_isa.c src/sys/dev/isapnp: wdc_isapnp.c src/sys/dev/mca: ed_mca.c src/sys/dev/ofisa: wdc_ofisa.c src/sys/dev/pci: acardide.c aceride.c artsata.c cmdide.c cypide.c geodeide.c hptide.c iteide.c ixpide.c jmide.c nside.c optiide.c pciide_common.c pciidevar.h pdcide.c pdcsata.c piixide.c rccide.c rdcide.c satalink.c schide.c siside.c slide.c stpcide.c svwsata.c toshide.c viaide.c src/sys/dev/pcmcia: wdc_pcmcia.c src/sys/dev/podulebus: dtide.c hcide.c src/sys/dev/scsipi: atapi_wdc.c src/sys/dev/usb: umass_isdata.c Log Message: Apply back changes that were reverted on Jul 24 and Jul 26 (general ata/wdc cleanup and SATA PMP support), now that I'm back to fix the fallouts. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/acorn32/eb7500atx/rside.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn32/mainbus/wdc_pioc.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/acorn32/podulebus/icside.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/acorn32/podulebus/rapide.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/acorn32/podulebus/simide.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/dev/efa.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amiga/dev/wdc_amiga.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/dev/wdc_buddha.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/gemini/obio_wdc.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/atari/dev/wdc_mb.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/iq31244/wdc_obio.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/wdc_ts.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/mpc85xx/wdc_obio.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/pci/gcscide.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/pnpbios/pciide_pnpbios.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/landisk/dev/wdc_obio.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mac68k/obio/wdc_obio.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/dev/kauai.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/dev/wdc_obio.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/adm5120/dev/wdc_extio.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mmeye/dev/wdc_mainbus.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/prep/pnpbus/wdc_pnpbus.c cvs rdiff -u -r1.1053 -r1.1054 src/sys/conf/files cvs rdiff -u -r1.123 -r1.124 src/sys/dev/ata/ata.c cvs rdiff -u -r1.100 -r1.101 src/sys/dev/ata/ata_wdc.c cvs rdiff -u -r1.89 -r1.90 src/sys/dev/ata/atavar.h cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ata/files.ata cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ata/sata_subr.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ata/satapmpreg.h cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ata/satavar.h cvs rdiff -u -r1.399 -r1.400 src/sys/dev/ata/wd.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/ahcisatavar.h cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/mvsata.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/ninjaata32.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/siisata.c cvs rdiff -u -r1.273 -r1.274 src/sys/dev/ic/wdc.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/wdc_upc.c cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/wdcvar.h cvs rdiff -u -r1.58 -r1.59 src/sys/dev/isa/wdc_isa.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/isapnp/wdc_isapnp.c cvs rdiff -u -r1.51 -r1.52 src/sys/dev/mca/ed_mca.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ofisa/wdc_ofisa.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/acardide.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/aceride.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/artsata.c \ src/sys/dev/pci/geodeide.c src/sys/dev/pci/ixpide.c \ src/sys/dev/pci/optiide.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/cmdide.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/cypide.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/hptide.c src/sys/dev/pci/siside.c cvs rdiff -u
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: bouyer Date: Tue Jul 31 15:59:57 UTC 2012 Modified Files: src/sys/dev/scsipi: atapi_wdc.c Log Message: Move a check for the drive type to the right place. This bug would cause ATA drives to not be detected when the PATA (or emulated PATA) bus is shared with an ATAPI device. Should fix the problem reported by various peoples. Thanks to Onno van der Linden and vano...@free.fr for pointing out the code in error. To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/dev/scsipi/atapi_wdc.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/sparc/sparc
Module Name:src Committed By: martin Date: Tue Jul 31 16:38:37 UTC 2012 Modified Files: src/sys/arch/sparc/sparc: cpu.c timer_msiiep.c Log Message: Make KRUPS kernel buildable again To generate a diff of this commit: cvs rdiff -u -r1.236 -r1.237 src/sys/arch/sparc/sparc/cpu.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/sparc/timer_msiiep.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/man4
Module Name:src Committed By: njoly Date: Tue Jul 31 17:18:36 UTC 2012 Modified Files: src/share/man/man4: malo.4 Log Message: Tweak hardware list to make it render nicely with mandoc. - Move offset argument before columns values. - Use Ta macro for cells separation. - Add a few Em macros to the header line. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/malo.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/xzmem/dist
Module Name:othersrc Committed By: wiz Date: Tue Jul 31 18:21:23 UTC 2012 Modified Files: othersrc/external/bsd/xzmem/dist: libxzmem.3 Log Message: The man page is called zlib(3), not libz(3). To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/xzmem/dist/libxzmem.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/pr
Module Name:src Committed By: ginsbach Date: Wed Aug 1 02:36:17 UTC 2012 Modified Files: src/usr.bin/pr: pr.1 Log Message: - Fix optional argument options (e, i, n, s) in SYNOPSIS and DESCRIPTION + First three take two optional arguments + All require no space between option and optional argument(s) + Make sure that -e and -i similarly describe optional [char] and [gap] To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.bin/pr/pr.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: matt Date: Wed Aug 1 05:42:56 UTC 2012 Modified Files: src/sys/arch/arm/arm: syscall.c Log Message: Make sure copyargs is 64-bit aligned (for EABI) To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/arm/syscall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.evbppc
Module Name:src Committed By: matt Date: Wed Aug 1 05:46:13 UTC 2012 Modified Files: src/etc/etc.evbppc: Makefile.inc Log Message: Add TWRP1025 and INSTALL_TWRP1025 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/etc/etc.evbppc/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
