On 11/18/05, Izumi Tsutsui <tsutsui@ceres.dti.ne.jp> wrote:
> In article <78a2305a0511171626t365ef77bo9ca8dc7532ef42e5@mail.gmail.com>
> acruhl@gmail.com wrote:
>
> > Ok. I did a diff but I dont' know what I'm looking for. I checked out
> > -rnetbsd-3 clean and tried to apply your patch:
> >
> > cd /usr/src
> > patch < patch_file
> >
> > But hunks still failed and the kernel won't build, same as before. I
> > may just be doing something wrong. I'm not very experienced with using
> > cvs or patch (or diff), I just read the NetBSD guide and pretty much
> > do what it says.
>
> IMHO, you don't have to read the guild but the only thing you should do
> is just to show what commands actually you typed and what you got :-)
> "It works for me, though I don't know what you did."
>
> ---
> % rm -rf src
> % env CVSROOT=3Danoncvs@anoncvs.NetBSD.org:/cvsroot cvs checkout -P -rnet=
bsd-3 src/sys
>  [...]
> cvs checkout: Updating src/sys/vm
> % cd src
> % cvs diff > /tmp/diff
>  [...]
> cvs diff: Diffing sys/uvm
> % cat /tmp/diff
> % ls -l /tmp/diff
> -rw-r--r--  1 tsutsui  wheel  0 Nov 18 21:49 /tmp/diff
> % patch < /tmp/mips.diff
> 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...
> Hunk #1 succeeded at 185.
> Hunk #2 succeeded at 199.
> 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 succeeded at 180.
> 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.
> Hunk #2 succeeded at 152.
> Hunk #3 succeeded at 421.
> Hunk #4 succeeded at 499.
> Hunk #5 succeeded at 599.
> Hunk #6 succeeded at 629.
> Hunk #7 succeeded at 682.
> 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 76.
> Hunk #2 succeeded at 92.
> Hunk #3 succeeded at 147.
> Hunk #4 succeeded at 165.
> 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 succeeded at 641.
> Hunk #2 succeeded at 1577.
> Hunk #3 succeeded at 1590.
> Hunk #4 succeeded at 1613.
> Hunk #5 succeeded at 1650.
> Hunk #6 succeeded at 1674.
> Hunk #7 succeeded at 1905.
> Hunk #8 succeeded at 2117.
> Hunk #9 succeeded at 2148.
> Hunk #10 succeeded at 2196.
> 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...
> Hunk #1 succeeded at 131.
> Hmm...  Ignoring the trailing garbage.
> done
> %
> ---
>
> > In any case, the kernel you built still works and I'm having no
> > problems. No crashes, no errors in the syslog, everything normal. Is
> > this good enough to commit the patches?
>
> I've already sent a pullup request, but I'd still like to see
> a report that the patch fixes some problems.

Thanks for spending all that time educating me. I will try again.

The kernel you built a few days ago works for me. I used to be able to
crash it every time using ftp (the ftpd on the Qube would panic the
machine), this doesn't happen anymore. Also, one of the scripts that
runs in the night (probably doing updatedb) would sometimes crash it
too. Hasn't happened for 2 nights now. If nothing else, it's much
better than it was.

Thanks.

Andy