[patch] net/DCCP: fix link error with !CONFIG_SYSCTL

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-kernel@...>
Cc: Gerrit Renker <gerrit@...>, Ian McDonald <ian.mcdonald@...>, Arnaldo Carvalho de Melo <acme@...>, Andrew Morton <akpm@...>
Date: Monday, October 15, 2007 - 12:11 pm

Subject: net/DCCP: fix link error with !CONFIG_SYSCTL
From: Ingo Molnar <mingo@elte.hu>

do not define the sysctl_dccp_sync_ratelimit sysctl variable in
the CONFIG_SYSCTL dependent sysctl.c module - move it to input.c instead.

this fixes the following build bug:

 net/built-in.o: In function `dccp_check_seqno':
 input.c:(.text+0xbd859): undefined reference to `sysctl_dccp_sync_ratelimit'
 distcc[29953] ERROR: compile (null) on localhost failed
 make: *** [vmlinux] Error 1

found via 'make randconfig' build testing.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 net/dccp/input.c  |    3 +++
 net/dccp/sysctl.c |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: linux/net/dccp/input.c
===================================================================
--- linux.orig/net/dccp/input.c
+++ linux/net/dccp/input.c
@@ -19,6 +19,9 @@
 #include "ccid.h"
 #include "dccp.h"
 
+/* rate-limit for syncs in reply to sequence-invalid packets; RFC 4340, 7.5.4 */
+int sysctl_dccp_sync_ratelimit	__read_mostly = HZ / 8;
+
 static void dccp_fin(struct sock *sk, struct sk_buff *skb)
 {
 	sk->sk_shutdown |= RCV_SHUTDOWN;
Index: linux/net/dccp/sysctl.c
===================================================================
--- linux.orig/net/dccp/sysctl.c
+++ linux/net/dccp/sysctl.c
@@ -18,9 +18,6 @@
 #error This file should not be compiled without CONFIG_SYSCTL defined
 #endif
 
-/* rate-limit for syncs in reply to sequence-invalid packets; RFC 4340, 7.5.4 */
-int sysctl_dccp_sync_ratelimit	__read_mostly = HZ / 8;
-
 static struct ctl_table dccp_default_table[] = {
 	{
 		.procname	= "seq_window",
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[patch] net/DCCP: fix link error with !CONFIG_SYSCTL, Ingo Molnar, (Mon Oct 15, 12:11 pm)
Re: [patch] net/DCCP: fix link error with !CONFIG_SYSCTL, Arnaldo Carvalho de Melo, (Tue Oct 16, 10:48 am)