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

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

[Ingo Molnar]

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",

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

[Ian McDonald]

On 10/16/07, Ingo Molnar <mingo@elte.hu> wrote:
> 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>

Ingo - this should go via netdev@vger.kernel.org.nz or
dccp@vger.kernel.org.nz so it gets picked up by a maintainer.

Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>

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

[Gerrit Renker]

Quoting Ingo Molnar:
|  Subject: net/DCCP: fix link error with !CONFIG_SYSCTL
|  
|  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'

[thanks for spotting, copied this to dccp@vger instead of linux-kernel]

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>

NB: Arnaldo, in the test tree this problem is fixed and may serve as a suitable solution 
    for other sysctl variables also: the variables are always present, the #error wrapper
    has been replaced by an #ifdef, and the dccp-$(CONFIG_SYSCTL) += sysctl.o in the Makefile
    has been shifted to dccp-y; so that the variables are always there, independent of whether 
    CONFIG_SYSCTL is enabled.
 
|  +++ linux/net/dccp/sysctl.c
|  @@ -18,9 +18,6 @@
|   #error This file should not be compiled without CONFIG_SYSCTL defined
    ^
    +------------------ this #error has been replaced by a wrapper

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

[Arnaldo Carvalho de Melo]

Em Mon, Oct 15, 2007 at 06:11:13PM +0200, Ingo Molnar escreveu:
> 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>

Thanks Ingo, David, please apply.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

> ---
>  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",