Re: [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FSdisabled

[David Miller]

From: Ram Pai <linuxram@xxxxxxxxxx>
Date: Mon, 10 Mar 2008 11:11:03 -0700

> Fixes compilation errors while compiling the kernel with CONFIG_PROC_FS
> disabled.
> 
> Signed-off-by: Ram Pai <linuxram@xxxxxxxxxx>

In the current tree, fib_proc_{init,exit}() are delcared
as do-nothing inline functions in include/net/ip_fib.h

That was made by the following 2.6.25 changeset, which I'll
queue up for 2.6.24-stable if necessary.

commit cc8274f50f2ad9a97a837451f63a0a3e65f7f490
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
Date:   Tue Feb 5 02:54:16 2008 -0800

    [IPV4]: Fix compile error building without CONFIG_FS_PROC
    
    compile error building without CONFIG_FS_PROC:
    
    net/ipv4/fib_frontend.c: In function 'fib_net_init':
    net/ipv4/fib_frontend.c:1032: error: implicit declaration of function 'fib_proc_
    init'
    net/ipv4/fib_frontend.c: In function 'fib_net_exit':
    net/ipv4/fib_frontend.c:1047: error: implicit declaration of function 'fib_proc_
    exit'
    
    Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 90d1175..8b12667 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -266,6 +266,14 @@ static inline void fib_res_put(struct fib_result *res)
 #ifdef CONFIG_PROC_FS
 extern int __net_init  fib_proc_init(struct net *net);
 extern void __net_exit fib_proc_exit(struct net *net);
+#else
+static inline int fib_proc_init(struct net *net)
+{
+	return 0;
+}
+static inline void fib_proc_exit(struct net *net)
+{
+}
 #endif
 
 #endif  /* _NET_FIB_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/