X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fproc%2Froot.c;h=6eac8db421caf5a496cf97c3b99df768e44fae5d;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=bf4b5d299843b1b9507fd5f528b72140d65d55c2;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/fs/proc/root.c b/fs/proc/root.c index bf4b5d299..6eac8db42 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -18,11 +18,14 @@ #include #include -struct proc_dir_entry *proc_net, *proc_bus, *proc_root_fs, *proc_root_driver; +struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver; #ifdef CONFIG_SYSCTL struct proc_dir_entry *proc_sys_root; #endif +struct proc_dir_entry *proc_virtual; + +extern void proc_vx_init(void); static struct super_block *proc_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) @@ -52,29 +55,32 @@ void __init proc_root_init(void) return; } proc_misc_init(); - proc_net = proc_mkdir("net", 0); + proc_net = proc_mkdir("net", NULL); + proc_net_stat = proc_mkdir("net/stat", NULL); + #ifdef CONFIG_SYSVIPC - proc_mkdir("sysvipc", 0); + proc_mkdir("sysvipc", NULL); #endif #ifdef CONFIG_SYSCTL - proc_sys_root = proc_mkdir("sys", 0); + proc_sys_root = proc_mkdir("sys", NULL); #endif #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) - proc_mkdir("sys/fs", 0); - proc_mkdir("sys/fs/binfmt_misc", 0); + proc_mkdir("sys/fs", NULL); + proc_mkdir("sys/fs/binfmt_misc", NULL); #endif - proc_root_fs = proc_mkdir("fs", 0); - proc_root_driver = proc_mkdir("driver", 0); - proc_mkdir("fs/nfsd", 0); /* somewhere for the nfsd filesystem to be mounted */ + proc_root_fs = proc_mkdir("fs", NULL); + proc_root_driver = proc_mkdir("driver", NULL); + proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */ #if defined(CONFIG_SUN_OPENPROMFS) || defined(CONFIG_SUN_OPENPROMFS_MODULE) /* just give it a mountpoint */ - proc_mkdir("openprom", 0); + proc_mkdir("openprom", NULL); #endif proc_tty_init(); #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); #endif - proc_bus = proc_mkdir("bus", 0); + proc_bus = proc_mkdir("bus", NULL); + proc_vx_init(); } static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd) @@ -157,5 +163,6 @@ EXPORT_SYMBOL(remove_proc_entry); EXPORT_SYMBOL(proc_root); EXPORT_SYMBOL(proc_root_fs); EXPORT_SYMBOL(proc_net); +EXPORT_SYMBOL(proc_net_stat); EXPORT_SYMBOL(proc_bus); EXPORT_SYMBOL(proc_root_driver);