Subject: [-mm patch] net/core/sysctl_net_core.c: fix PROC_FS=n compile

From: Adrian Bunk <[email-masked]>
Date: Sat, 20 Aug 2005 21:03:09 +0200

On Fri, Aug 19, 2005 at 04:33:31AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.13-rc5-mm1:
>...
>  git-net.patch
>...
>  Subsystem trees
>...

This breaks the compilation with CONFIG_PROC_FS=n:

<--  snip  -->

...
  CC      net/core/sysctl_net_core.o
net/core/sysctl_net_core.c:50: error: 'sysctl_wmem_default' undeclared here (not in a function)
net/core/sysctl_net_core.c:58: error: 'sysctl_rmem_default' undeclared here (not in a function)
make[2]: *** [net/core/sysctl_net_core.o] Error 1

<--  snip  -->

The fix is simple.

Signed-off-by: Adrian Bunk <[email-masked]>

--- linux-2.6.13-rc6-mm1-full/include/net/sock.h.old	2005-08-20 15:39:23.000000000 +0200
+++ linux-2.6.13-rc6-mm1-full/include/net/sock.h	2005-08-20 15:39:39.000000000 +0200
@@ -1372,9 +1372,7 @@
 extern int sysctl_optmem_max;
 #endif
 
-#ifdef CONFIG_PROC_FS
 extern __u32 sysctl_wmem_default;
 extern __u32 sysctl_rmem_default;
-#endif
 
 #endif	/* _SOCK_H */