From: "Denis V. Lunev" <den@openvz.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, containers@lists.osdl.org,
yoshfuji@linux-ipv6.org, --cc@sw.ru,
"Denis V. Lunev" <den@openvz.org>
Subject: [PATCH 1/2 net-2.6.26] [NETNS]: Compile NET /proc support only if CONFIG_NET is set.
Date: Thu, 27 Mar 2008 13:29:56 +0300 [thread overview]
Message-ID: <1206613797-32045-1-git-send-email-den@openvz.org> (raw)
In-Reply-To: <20080327.022206.100283150.davem@davemloft.net>
This fix broken compilation for 'allnoconfig'. This was introduced by
Introduced by commit 1218854afa6f659be90b748cf1bc7badee954a35 ("[NET]
NETNS: Omit seq_net_private->net without CONFIG_NET_NS.")
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
fs/proc/proc_net.c | 2 ++
include/linux/seq_file.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 13cd783..7034fac 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -51,6 +51,7 @@ int seq_open_net(struct inode *ino, struct file *f,
}
EXPORT_SYMBOL_GPL(seq_open_net);
+#ifdef CONFIG_NET
int seq_release_net(struct inode *ino, struct file *f)
{
struct seq_file *seq;
@@ -218,3 +219,4 @@ int __init proc_net_init(void)
return register_pernet_subsys(&proc_net_ns_ops);
}
+#endif /* CONFIG_NET */
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index d870a82..5da70c3 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -63,6 +63,7 @@ extern struct list_head *seq_list_start_head(struct list_head *head,
extern struct list_head *seq_list_next(void *v, struct list_head *head,
loff_t *ppos);
+#ifdef CONFIG_NET
struct net;
struct seq_net_private {
#ifdef CONFIG_NET_NS
@@ -81,6 +82,7 @@ static inline struct net *seq_file_net(struct seq_file *seq)
return &init_net;
#endif
}
+#endif /* CONFIG_NET */
#endif
#endif
--
1.5.3.rc5
next prev parent reply other threads:[~2008-03-27 10:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080327182441.8d09b8ad.sfr@canb.auug.org.au>
2008-03-27 9:22 ` linux-next: net build failure David Miller
2008-03-27 10:29 ` Denis V. Lunev [this message]
2008-03-27 21:27 ` [PATCH 1/2 net-2.6.26] [NETNS]: Compile NET /proc support only if CONFIG_NET is set David Miller
2008-03-27 10:29 ` [PATCH 2/2 net-2.6.26] [NETNS]: Do no include NET related headers if CONFIG_NET is not set Denis V. Lunev
2008-03-27 21:27 ` David Miller
2008-03-27 10:30 ` linux-next: net build failure YOSHIFUJI Hideaki / 吉藤英明
2008-03-27 11:05 ` David Miller
2008-03-27 12:12 ` YOSHIFUJI Hideaki / 吉藤英明
2008-03-27 21:26 ` 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=1206613797-32045-1-git-send-email-den@openvz.org \
--to=den@openvz.org \
--cc=--cc@sw.ru \
--cc=containers@lists.osdl.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).