LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ram Pai <linuxram@us.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, davem@davemloft.net
Subject: [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled
Date: Mon, 10 Mar 2008 11:11:03 -0700	[thread overview]
Message-ID: <1205172664.15345.96.camel@ram.us.ibm.com> (raw)

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);
 }



             reply	other threads:[~2008-03-10 18:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-10 18:11 Ram Pai [this message]
2008-03-11 14:17 ` Patrick McHardy
2008-03-24  5:23 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1205172664.15345.96.camel@ram.us.ibm.com \
    --to=linuxram@us.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [RFC PATCH] ipv4: compilation error fix with CONFIG_PROC_FS disabled' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).