git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parisc: struct device - replace bus_id with dev_name(), dev_set_name()
[safe/jmp/linux-2.6]
/
fs
/
proc
/
root.c
diff --git
a/fs/proc/root.c
b/fs/proc/root.c
index
ef0fb57
..
7761602
100644
(file)
--- a/
fs/proc/root.c
+++ b/
fs/proc/root.c
@@
-22,8
+22,6
@@
#include "internal.h"
#include "internal.h"
-struct proc_dir_entry *proc_bus, *proc_root_fs, *proc_root_driver;
-
static int proc_test_super(struct super_block *sb, void *data)
{
return sb->s_fs_info == data;
static int proc_test_super(struct super_block *sb, void *data)
{
return sb->s_fs_info == data;
@@
-106,9
+104,9
@@
static struct file_system_type proc_fs_type = {
void __init proc_root_init(void)
{
void __init proc_root_init(void)
{
- int err
= proc_init_inodecache()
;
- if (err)
-
return
;
+ int err;
+
+
proc_init_inodecache()
;
err = register_filesystem(&proc_fs_type);
if (err)
return;
err = register_filesystem(&proc_fs_type);
if (err)
return;
@@
-119,15
+117,15
@@
void __init proc_root_init(void)
return;
}
return;
}
- proc_
misc_init(
);
+ proc_
symlink("mounts", NULL, "self/mounts"
);
proc_net_init();
#ifdef CONFIG_SYSVIPC
proc_mkdir("sysvipc", NULL);
#endif
proc_net_init();
#ifdef CONFIG_SYSVIPC
proc_mkdir("sysvipc", NULL);
#endif
- proc_
root_fs = proc_
mkdir("fs", NULL);
- proc_
root_driver = proc_
mkdir("driver", NULL);
+ proc_mkdir("fs", NULL);
+ 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("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 */
@@
-137,7
+135,7
@@
void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
#endif
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
#endif
- proc_
bus = proc_
mkdir("bus", NULL);
+ proc_mkdir("bus", NULL);
proc_sys_init();
}
proc_sys_init();
}
@@
-232,9
+230,5
@@
void pid_ns_release_proc(struct pid_namespace *ns)
EXPORT_SYMBOL(proc_symlink);
EXPORT_SYMBOL(proc_mkdir);
EXPORT_SYMBOL(create_proc_entry);
EXPORT_SYMBOL(proc_symlink);
EXPORT_SYMBOL(proc_mkdir);
EXPORT_SYMBOL(create_proc_entry);
-EXPORT_SYMBOL(proc_create);
+EXPORT_SYMBOL(proc_create
_data
);
EXPORT_SYMBOL(remove_proc_entry);
EXPORT_SYMBOL(remove_proc_entry);
-EXPORT_SYMBOL(proc_root);
-EXPORT_SYMBOL(proc_root_fs);
-EXPORT_SYMBOL(proc_bus);
-EXPORT_SYMBOL(proc_root_driver);