aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-03-27 14:25:53 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-27 14:25:53 -0700
commit0e5f8be1388093edc324a78ebf241170b258eba3 (patch)
tree1b5491f78edba6bc3d463e4190deff22f10dff74
parent5983a3dff0036d7ef6a2139473564f4f3e7b2a11 (diff)
downloadkernel_samsung_espresso10-0e5f8be1388093edc324a78ebf241170b258eba3.zip
kernel_samsung_espresso10-0e5f8be1388093edc324a78ebf241170b258eba3.tar.gz
kernel_samsung_espresso10-0e5f8be1388093edc324a78ebf241170b258eba3.tar.bz2
[NETNS]: Compile NET /proc support only if CONFIG_NET is set.
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> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--fs/proc/proc_net.c2
-rw-r--r--include/linux/seq_file.h2
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