diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-04-29 04:01:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:18 -0400 |
commit | c74c120a21d87b0b6925ada5830d8cac21e852d9 (patch) | |
tree | 79558a29ecadc7b71eeb5bdf0945680f0560b2ed /fs/proc | |
parent | 928b4d8c8963e75bdb133f562b03b07f9aa4844a (diff) |
proc: remove proc_root from drivers
Remove proc_root export. Creation and removal works well if parent PDE is
supplied as NULL -- it worked always that way.
So, one useless export removed and consistency added, some drivers created
PDEs with &proc_root as parent but removed them as NULL and so on.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/internal.h | 1 | ||||
-rw-r--r-- | fs/proc/proc_misc.c | 2 | ||||
-rw-r--r-- | fs/proc/root.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index b1d6df671edf..28cbca805905 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
13 | 13 | ||
14 | extern struct proc_dir_entry proc_root; | ||
14 | #ifdef CONFIG_PROC_SYSCTL | 15 | #ifdef CONFIG_PROC_SYSCTL |
15 | extern int proc_sys_init(void); | 16 | extern int proc_sys_init(void); |
16 | #else | 17 | #else |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index c4137bb94a9e..48bcf20cec2f 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -854,7 +854,7 @@ void __init proc_misc_init(void) | |||
854 | 854 | ||
855 | /* And now for trickier ones */ | 855 | /* And now for trickier ones */ |
856 | #ifdef CONFIG_PRINTK | 856 | #ifdef CONFIG_PRINTK |
857 | proc_create("kmsg", S_IRUSR, &proc_root, &proc_kmsg_operations); | 857 | proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations); |
858 | #endif | 858 | #endif |
859 | proc_create("locks", 0, NULL, &proc_locks_operations); | 859 | proc_create("locks", 0, NULL, &proc_locks_operations); |
860 | proc_create("devices", 0, NULL, &proc_devinfo_operations); | 860 | proc_create("devices", 0, NULL, &proc_devinfo_operations); |
diff --git a/fs/proc/root.c b/fs/proc/root.c index 5e93e9b0124e..c741b45a5503 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -232,4 +232,3 @@ EXPORT_SYMBOL(proc_mkdir); | |||
232 | EXPORT_SYMBOL(create_proc_entry); | 232 | EXPORT_SYMBOL(create_proc_entry); |
233 | EXPORT_SYMBOL(proc_create); | 233 | EXPORT_SYMBOL(proc_create); |
234 | EXPORT_SYMBOL(remove_proc_entry); | 234 | EXPORT_SYMBOL(remove_proc_entry); |
235 | EXPORT_SYMBOL(proc_root); | ||