2007-10-15 16:11:36

by Ingo Molnar

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

Subject: net/DCCP: fix link error with !CONFIG_SYSCTL
From: Ingo Molnar <[email protected]>

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 <[email protected]>
---
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",

2007-10-15 17:37:13

by Ian McDonald

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

On 10/16/07, Ingo Molnar <[email protected]> wrote:
> Subject: net/DCCP: fix link error with !CONFIG_SYSCTL
> From: Ingo Molnar <[email protected]>
>
> 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 <[email protected]>

Ingo - this should go via [email protected] or
[email protected] so it gets picked up by a maintainer.

Signed-off-by: Ian McDonald <[email protected]>

2007-10-16 14:48:53

by Arnaldo Carvalho de Melo

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

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 <[email protected]>
>
> 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 <[email protected]>

Thanks Ingo, David, please apply.

Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

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