On Wed, Mar 24, 2010 at 09:16:02AM -0600, Ted Roby wrote: > On Tue, Mar 23, 2010 at 8:23 PM, Owain Ainsworth <zer...@googlemail.com>wrote: > > If you are testing pmemrange (you really should be), please also run > > with this diff. It fixes problems with isadma on i386. > > > > This is technically three diffs squashed together (bad oga! I know, but > > I need to do real work and this should fix pmemrange). > > > > > usage: > patch -l </tmp/patches/pmemrange_oga.patch >/tmp/patches/c.out 2>&1 > > > If I apply Ariane's patch first, Oga's fails as such: > > > Patching file arch//i386/isa/isa_machdep.c using Plan A... > Hunk #1 succeeded at 125. > Hunk #2 succeeded at 148. > Hunk #3 failed at 923. > Hunk #4 succeeded at 1003 (offset -7 lines). > Hunk #5 succeeded at 1034 (offset -7 lines). > 1 out of 5 hunks failed--saving rejects to arch//i386/isa/isa_machdep.c.rej > Hmm... Ignoring the trailing garbage. > done > > > > If I apply Oga's patch first, Ariane's fails as such: > > |Index: arch/i386/isa/isa_machdep.c > |=================================================================== > |RCS file: /cvs/src/sys/arch/i386/isa/isa_machdep.c,v > |retrieving revision 1.68 > |diff -u -d -p -r1.68 isa_machdep.c > |--- arch/i386/isa/isa_machdep.c 22 Aug 2009 02:54:50 -0000 1.68 > |+++ arch/i386/isa/isa_machdep.c 24 Mar 2010 01:40:43 -0000 > -------------------------- > Patching file arch/i386/isa/isa_machdep.c using Plan A... > Hunk #1 failed at 930. > 1 out of 1 hunks failed--saving rejects to arch/i386/isa/isa_machdep.c.rej
That was my fault. You can ignore the rejection in the second case. I've put an updated version on tech@ earlier today. Ciao, -- Ariane
