From 4893215dc24656a5e07643abfe53b654ced512c4 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Mon, 5 Sep 2005 18:14:11 -0700
Subject: [PATCH] --- yaml --- r: 7127 b: refs/heads/master c:
 6baf1f417d092bd2de7c8892cecad456024c993f h: refs/heads/master i:   7125:
 d6a14592574d547f481e41249ffa0a87ada1a773   7123:
 e705cf6c8d704ea25d583a7e5a561c2749c71eb6   7119:
 6d56ee153ef344663de8a6266af1ea57429dd6c1 v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 3 ++-
 trunk/net/core/sock.c    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dfc97b9bc580..be865b9f2fd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa07ca5793414ce257ad98809147bd1dbb7a3837
+refs/heads/master: 6baf1f417d092bd2de7c8892cecad456024c993f
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index cf628261da52..8c48fbecb7cf 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -1377,9 +1377,10 @@ extern void sk_init(void);
 
 #ifdef CONFIG_SYSCTL
 extern struct ctl_table core_table[];
-extern int sysctl_optmem_max;
 #endif
 
+extern int sysctl_optmem_max;
+
 extern __u32 sysctl_wmem_default;
 extern __u32 sysctl_rmem_default;
 
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index ccd10fd65682..c13594579bfb 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -1719,8 +1719,8 @@ EXPORT_SYMBOL(sock_wfree);
 EXPORT_SYMBOL(sock_wmalloc);
 EXPORT_SYMBOL(sock_i_uid);
 EXPORT_SYMBOL(sock_i_ino);
-#ifdef CONFIG_SYSCTL
 EXPORT_SYMBOL(sysctl_optmem_max);
+#ifdef CONFIG_SYSCTL
 EXPORT_SYMBOL(sysctl_rmem_max);
 EXPORT_SYMBOL(sysctl_wmem_max);
 #endif