Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[cascardo/linux.git] / net / appletalk / atalk_proc.c

diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index bc3015f..05d9652 100644 (file)
--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <linux/atalk.h>
 
@@ -204,21 +205,21 @@ out:
        return 0;
 }
 
-static struct seq_operations atalk_seq_interface_ops = {
+static const struct seq_operations atalk_seq_interface_ops = {
        .start  = atalk_seq_interface_start,
        .next   = atalk_seq_interface_next,
        .stop   = atalk_seq_interface_stop,
        .show   = atalk_seq_interface_show,
 };
 
-static struct seq_operations atalk_seq_route_ops = {
+static const struct seq_operations atalk_seq_route_ops = {
        .start  = atalk_seq_route_start,
        .next   = atalk_seq_route_next,
        .stop   = atalk_seq_route_stop,
        .show   = atalk_seq_route_show,
 };
 
-static struct seq_operations atalk_seq_socket_ops = {
+static const struct seq_operations atalk_seq_socket_ops = {
        .start  = atalk_seq_socket_start,
        .next   = atalk_seq_socket_next,
        .stop   = atalk_seq_socket_stop,
@@ -240,7 +241,7 @@ static int atalk_seq_socket_open(struct inode *inode, struct file *file)
        return seq_open(file, &atalk_seq_socket_ops);
 }
 
-static struct file_operations atalk_seq_interface_fops = {
+static const struct file_operations atalk_seq_interface_fops = {
        .owner          = THIS_MODULE,
        .open           = atalk_seq_interface_open,
        .read           = seq_read,
@@ -248,7 +249,7 @@ static struct file_operations atalk_seq_interface_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations atalk_seq_route_fops = {
+static const struct file_operations atalk_seq_route_fops = {
        .owner          = THIS_MODULE,
        .open           = atalk_seq_route_open,
        .read           = seq_read,
@@ -256,7 +257,7 @@ static struct file_operations atalk_seq_route_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations atalk_seq_socket_fops = {
+static const struct file_operations atalk_seq_socket_fops = {
        .owner          = THIS_MODULE,
        .open           = atalk_seq_socket_open,
        .read           = seq_read,
@@ -271,7 +272,7 @@ int __init atalk_proc_init(void)
        struct proc_dir_entry *p;
        int rc = -ENOMEM;
 
-       atalk_proc_dir = proc_mkdir("atalk", proc_net);
+       atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
        if (!atalk_proc_dir)
                goto out;
        atalk_proc_dir->owner = THIS_MODULE;
@@ -306,7 +307,7 @@ out_socket:
 out_route:
        remove_proc_entry("interface", atalk_proc_dir);
 out_interface:
-       remove_proc_entry("atalk", proc_net);
+       remove_proc_entry("atalk", init_net.proc_net);
        goto out;
 }
 
@@ -316,5 +317,5 @@ void __exit atalk_proc_exit(void)
        remove_proc_entry("route", atalk_proc_dir);
        remove_proc_entry("socket", atalk_proc_dir);
        remove_proc_entry("arp", atalk_proc_dir);
-       remove_proc_entry("atalk", proc_net);
+       remove_proc_entry("atalk", init_net.proc_net);
 }