I've tested it only for 2.3.99-pre2; and you seem to be compiling
for a non-smp kernel. Anyway, try this patch (I don't have your
environment to test it on, so no guarantees :-)
:a
------------------------
diff -Naur oss-stp/workarea/linux/include/linux/stp_netdevice.h
slinx-st/workarea/linux/include/linux/stp_netdevice.h
--- oss-stp/workarea/linux/include/linux/stp_netdevice.h Mon Mar
27 10:44:03 2000
+++ slinx-st/workarea/linux/include/linux/stp_netdevice.h Fri Apr
7 10:22:41 2000
@@ -74,8 +74,8 @@
#include <linux/config.h>
#include <linux/types.h>
#include <linux/netdevice.h>
+#include <linux/spinlock.h>
#include <linux/stp.h>
-#include <asm/spinlock.h>
typedef unsigned long paddr_t;
typedef unsigned char uchar_t;
-------------------------------------------------
werner@xxxxxxxxxxxxxxxxxxxx wrote:
>
> Hi,
> FYI patch applied to 2.3.99-pre3
>
> make -C stp
> make[3]: Entering directory `/usr/local/werner/linux/net/stp'
> make -C core
> make[4]: Entering directory `/usr/local/werner/linux/net/stp/core'
> make all_targets
> make[5]: Entering directory `/usr/local/werner/linux/net/stp/core'
> gcc -D__KERNEL__ -I/usr/local/werner/linux/include -Wall
> -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe
> -mno-fp-regs -ffixed-8 -mcpu=ev6 -Wa,-mev6 -Wno-format -D_STP_DEBUG_
> -D_WAR_BUGS_ -D_NO_VC_YET_ -D_NO_KEEPALIVE_YET_ -DEXPORT_SYMTAB -c
> stp_init.c
> In file included from
> /usr/local/werner/linux/include/linux/stp_netdevice.h:78,
> from stp_var.h:39,
> from stp_init.c:41:
> /usr/local/werner/linux/include/asm/spinlock.h:30:59: warning:
> `SPIN_LOCK_UNLOCKED' redefined
> /usr/local/werner/linux/include/linux/spinlock.h:51:28: warning: this is
> the location of the previous definition
> /usr/local/werner/linux/include/asm/spinlock.h:32:68: warning:
> `spin_lock_init' redefined
> /usr/local/werner/linux/include/linux/spinlock.h:54:22: warning: this is
> the location of the previous definition
> /usr/local/werner/linux/include/asm/spinlock.h:38:42: warning:
> `spin_is_locked' redefined
> /usr/local/werner/linux/include/linux/spinlock.h:56:22: warning: this is
> the location of the previous definition
> /usr/local/werner/linux/include/asm/spinlock.h:39:70: warning:
> `spin_unlock_wait' redefined
> /usr/local/werner/linux/include/linux/spinlock.h:58:24: warning: this is
> the locati
> /usr/local/werner/linux/include/asm/spinlock.h:45: parse error before
> `do'
> /usr/local/werner/linux/include/asm/spinlock.h:49:70: warning:
> `spin_lock' redefined
> /usr/local/werner/linux/include/linux/spinlock.h:55:17: warning: this is
> the location of the previous definition
> /usr/local/werner/linux/include/asm/spinlock.h:50:76: warning:
> `spin_trylock' redefined
> /usr/local/werner/linux/include/linux/spinlock.h:57:20: warning: this is
> the location of the previous definition
> /usr/local/werner/linux/include/asm/spinlock.h:100:44: warning:
> `RW_LOCK_UNLOCKED' redefined
> /usr/local/werner/linux/include/linux/spinlock.h:114:26: warning: this
> is the location of the previous definition
> In file included from
> /usr/local/werner/linux/include/linux/stp_netdevice.h:78,
> from stp_var.h:39,
> from stp_init.c:41:
> /usr/local/werner/linux/include/asm/spinlock.h:27: conflicting types for
> `spinlock_t'
> /usr/local/werner/linux/include/linux/spinlock.h:50: previous
> declaration of `spinlock_t'
> /usr/local/werner/linux/include/asm/spinlock.h:98: conflicting types for
> `rwlock_t'
> /usr/local/werner/linux/include/linux/spinlock.h:113: previous
> declaration of `rwlock_t'
> /usr/local/werner/linux/include/asm/spinlock.h:103: parse error before
> `void'
> /usr/local/werner/linux/include/asm/spinlock.h:104: parse error before
> `void'
> /usr/local/werner/linux/include/asm/spinlock.h:149: parse error before
> `do'
> /usr/local/werner/linux/include/asm/spinlock.h:152: parse error before
> `volatile'
> /usr/local/werner/linux/include/asm/spinlock.h:155: parse error before
> `do'
> make[5]: *** [stp_init.o] Error 1
> make[5]: Leaving directory `/usr/local/werner/linux/net/stp/core'
> make[4]: *** [first_rule] Error 2
> make[4]: Leaving directory `/usr/local/werner/linux/net/stp/core'
> make[3]: *** [_subdir_core] Error 2
> make[3]: Leaving directory `/usr/local/werner/linux/net/stp'
> make[2]: *** [_subdir_stp] Error 2
> make[2]: Leaving directory `/usr/local/werner/linux/net'
> make[1]: *** [_dir_net] Error 2
> make[1]: Leaving directory `/usr/local/werner/linux'
> make: *** [net] Error 2
|