Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
  ipv4: Add a missing rcu_assign_pointer() in routing cache.
  [netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit
  xen-netfront: Avoid unaligned accesses to IP header
  lmc: copy_*_user under spinlock
  [netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA

1 files changed, 6 insertions, 1 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 942be04e7955..2ea6dcc3e2cc 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1109,7 +1109,12 @@ restart:
                 printk("\n");
         }
 #endif
-        rt_hash_table[hash].chain = rt;
+        /*
+         * Since lookup is lockfree, we must make sure
+         * previous writes to rt are comitted to memory
+         * before making rt visible to other CPUS.
+         */
+        rcu_assign_pointer(rt_hash_table[hash].chain, rt);
         spin_unlock_bh(rt_hash_lock_addr(hash));
         *rp = rt;
         return 0;