Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bd5435e76a226b7151ae5aaee2cd366ab003dd2e
Commit:     bd5435e76a226b7151ae5aaee2cd366ab003dd2e
Parent:     dc8a82ad285dcd2831feb2fd8f7b41ce1f82e243
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 19:33:06 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 19:33:06 2007 -0700

    [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'
     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]>
    Acked-by: Ian McDonald <[EMAIL PROTECTED]>
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/dccp/input.c  |    3 +++
 net/dccp/sysctl.c |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/dccp/input.c b/net/dccp/input.c
index 19d7e1d..3560a2a 100644
--- a/net/dccp/input.c
+++ b/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;
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index 9364b2f..c62c050 100644
--- a/net/dccp/sysctl.c
+++ b/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",
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to