diff options
Diffstat (limited to 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 66c1ab87656c..b675a49c1823 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -683,6 +683,7 @@ static int cmdline_read_proc(char *page, char **start, off_t off, | |||
| 683 | return proc_calc_metrics(page, start, off, count, eof, len); | 683 | return proc_calc_metrics(page, start, off, count, eof, len); |
| 684 | } | 684 | } |
| 685 | 685 | ||
| 686 | #ifdef CONFIG_FILE_LOCKING | ||
| 686 | static int locks_open(struct inode *inode, struct file *filp) | 687 | static int locks_open(struct inode *inode, struct file *filp) |
| 687 | { | 688 | { |
| 688 | return seq_open(filp, &locks_seq_operations); | 689 | return seq_open(filp, &locks_seq_operations); |
| @@ -694,6 +695,7 @@ static const struct file_operations proc_locks_operations = { | |||
| 694 | .llseek = seq_lseek, | 695 | .llseek = seq_lseek, |
| 695 | .release = seq_release, | 696 | .release = seq_release, |
| 696 | }; | 697 | }; |
| 698 | #endif /* CONFIG_FILE_LOCKING */ | ||
| 697 | 699 | ||
| 698 | static int execdomains_read_proc(char *page, char **start, off_t off, | 700 | static int execdomains_read_proc(char *page, char **start, off_t off, |
| 699 | int count, int *eof, void *data) | 701 | int count, int *eof, void *data) |
| @@ -887,7 +889,9 @@ void __init proc_misc_init(void) | |||
| 887 | #ifdef CONFIG_PRINTK | 889 | #ifdef CONFIG_PRINTK |
| 888 | proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations); | 890 | proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations); |
| 889 | #endif | 891 | #endif |
| 892 | #ifdef CONFIG_FILE_LOCKING | ||
| 890 | proc_create("locks", 0, NULL, &proc_locks_operations); | 893 | proc_create("locks", 0, NULL, &proc_locks_operations); |
| 894 | #endif | ||
| 891 | proc_create("devices", 0, NULL, &proc_devinfo_operations); | 895 | proc_create("devices", 0, NULL, &proc_devinfo_operations); |
| 892 | proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations); | 896 | proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations); |
| 893 | #ifdef CONFIG_BLOCK | 897 | #ifdef CONFIG_BLOCK |
