Re: tulip.c-086I, No longer compiles in 2.1.76

Anders Hammarquist (iko@netg.se)
30 Dec 1997 01:15:30 +0100

In article <Pine.LNX.3.96.971228233431.14372A-100000$filesrv1.baby-dragons.com@lists.netg.se>,
Mr. James W. Laferriere Network Engineer <babydr@nwrain.net> wrote:
>
>Hello All, Starting with a clean tarball of 2.1.76 IE:
>
>an excerpt from make-all.log is below. Any Help appreciated.
>Mind you the same driver compiled fine under 2.1.74 .

The x86 global has moved into a struct. I patched it like this and it
compiled and works fine as far as I can tell.

/Anders

--- tulip.c-086I Fri Dec 19 17:14:28 1997
+++ /usr/src/kernel-source-2.1/drivers/net/tulip.c Sun Dec 28 18:12:45 1997
@@ -1153,11 +1153,11 @@
/* When a module we don't have 'x86' to check. */
outl(0x01A00000 | 0x4800, ioaddr + CSR0);
#else
- outl(0x01A00000 | (x86 <= 4 ? 0x4800 : 0x8000), ioaddr + CSR0);
- if (x86 <= 4)
+ outl(0x01A00000 | (boot_cpu_data.x86 <= 4 ? 0x4800 : 0x8000), ioaddr + CSR0);
+ if (boot_cpu_data.x86 <= 4)
printk(KERN_INFO "%s: This is a 386/486 PCI system, setting cache "
"alignment to %x.\n", dev->name,
- 0x01A00000 | (x86 <= 4 ? 0x4800 : 0x8000));
+ 0x01A00000 | (boot_cpu_data.x86 <= 4 ? 0x4800 : 0x8000));
#endif
#else
outl(0x01A00000 | 0x4800, ioaddr + CSR0);

-- 
 -- Of course I'm crazy, but that doesn't mean I'm wrong.
Anders Hammarquist   |       Mud at Kingdoms        | iko@netg.se
NetGuide Scandinavia |   telnet kingdoms.se 1812    | Fax: +46 31 50 79 39
http://www.netg.se   |                              | Tel: +46 31 50 79 40