From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, davem@davemloft.net
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [-mm patch] net/core/sysctl_net_core.c: fix PROC_FS=n compile
Date: Sat, 20 Aug 2005 21:03:09 +0200 [thread overview]
Message-ID: <20050820190309.GB3615@stusta.de> (raw)
In-Reply-To: <20050819043331.7bc1f9a9.akpm@osdl.org>
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 <bunk@stusta.de>
--- 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 */
next prev parent reply other threads:[~2005-08-20 19:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050819043331.7bc1f9a9.akpm@osdl.org>
2005-08-19 15:02 ` 2.6.13-rc6-mm1: drivers/net/s2io.c: compile error with gcc 4.0 Adrian Bunk
2005-08-19 17:28 ` 2.6.13-rc6-mm1: too many 'ipv4_table' variables Adrian Bunk
2005-08-20 0:20 ` 2.6.13-rc6-mm1: why is PHYLIB a user-visible option? Adrian Bunk
2005-08-20 0:29 ` Jeff Garzik
2005-08-20 19:03 ` Adrian Bunk [this message]
2005-08-21 0:14 ` [-mm patch] net/core/sysctl_net_core.c: fix PROC_FS=n compile David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050820190309.GB3615@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).