On 11/15/05, Andy Ruhl <acruhl@gmail.com> wrote:
> On 11/15/05, Izumi Tsutsui <tsutsui@ceres.dti.ne.jp> wrote:
> > > Could you please try the attached patch for netbsd-3?
> > > I'll send a pullup request if it actually fixes your problem.
> >
> > I've put a compiled kernel:
> > http://www.ceres.dti.ne.jp/~tsutsui/netbsd/netbsd-cobalt-cachefix-3.0_R=
C1.gz
>
> Thanks Izumi. I was going to try again to patch my 3.0 source tree but
> it looks like you did it for me and made a build. I grabbed that
> kernel and booted it. I will test it for a while. Thanks! Here's the
> dmesg:

(deleted the dmesg)

It ran overnight, and passed the "ftp" test, so this is probably good.

You had asked why the patch didn't work. I copied all of the stuff
from the email into 1 patch file, and then cd'd to the src directory
for release-3 and then did patch < patch file. Here's the typescript
output:

(andy@foghorn)[/exports/netbsd/usr/src] > cat typescript
Script started on Wed Nov 16 05:40:10 2005
(andy@foghorn)[/exports/netbsd/usr/src] > pwd
/exports/netbsd/usr/src
(andy@foghorn)[/exports/netbsd/usr/src] > ls -l izumi_3r_patch
-rw-r--r--  1 andy  andy  14064 Nov 16 05:39 izumi_3r_patch
(andy@foghorn)[/exports/netbsd/usr/src] > patch < izumi_3r_patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/mips/include/cache.h
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /cvsroot/src/sys/arch/mips/include/cache.h,v
|retrieving revision 1.7
|diff -u -r1.7 cache.h
|--- sys/arch/mips/include/cache.h       1 Mar 2005 04:23:44 -0000       1.=
7
|+++ sys/arch/mips/include/cache.h       9 Nov 2005 14:59:26 -0000
--------------------------
Patching file sys/arch/mips/include/cache.h using Plan A...
Reversed (or previously applied) patch detected!  Assume -R? [y]
Hunk #1 succeeded at 187 with fuzz 2 (offset 2 lines).
Hunk #2 succeeded at 203 with fuzz 2 (offset 2 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/mips/include/pmap.h
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /cvsroot/src/sys/arch/mips/include/pmap.h,v
|retrieving revision 1.46
|diff -u -r1.46 pmap.h
|--- sys/arch/mips/include/pmap.h        17 Jan 2005 04:54:14 -0000      1.=
46
|+++ sys/arch/mips/include/pmap.h        9 Nov 2005 14:59:26 -0000
--------------------------
Patching file sys/arch/mips/include/pmap.h using Plan A...
Hunk #1 failed at 180.
1 out of 1 hunks failed--saving rejects to sys/arch/mips/include/pmap.h.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/mips/mips/cache.c
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /cvsroot/src/sys/arch/mips/mips/cache.c,v
|retrieving revision 1.26
|diff -u -r1.26 cache.c
|--- sys/arch/mips/mips/cache.c  1 Mar 2005 04:23:44 -0000       1.26
|+++ sys/arch/mips/mips/cache.c  9 Nov 2005 14:59:26 -0000
--------------------------
Patching file sys/arch/mips/mips/cache.c using Plan A...
Hunk #1 succeeded at 129 with fuzz 2.
Hunk #2 succeeded at 152 with fuzz 1.
Hunk #3 failed at 421.
Hunk #4 failed at 499.
Hunk #5 failed at 599.
Hunk #6 failed at 629.
Hunk #7 failed at 682.
5 out of 7 hunks failed--saving rejects to sys/arch/mips/mips/cache.c.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/mips/mips/mem.c
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /cvsroot/src/sys/arch/mips/mips/mem.c,v
|retrieving revision 1.29
|diff -u -r1.29 mem.c
|--- sys/arch/mips/mips/mem.c    7 Aug 2003 16:28:33 -0000       1.29
|+++ sys/arch/mips/mips/mem.c    9 Nov 2005 14:59:27 -0000
--------------------------
Patching file sys/arch/mips/mips/mem.c using Plan A...
Hunk #1 succeeded at 82 with fuzz 2 (offset 6 lines).
Hunk #2 succeeded at 96 with fuzz 2 (offset 4 lines).
Hunk #3 failed at 151.
Hunk #4 failed at 169.
2 out of 4 hunks failed--saving rejects to sys/arch/mips/mips/mem.c.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/mips/mips/pmap.c
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /cvsroot/src/sys/arch/mips/mips/pmap.c,v
|retrieving revision 1.157
|diff -u -r1.157 pmap.c
|--- sys/arch/mips/mips/pmap.c   1 Mar 2005 04:23:44 -0000       1.157
|+++ sys/arch/mips/mips/pmap.c   9 Nov 2005 14:59:27 -0000
--------------------------
Patching file sys/arch/mips/mips/pmap.c using Plan A...
Hunk #1 failed at 641.
Hunk #2 failed at 1577.
Hunk #3 failed at 1590.
Hunk #4 failed at 1613.
Hunk #5 failed at 1650.
Hunk #6 failed at 1674.
Hunk #7 failed at 1905.
Hunk #8 failed at 2117.
Hunk #9 failed at 2148.
Hunk #10 succeeded at 2274 with fuzz 2 (offset 78 lines).
9 out of 10 hunks failed--saving rejects to sys/arch/mips/mips/pmap.c.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/arch/mips/mips/vm_machdep.c
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /cvsroot/src/sys/arch/mips/mips/vm_machdep.c,v
|retrieving revision 1.105
|diff -u -r1.105 vm_machdep.c
|--- sys/arch/mips/mips/vm_machdep.c     1 Jan 2005 03:25:46 -0000       1.=
105
|+++ sys/arch/mips/mips/vm_machdep.c     9 Nov 2005 14:59:27 -0000
--------------------------
Patching file sys/arch/mips/mips/vm_machdep.c using Plan A...
Reversed (or previously applied) patch detected!  Assume -R? [y]
Hunk #1 succeeded at 143 with fuzz 2 (offset 12 lines).
done
(andy@foghorn)[/exports/netbsd/usr/src] > quit
quit: Command not found.
(andy@foghorn)[/exports/netbsd/usr/src] > exit
exit

Script done on Wed Nov 16 05:41:13 2005

Does this help any? I see failure messages so I assume it didn't work.
Also, if I try to build a kernel from this it doesn't work as well.

I just checked out this tree last week, then did a cvs update on it
yesterday. Then I tried to apply your patch just a minute ago. Did I
do something wrong?

Thanks,
Andy