[mpls-linux-devel] mpls patch vs. rt patch

[Bob B. <bob...@gm...>]

Hi,

I tried applying the patch-2.6.15-rt21  (realtime linux)
 over my 2.6.15.4 kernel, already patched with mpls
 (from 1.946), but at compile time I got an error:

 CC      net/core/shim.o
net/core/shim.c:23: error: `SPIN_LOCK_UNLOCKED' undeclared here (not
in a function)
make[2]: *** [net/core/shim.o] Error 1
make[1]: *** [net/core] Error 2
make: *** [net] Error 2


Do you know if these patches are incompatible, or should I just make
 sure to apply the patches in the other order?

Meanwhile, I'm going to try again with 2.6.15.6, then rt21, then mpls-1.950=
.


Thanks,

-Bob