Merge commit 'v2.6.27-rc7' into x86/microcode

[linux-2.6-omap-h63xx.git] / net / ipv4 / protocol.c

diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c
index da70fef82c93f11c8caa2168eca6f5793eb85cb0..ea50da0649fd4c5ed06f7f9b892b26c356ee5601 100644 (file)
--- a/net/ipv4/protocol.c
+++ b/net/ipv4/protocol.c
@@ -5,8 +5,6 @@
  *
  *             INET protocol dispatch tables.
  *
- * Version:    $Id: protocol.c,v 1.14 2001/05/18 02:25:49 davem Exp $
- *
  * Authors:    Ross Biro
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *
@@ -45,7 +43,7 @@
 #include <net/ipip.h>
 #include <linux/igmp.h>
 
-struct net_protocol *inet_protos[MAX_INET_PROTOS];
+struct net_protocol *inet_protos[MAX_INET_PROTOS] ____cacheline_aligned_in_smp;
 static DEFINE_SPINLOCK(inet_proto_lock);
 
 /*