diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/proc/internal.h | 4 | ||||
-rw-r--r-- | fs/proc/root.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index c932aa65e198..f771889183c3 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h | |||
@@ -11,7 +11,11 @@ | |||
11 | 11 | ||
12 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
13 | 13 | ||
14 | #ifdef CONFIG_PROC_SYSCTL | ||
14 | extern int proc_sys_init(void); | 15 | extern int proc_sys_init(void); |
16 | #else | ||
17 | static inline void proc_sys_init(void) { } | ||
18 | #endif | ||
15 | 19 | ||
16 | struct vmalloc_info { | 20 | struct vmalloc_info { |
17 | unsigned long used; | 21 | unsigned long used; |
diff --git a/fs/proc/root.c b/fs/proc/root.c index 5834a744c2a9..41f17037f738 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -79,9 +79,7 @@ void __init proc_root_init(void) | |||
79 | proc_device_tree_init(); | 79 | proc_device_tree_init(); |
80 | #endif | 80 | #endif |
81 | proc_bus = proc_mkdir("bus", NULL); | 81 | proc_bus = proc_mkdir("bus", NULL); |
82 | #ifdef CONFIG_SYSCTL | ||
83 | proc_sys_init(); | 82 | proc_sys_init(); |
84 | #endif | ||
85 | } | 83 | } |
86 | 84 | ||
87 | static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat | 85 | static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat |