LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled
@ 2008-03-10 18:11 Ram Pai
  2008-03-11 14:17 ` Patrick McHardy
  2008-03-24  5:23 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Ram Pai @ 2008-03-10 18:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: akpm, davem

Fixes compilation errors while compiling the kernel with CONFIG_PROC_FS
disabled.


Signed-off-by: Ram Pai <linuxram@us.ibm.com>
---
 net/ipv4/fib_frontend.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: linux-2.6.24/net/ipv4/fib_frontend.c
===================================================================
--- linux-2.6.24.orig/net/ipv4/fib_frontend.c
+++ linux-2.6.24/net/ipv4/fib_frontend.c
@@ -1029,14 +1029,19 @@ static int __net_init fib_net_init(struc
 	error = nl_fib_lookup_init(net);
 	if (error < 0)
 		goto out_nlfl;
+#ifdef CONFIG_PROC_FS
 	error = fib_proc_init(net);
 	if (error < 0)
 		goto out_proc;
+#endif /* CONFIG_PROC_FS */
 out:
 	return error;
 
+#ifdef CONFIG_PROC_FS
 out_proc:
 	nl_fib_lookup_exit(net);
+#endif /* CONFIG_PROC_FS */
+
 out_nlfl:
 	ip_fib_net_exit(net);
 	goto out;
@@ -1044,7 +1049,9 @@ out_nlfl:
 
 static void __net_exit fib_net_exit(struct net *net)
 {
+#ifdef CONFIG_PROC_FS
 	fib_proc_exit(net);
+#endif /* CONFIG_PROC_FS */
 	nl_fib_lookup_exit(net);
 	ip_fib_net_exit(net);
 }



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled
  2008-03-10 18:11 [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled Ram Pai
@ 2008-03-11 14:17 ` Patrick McHardy
  2008-03-24  5:23 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2008-03-11 14:17 UTC (permalink / raw)
  To: Ram Pai; +Cc: linux-kernel, akpm, davem

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

Ram Pai wrote:
> Fixes compilation errors while compiling the kernel with CONFIG_PROC_FS
> disabled.


Please always include the compiler message when fixing compilation
warnings or errors.

This one is already fixed differently in current -git:



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1186 bytes --]

commit cc8274f50f2ad9a97a837451f63a0a3e65f7f490
Author: Li Zefan <lizf@cn.fujitsu.com>
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@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

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 */

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled
  2008-03-10 18:11 [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled Ram Pai
  2008-03-11 14:17 ` Patrick McHardy
@ 2008-03-24  5:23 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2008-03-24  5:23 UTC (permalink / raw)
  To: linuxram; +Cc: linux-kernel, akpm

From: Ram Pai <linuxram@us.ibm.com>
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@us.ibm.com>

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@cn.fujitsu.com>
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@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

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 */

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-03-24  5:24 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-10 18:11 [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled Ram Pai
2008-03-11 14:17 ` Patrick McHardy
2008-03-24  5:23 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).