Commit a3630a5e authored by Thiemo Seufer's avatar Thiemo Seufer Committed by David S. Miller

include/net/tcp.h: Use ____cacheline_aligned

parent 2842e79e
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/cache.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <net/sock.h> #include <net/sock.h>
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
...@@ -120,8 +121,7 @@ extern struct tcp_hashinfo { ...@@ -120,8 +121,7 @@ extern struct tcp_hashinfo {
* Now align to a new cache line as all the following members * Now align to a new cache line as all the following members
* are often dirty. * are often dirty.
*/ */
rwlock_t __tcp_lhash_lock rwlock_t __tcp_lhash_lock ____cacheline_aligned;
__attribute__((__aligned__(SMP_CACHE_BYTES)));
atomic_t __tcp_lhash_users; atomic_t __tcp_lhash_users;
wait_queue_head_t __tcp_lhash_wait; wait_queue_head_t __tcp_lhash_wait;
spinlock_t __tcp_portalloc_lock; spinlock_t __tcp_portalloc_lock;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment