Re: CVS commit: src/external/bsd/liblzf/dist

2010-02-04 Thread Marc Balmer
Am 04.02.10 00:52, schrieb Christos Zoulas:
 In article 20100203170030.ga7...@panix.com,
 Thor Lancelot Simon  t...@panix.com wrote:
 On Wed, Feb 03, 2010 at 04:33:59PM +0100, Joerg Sonnenberger wrote:
 On Wed, Feb 03, 2010 at 12:44:39AM -0500, Thor Lancelot Simon wrote:
 It's a tiny, very very fast compression library.  Christos wants it
 for bootblocks, among other things (or so he says -- ask him).

 For boot blocks or boot loaders?

 Ask Christos.  I don't use it for that purpose myself (I use it for
 a number of other things a very fast compressor is useful for, like
 network data streams and backups).  I am guessing what he was after
 was small size and fast decompression (for some resource-constrained
 platform?).
 
 I wanted to evaluate using it at work, for data streaming. The discussion
 with Thor went like:
 Thor: I have it already integrated in my own tree, should I import it.
 Christos: Sure I think so; it is small enough and we don't have something
 else with similar functionality in the tree, LZO is GPL, and the rest are
 too big/complicated.
 
 The bottom line is that I had the code in my local tree, someone whose
 technical opinion I respect sufficiently to simply check it in on his
 request made the request, and so I did.

 As I said earlier, if you want to remove 3-5000 bytes from the system,
 I can recommend some much better candidates.
 
 I still think it is useful and it should stay, just because the code is
 so simple. It is not the best compressor, but it is a fast and easy to
 understand one. If you don't think so, I'll remove it.

Actually I totally agree with you, I also think it should stay.


CVS commit: src/gnu/usr.bin/groff/tmac

2010-02-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Feb  4 09:07:30 UTC 2010

Modified Files:
src/gnu/usr.bin/groff/tmac: mdoc.local

Log Message:
Sort library descriptions.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/gnu/usr.bin/groff/tmac/mdoc.local

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libterminfo

2010-02-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Feb  4 09:12:56 UTC 2010

Modified Files:
src/lib/libterminfo: termcap.3 terminfo.3 terminfo.5.in

Log Message:
More markup.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/termcap.3 \
src/lib/libterminfo/terminfo.3 src/lib/libterminfo/terminfo.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci

2010-02-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Feb  4 09:13:23 UTC 2010

Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h

Log Message:
- Count Receive error, CRC error, Alignment error, Symbol error, Sequence
  error, Carrier extension error and Receive length error into ierror.
  Fixes PR#30349 reported by UMEZAWA Takeshi.
- Count Missed packet (rx fifo overflow) and Receive no buffers (rx ring full)
  into iqdrops.


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/if_wmreg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libterminfo

2010-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 09:45:30 UTC 2010

Modified Files:
src/lib/libterminfo: terminfo.5 terminfo.5.in

Log Message:
Sync terminfo.5 changes into terminfo.5.in


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/terminfo.5
cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/terminfo.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libterminfo

2010-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 09:46:26 UTC 2010

Modified Files:
src/lib/libterminfo: genhash genthash hash.c term.h termcap.c
termcap_hash.c ti.c

Log Message:
Fix build issues on other hosts.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/genhash
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/genthash
cvs rdiff -u -r1.1 -r1.2 src/lib/libterminfo/hash.c \
src/lib/libterminfo/term.h src/lib/libterminfo/termcap.c \
src/lib/libterminfo/termcap_hash.c src/lib/libterminfo/ti.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/getent

2010-02-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Feb  4 09:48:35 UTC 2010

Modified Files:
src/usr.bin/getent: getent.1

Log Message:
Sort SEE ALSO. New sentence, new line. Whitespace fix.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/getent/getent.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci

2010-02-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Feb  4 10:20:54 UTC 2010

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
Don't increment when ICR_RXO is set because we count them by WMREG_MPC
counter.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/sys/dev/pci/if_wm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libc/stdlib

2010-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 10:27:08 UTC 2010

Modified Files:
src/lib/libc/stdlib: mi_vector_hash.c

Log Message:
Include nbtool_config.h as we need to be part of the terminfo toolchain.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdlib/mi_vector_hash.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libterminfo

2010-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 12:25:08 UTC 2010

Modified Files:
src/lib/libterminfo: genhash hash.c

Log Message:
Allow hash to be build on other hosts.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/genhash
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/hash.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/x11/bin/xterm

2010-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 12:54:55 UTC 2010

Modified Files:
src/x11/bin/xterm: Makefile

Log Message:
Use correct lib


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/x11/bin/xterm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets

2010-02-04 Thread Iain Hibbert
Module Name:src
Committed By:   plunky
Date:   Thu Feb  4 13:07:55 UTC 2010

Modified Files:
src/distrib/sets: sets.subr

Log Message:
add note of pcc and pcccmds attributes


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/distrib/sets/sets.subr

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/bin/xterm

2010-02-04 Thread Matthias Scheler
Module Name:src
Committed By:   tron
Date:   Thu Feb  4 13:22:34 UTC 2010

Modified Files:
src/external/mit/xorg/bin/xterm: Makefile

Log Message:
Define HAVE_TERMCAP_H to fix build with the new terminfo library.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xterm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists/base

2010-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 14:04:59 UTC 2010

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
Don't remove termcap.db from existing systems.


To generate a diff of this commit:
cvs rdiff -u -r1.856 -r1.857 src/distrib/sets/lists/base/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src

2010-02-04 Thread Takahiro Kambe
Hi,

In message 201002021736.saa115...@zel459.zel.kfa-juelich.de
on Tue, 2 Feb 2010 18:36:14 +0100,
Matthias Drochner m.droch...@fz-juelich.de wrote:
 t...@back-street.net said:
 the version of libutil's shared library should be changed in some way,
 shoudn't it?
 
 Maybe as a matter of principle... Technically, I see no need for this.
 The code has never been used in the NetBSD tree, so there is no
 compatibility issue. And it is extremely unlikely that external
 software used it -- it is not of general use.
I confirmed.  Yeah, google results only 1 page with pw_policy_test.

Best regards.

-- 
Takahiro Kambe t...@back-street.net


CVS commit: src/sys/dev/sysmon

2010-02-04 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Feb  4 18:06:53 UTC 2010

Modified Files:
src/sys/dev/sysmon: sysmon_envsys_events.c

Log Message:
If the AC adapter is flagged with SME_DISABLE_REFRESH, don't try to call
its refresh() callback.  Just assume that its value has been properly
updated by other means.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/sysmon/sysmon_envsys_events.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/bin/date

2010-02-04 Thread Jeremy C. Reed
Module Name:src
Committed By:   reed
Date:   Thu Feb  4 19:25:22 UTC 2010

Modified Files:
src/bin/date: date.1

Log Message:
For the -d option, refer to parsedate(3) for examples.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/bin/date/date.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-5-0] src/doc

2010-02-04 Thread Soren Jacobsen
Module Name:src
Committed By:   snj
Date:   Thu Feb  4 19:50:20 UTC 2010

Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.2

Log Message:
Remove duplicate entry for ticket 1257.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/doc/CHANGES-5.0.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/etc

2010-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 21:01:16 UTC 2010

Modified Files:
src/etc: Makefile
src/etc/root: Makefile
Added Files:
src/etc/root: dot.terminfo mkterminfo

Log Message:
Install a minimal .terminfo and .terminfo.db in /root.
This allows terminfo to be used when /usr is not available.
Fixes PR misc/6879.


To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 src/etc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/etc/root/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/root/dot.terminfo src/etc/root/mkterminfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys/dev/pci

2010-02-04 Thread Jason Thorpe

On Feb 4, 2010, at 1:13 AM, SAITOH Masanobu wrote:

 Module Name:  src
 Committed By: msaitoh
 Date: Thu Feb  4 09:13:23 UTC 2010
 
 Modified Files:
   src/sys/dev/pci: if_wm.c if_wmreg.h
 
 Log Message:
 - Count Receive error, CRC error, Alignment error, Symbol error, Sequence
  error, Carrier extension error and Receive length error into ierror.
  Fixes PR#30349 reported by UMEZAWA Takeshi.
 - Count Missed packet (rx fifo overflow) and Receive no buffers (rx ring full)
  into iqdrops.

Isn't iqdrops really meant for to reflect a drop when placing into the software 
queue above the driver?

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.195 -r1.196 src/sys/dev/pci/if_wm.c
 cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/if_wmreg.h
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

-- thorpej



CVS commit: src/sys/net

2010-02-04 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Thu Feb  4 21:48:11 UTC 2010

Modified Files:
src/sys/net: if_fddisubr.c

Log Message:
Explicitly include opt_gateway.h when depending on GATEWAY.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/net/if_fddisubr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src

2010-02-04 Thread Antti Kantee
On Thu Feb 04 2010 at 22:25:21 +, Roy Marples wrote:
 +20100204:
 + The termcap database has been removed from the sources,
 + but has not been marked obsolete so it is not removed
 + from the system when upgrading.
 + As such, you will need to remove them from your object
 + and destination directories.

Could you make this more useful by including the filenames and preferably
also concrete commands to execute?


CVS commit: src/bin/date

2010-02-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Feb  4 22:56:11 UTC 2010

Modified Files:
src/bin/date: date.1

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/bin/date/date.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys/uvm (uvm_fault.c)

2010-02-04 Thread Geoff Wing
On Thursday 2010-02-04 05:48 +, Masao Uebayashi output:
:Module Name:   src
:Committed By:  uebayasi
:Date:  Thu Feb  4 05:48:26 UTC 2010
:Modified Files:
:   src/sys/uvm: uvm_fault.c

One of the recent changes added a variable only used in KASSERT()s
thus will need a check for non-DIAGNOSTIC builds.

Regards,
Geoff

Index: sys/uvm/uvm_fault.c
===
RCS file: /cvsroot/src/sys/uvm/uvm_fault.c,v
retrieving revision 1.161
diff -u -r1.161 uvm_fault.c
--- sys/uvm/uvm_fault.c 4 Feb 2010 05:48:26 -   1.161
+++ sys/uvm/uvm_fault.c 5 Feb 2010 00:26:22 -
@@ -1210,7 +1210,9 @@
struct uvm_faultinfo *ufi, struct uvm_faultctx *flt,
struct vm_page **pages)
 {
+#ifdef DIAGNOSTIC
struct vm_amap *amap = ufi-entry-aref.ar_amap;
+#endif
struct uvm_object *uobj = ufi-entry-object.uvm_obj;
struct vm_page *uobjpage;
 


Re: CVS commit: src/sys/uvm

2010-02-04 Thread Hisashi T Fujinaka

On Fri, 5 Feb 2010, Masao Uebayashi wrote:


I guess you're not on current-users. We've been talking about it since
12 hours before Geoff told you about it.


When I woke up I read my inbox from new ones.  Sorry for incovenience.


No problems. It seems to be fixed now.

--
Hisashi T Fujinaka - ht...@twofifty.com
BSEE(6/86) + BSChem(3/95) + BAEnglish(8/95) + MSCS(8/03) + $2.50 = latte


CVS commit: [matt-nb5-mips64] src/sys/arch/mips

2010-02-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Feb  5 07:36:51 UTC 2010

Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.mips
src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h cpuregs.h locore.h
mips_param.h types.h
src/sys/arch/mips/mips [matt-nb5-mips64]: genassym.cf locore.S
vm_machdep.c
Added Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_softint.c
Removed Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: softintr.c

Log Message:
Add __HAVE_FAST_SOFTINTS support.
Add routine to remap an uarea via a direct-mapped address.  This avoids
TLB machinations when swtching to/from the softint thread.  This can only
be done for lwp which won't exit.


To generate a diff of this commit:
cvs rdiff -u -r1.58.24.6 -r1.58.24.7 src/sys/arch/mips/conf/files.mips
cvs rdiff -u -r1.90.16.17 -r1.90.16.18 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.74.28.13 -r1.74.28.14 src/sys/arch/mips/include/cpuregs.h
cvs rdiff -u -r1.78.36.1.2.11 -r1.78.36.1.2.12 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.23.78.4 -r1.23.78.5 src/sys/arch/mips/include/mips_param.h
cvs rdiff -u -r1.43.36.12 -r1.43.36.13 src/sys/arch/mips/include/types.h
cvs rdiff -u -r1.44.12.13 -r1.44.12.14 src/sys/arch/mips/mips/genassym.cf
cvs rdiff -u -r1.167.38.8 -r1.167.38.9 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.7 -r0 src/sys/arch/mips/mips/softintr.c
cvs rdiff -u -r1.121.6.1.2.9 -r1.121.6.1.2.10 \
src/sys/arch/mips/mips/vm_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [matt-nb5-mips64] src/sys/arch

2010-02-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Feb  5 07:39:54 UTC 2010

Modified Files:
src/sys/arch/algor/algor [matt-nb5-mips64]: interrupt.c
src/sys/arch/algor/conf [matt-nb5-mips64]: files.algor
src/sys/arch/arc/arc [matt-nb5-mips64]: interrupt.c
src/sys/arch/arc/conf [matt-nb5-mips64]: files.arc
src/sys/arch/cobalt/cobalt [matt-nb5-mips64]: interrupt.c
src/sys/arch/cobalt/conf [matt-nb5-mips64]: files.cobalt
src/sys/arch/evbmips/conf [matt-nb5-mips64]: WGT624V3 files.adm5120
files.alchemy files.atheros files.malta files.rmixl
src/sys/arch/evbmips/evbmips [matt-nb5-mips64]: interrupt.c
src/sys/arch/ews4800mips/conf [matt-nb5-mips64]: files.ews4800mips
src/sys/arch/ews4800mips/ews4800mips [matt-nb5-mips64]: interrupt.c
src/sys/arch/hpcmips/tx [matt-nb5-mips64]: tx39icu.c
src/sys/arch/hpcmips/vr [matt-nb5-mips64]: vr.c
src/sys/arch/mipsco/include [matt-nb5-mips64]: intr.h
src/sys/arch/mipsco/mipsco [matt-nb5-mips64]: interrupt.c
src/sys/arch/newsmips/conf [matt-nb5-mips64]: files.newsmips
src/sys/arch/newsmips/newsmips [matt-nb5-mips64]: machdep.c
src/sys/arch/pmax/conf [matt-nb5-mips64]: GENERIC files.pmax
src/sys/arch/pmax/pmax [matt-nb5-mips64]: interrupt.c
src/sys/arch/sbmips/conf [matt-nb5-mips64]: files.sbmips
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: sb1250_icu.c
src/sys/arch/sgimips/sgimips [matt-nb5-mips64]: cpu.c

Log Message:
Change to deal with new method of invoking softints.  Remove mips/softintr.c
from config files.  Fix SYMTAB_SPACE for WGT62V43


To generate a diff of this commit:
cvs rdiff -u -r1.13.18.1 -r1.13.18.2 src/sys/arch/algor/algor/interrupt.c
cvs rdiff -u -r1.24 -r1.24.28.1 src/sys/arch/algor/conf/files.algor
cvs rdiff -u -r1.4 -r1.4.22.1 src/sys/arch/arc/arc/interrupt.c
cvs rdiff -u -r1.62 -r1.62.28.1 src/sys/arch/arc/conf/files.arc
cvs rdiff -u -r1.3 -r1.3.16.1 src/sys/arch/cobalt/cobalt/interrupt.c
cvs rdiff -u -r1.33 -r1.33.16.1 src/sys/arch/cobalt/conf/files.cobalt
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/sys/arch/evbmips/conf/WGT624V3
cvs rdiff -u -r1.5.28.1 -r1.5.28.2 src/sys/arch/evbmips/conf/files.adm5120
cvs rdiff -u -r1.9.28.1 -r1.9.28.2 src/sys/arch/evbmips/conf/files.alchemy
cvs rdiff -u -r1.6.28.1 -r1.6.28.2 src/sys/arch/evbmips/conf/files.atheros
cvs rdiff -u -r1.15.28.2 -r1.15.28.3 src/sys/arch/evbmips/conf/files.malta
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/evbmips/conf/files.rmixl
cvs rdiff -u -r1.11.18.1 -r1.11.18.2 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/arch/ews4800mips/conf/files.ews4800mips
cvs rdiff -u -r1.4 -r1.4.18.1 \
src/sys/arch/ews4800mips/ews4800mips/interrupt.c
cvs rdiff -u -r1.25 -r1.25.18.1 src/sys/arch/hpcmips/tx/tx39icu.c
cvs rdiff -u -r1.51 -r1.51.22.1 src/sys/arch/hpcmips/vr/vr.c
cvs rdiff -u -r1.16 -r1.16.36.1 src/sys/arch/mipsco/include/intr.h
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/arch/mipsco/mipsco/interrupt.c
cvs rdiff -u -r1.26 -r1.26.28.1 src/sys/arch/newsmips/conf/files.newsmips
cvs rdiff -u -r1.98.10.3 -r1.98.10.4 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.158 -r1.158.8.1 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.111 -r1.111.28.1 src/sys/arch/pmax/conf/files.pmax
cvs rdiff -u -r1.15.18.1 -r1.15.18.2 src/sys/arch/pmax/pmax/interrupt.c
cvs rdiff -u -r1.14.28.1 -r1.14.28.2 src/sys/arch/sbmips/conf/files.sbmips
cvs rdiff -u -r1.9.36.2 -r1.9.36.3 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.21.36.2 -r1.21.36.3 src/sys/arch/sgimips/sgimips/cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.