Merge branch 'master' into tk71

[mv-sheeva.git] / net / 802 / stp.c

diff --git a/net/802/stp.c b/net/802/stp.c
index 53c8f77f0ccd1025a7061568b551a1d9631c0dd1..978c30b1b36b5a138eeeb7b9780009686f356d6e 100644 (file)
--- a/net/802/stp.c
+++ b/net/802/stp.c
@@ -21,8 +21,8 @@
 #define GARP_ADDR_MAX  0x2F
 #define GARP_ADDR_RANGE        (GARP_ADDR_MAX - GARP_ADDR_MIN)
 
-static const struct stp_proto *garp_protos[GARP_ADDR_RANGE + 1] __read_mostly;
-static const struct stp_proto *stp_proto __read_mostly;
+static const struct stp_proto __rcu *garp_protos[GARP_ADDR_RANGE + 1] __read_mostly;
+static const struct stp_proto __rcu *stp_proto __read_mostly;
 
 static struct llc_sap *sap __read_mostly;
 static unsigned int sap_registered;