Re: [2.6 patch] fix ipvs compilation

[Joe <joecool1029@gmail.com>]

On 1/5/06, Adrian Bunk <bunk@stusta.de> wrote:
> I don't know which change broke it, but I'm getting the following
> compile error in Linus' tree:
>
> <--  snip  -->
>
> ...
>   CC      net/ipv4/ipvs/ip_vs_sched.o
> net/ipv4/ipvs/ip_vs_sched.c: In function 'ip_vs_sched_getbyname':
> net/ipv4/ipvs/ip_vs_sched.c:110: warning: implicit declaration of function 'local_bh_disable'
> net/ipv4/ipvs/ip_vs_sched.c:124: warning: implicit declaration of function 'local_bh_enable'
> ...
>   CC      net/ipv4/ipvs/ip_vs_est.o
> net/ipv4/ipvs/ip_vs_est.c: In function 'ip_vs_new_estimator':
> net/ipv4/ipvs/ip_vs_est.c:147: warning: implicit declaration of function 'local_bh_disable'
> net/ipv4/ipvs/ip_vs_est.c:156: warning: implicit declaration of function 'local_bh_enable'
> ...
>   LD      .tmp_vmlinux1
> net/built-in.o: In function `ip_vs_sched_getbyname':ip_vs_sched.c:(.text+0x99cfa): undefined reference to `local_bh_disable'
> net/built-in.o: In function `register_ip_vs_scheduler': undefined reference to `local_bh_disable'
> net/built-in.o: In function `unregister_ip_vs_scheduler': undefined reference to `local_bh_disable'
> net/built-in.o: In function `ip_vs_new_estimator': undefined reference to `local_bh_disable'
> net/built-in.o: In function `ip_vs_kill_estimator': undefined reference to `local_bh_disable'
> net/built-in.o: more undefined references to `local_bh_disable' follow
> make: *** [.tmp_vmlinux1] Error 1
>
> <--  snip  -->
>
>
> This patch fixes them by #include'ing linux/interrupt.h.
>
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> --- linux-git/net/ipv4/ipvs/ip_vs_sched.c.old   2006-01-05 14:56:44.000000000 +0100
> +++ linux-git/net/ipv4/ipvs/ip_vs_sched.c       2006-01-05 14:56:59.000000000 +0100
> @@ -22,6 +22,7 @@
>  #include <linux/module.h>
>  #include <linux/sched.h>
>  #include <linux/spinlock.h>
> +#include <linux/interrupt.h>
>  #include <asm/string.h>
>  #include <linux/kmod.h>
>
> --- linux-git/net/ipv4/ipvs/ip_vs_est.c.old     2006-01-05 14:57:15.000000000 +0100
> +++ linux-git/net/ipv4/ipvs/ip_vs_est.c 2006-01-05 14:57:27.000000000 +0100
> @@ -18,6 +18,7 @@
>  #include <linux/jiffies.h>
>  #include <linux/slab.h>
>  #include <linux/types.h>
> +#include <linux/interrupt.h>
>
>  #include <net/ip_vs.h>
>
>

Thats not all either,  ./net/ipv4/netfilter/ipt_helper.c has the same
error and the same fix.

Here's the patch for this one.  Sorry for the dupe.. i sent the last
as html by accident.

--- linux/net/ipv4/netfilter/ipt_helper.c.old        2006-01-05
19:38:32.498991515 -0500
+++ linux/net/ipv4/netfilter/ipt_helper.c    2006-01-05 19:40:30.047057859 -0500
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/netfilter.h>
+#include <linux/interrupt.h>
 #if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
 #include <linux/netfilter_ipv4/ip_conntrack.h>
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/