promise ultra66 needs patch, but patch (2.5) won't

[gregory mott <gmott@ultra.net>]

hello,

is patch brain-dead, or is it me?  (no, i'm not afraid to ask)  ok so i never used 'patch' before.  i must be overlooking something..

The Linux Ultra-DMA Mini-Howto (www.linuxdoc.org/HOWTO/mini/Ultra-DMA-5.html) section 5.2 says i need a patch (www.kernel.org/pub/linux/kernel/people/hedrick) to run my promise ultra66.  but i'm stumped on how to get patch to do any patching.  trying to smoke out what's going on, i've extracted a single hunk of the patchfile, named it /g/u66/i1de..patch.txt, it contains (without the '> 's)

>diff -urN linux-2.2.17-pristine/arch/i386/kernel/smp.c linux-2.2.17/arch/i386/kernel/smp.c
>--- linux-2.2.17-pristine/arch/i386/kernel/smp.c        Mon Sep  4 10:39:16 2000
>+++ linux-2.2.17/arch/i386/kernel/smp.c Fri Nov 17 12:20:21 2000
>@@ -137,7 +137,7 @@
>  unsigned long mp_lapic_addr = 0;
>  int skip_ioapic_setup = 0;                             /* 1 if "noapic" boot option passed */
>  
>-/* #define SMP_DEBUG */
>+#define SMP_DEBUG
>  
>  #ifdef SMP_DEBUG
>  #define SMP_PRINTK(x)  printk x

in /usr/src/kernel-source-2.2.17 i type to bash..

>patch -lb --dry-run -p1 -i /g/u66/i1de..patch.txt

i get

>patching file `arch/i386/kernel/smp.c'
>Hunk #1 FAILED at 137.
>1 out of 1 hunk FAILED -- saving rejects to arch/i386/kernel/smp.c.rej

and arch/i386/kernel/smp.c beginning at line 137 contains

>unsigned long mp_lapic_addr = 0;
>int skip_ioapic_setup = 0;                              /* 1 if "noapic" boot option passed */
>
>/* #define SMP_DEBUG */
>
>#ifdef SMP_DEBUG
>#define SMP_PRINTK(x)   printk x

when i leave out the -l, it renames smp.c to smp.c.orig and creates smp.c and smp.c.rej, so it's not like it can't find it.

patch -v identifies itself as 2.5.  i've installed libranet 1.8.2, which contains kernel-source-2.2.17.

and if patch can eventually be coerced into cooperating, do i need to select any particular options or features when i recompile the kernel to get the ultra66 going?

any guidance?  should i dump this install and try redhat?

tia,
greg

gregory mott
tel 978-386-9986, icq 5856302

i pledge allegiance to the earth
and all that lives upon her
and the delicate balance in which it all stands
one planet
alive with spirit
in full harmony
with deep respect for all