From 3fa6fb0dae7d6e2dc410f741b946b7e88dac4fdd Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Mon, 20 Mar 2006 21:24:19 -0800
Subject: [PATCH] --- yaml --- r: 22211 b: refs/heads/master c:
 075ae86611011e1acdda9df6a7e30f8508b31fd6 h: refs/heads/master i:   22209:
 cdee93f776c7a95c344e5b9b305284585cf6daf6   22207:
 bfca510bec2eb711f37178754351bd62721cade4 v: v3

---
 [refs]                 | 2 +-
 trunk/net/dccp/ipv4.c  | 8 --------
 trunk/net/dccp/proto.c | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5e67fdb8ec6c..2c4ed499c1c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a1ec676ddbee712e1c1da679be4bdc529caf215
+refs/heads/master: 075ae86611011e1acdda9df6a7e30f8508b31fd6
diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c
index f087593d64d3..a7332f0f85c4 100644
--- a/trunk/net/dccp/ipv4.c
+++ b/trunk/net/dccp/ipv4.c
@@ -30,14 +30,6 @@
 #include "dccp.h"
 #include "feat.h"
 
-struct inet_hashinfo __cacheline_aligned dccp_hashinfo = {
-	.lhash_lock	= RW_LOCK_UNLOCKED,
-	.lhash_users	= ATOMIC_INIT(0),
-	.lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait),
-};
-
-EXPORT_SYMBOL_GPL(dccp_hashinfo);
-
 static int dccp_v4_get_port(struct sock *sk, const unsigned short snum)
 {
 	return inet_csk_get_port(&dccp_hashinfo, sk, snum,
diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c
index 64806fbf44de..3ba1ff435798 100644
--- a/trunk/net/dccp/proto.c
+++ b/trunk/net/dccp/proto.c
@@ -47,6 +47,14 @@ atomic_t dccp_orphan_count = ATOMIC_INIT(0);
 
 EXPORT_SYMBOL_GPL(dccp_orphan_count);
 
+struct inet_hashinfo __cacheline_aligned dccp_hashinfo = {
+	.lhash_lock	= RW_LOCK_UNLOCKED,
+	.lhash_users	= ATOMIC_INIT(0),
+	.lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait),
+};
+
+EXPORT_SYMBOL_GPL(dccp_hashinfo);
+
 static struct net_protocol dccp_protocol = {
 	.handler	= dccp_v4_rcv,
 	.err_handler	= dccp_v4_err,