diff options
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/generic.c | 2 | ||||
-rw-r--r-- | fs/proc/internal.h | 2 | ||||
-rw-r--r-- | fs/proc/kcore.c | 2 | ||||
-rw-r--r-- | fs/proc/kmsg.c | 2 | ||||
-rw-r--r-- | fs/proc/proc_misc.c | 4 | ||||
-rw-r--r-- | fs/proc/vmcore.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 47b7a20d45eb..4ba03009cf72 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -560,7 +560,7 @@ static void proc_kill_inodes(struct proc_dir_entry *de) | |||
560 | struct file * filp = list_entry(p, struct file, f_u.fu_list); | 560 | struct file * filp = list_entry(p, struct file, f_u.fu_list); |
561 | struct dentry * dentry = filp->f_dentry; | 561 | struct dentry * dentry = filp->f_dentry; |
562 | struct inode * inode; | 562 | struct inode * inode; |
563 | struct file_operations *fops; | 563 | const struct file_operations *fops; |
564 | 564 | ||
565 | if (dentry->d_op != &proc_dentry_operations) | 565 | if (dentry->d_op != &proc_dentry_operations) |
566 | continue; | 566 | continue; |
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 95a1cf32b838..0502f17b860d 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h | |||
@@ -30,7 +30,7 @@ do { \ | |||
30 | 30 | ||
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | extern void create_seq_entry(char *name, mode_t mode, struct file_operations *f); | 33 | extern void create_seq_entry(char *name, mode_t mode, const struct file_operations *f); |
34 | extern int proc_exe_link(struct inode *, struct dentry **, struct vfsmount **); | 34 | extern int proc_exe_link(struct inode *, struct dentry **, struct vfsmount **); |
35 | extern int proc_tid_stat(struct task_struct *, char *); | 35 | extern int proc_tid_stat(struct task_struct *, char *); |
36 | extern int proc_tgid_stat(struct task_struct *, char *); | 36 | extern int proc_tgid_stat(struct task_struct *, char *); |
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index adc2cd95169a..17f6e8fa1397 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
@@ -31,7 +31,7 @@ static int open_kcore(struct inode * inode, struct file * filp) | |||
31 | 31 | ||
32 | static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); | 32 | static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); |
33 | 33 | ||
34 | struct file_operations proc_kcore_operations = { | 34 | const struct file_operations proc_kcore_operations = { |
35 | .read = read_kcore, | 35 | .read = read_kcore, |
36 | .open = open_kcore, | 36 | .open = open_kcore, |
37 | }; | 37 | }; |
diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c index 10d37bf25206..ff3b90b56e9d 100644 --- a/fs/proc/kmsg.c +++ b/fs/proc/kmsg.c | |||
@@ -47,7 +47,7 @@ static unsigned int kmsg_poll(struct file *file, poll_table *wait) | |||
47 | } | 47 | } |
48 | 48 | ||
49 | 49 | ||
50 | struct file_operations proc_kmsg_operations = { | 50 | const struct file_operations proc_kmsg_operations = { |
51 | .read = kmsg_read, | 51 | .read = kmsg_read, |
52 | .poll = kmsg_poll, | 52 | .poll = kmsg_poll, |
53 | .open = kmsg_open, | 53 | .open = kmsg_open, |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 1e9ea37d457e..ef5a3323f4b5 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -534,7 +534,7 @@ static int show_stat(struct seq_file *p, void *v) | |||
534 | if (wall_to_monotonic.tv_nsec) | 534 | if (wall_to_monotonic.tv_nsec) |
535 | --jif; | 535 | --jif; |
536 | 536 | ||
537 | for_each_cpu(i) { | 537 | for_each_possible_cpu(i) { |
538 | int j; | 538 | int j; |
539 | 539 | ||
540 | user = cputime64_add(user, kstat_cpu(i).cpustat.user); | 540 | user = cputime64_add(user, kstat_cpu(i).cpustat.user); |
@@ -731,7 +731,7 @@ static struct file_operations proc_sysrq_trigger_operations = { | |||
731 | 731 | ||
732 | struct proc_dir_entry *proc_root_kcore; | 732 | struct proc_dir_entry *proc_root_kcore; |
733 | 733 | ||
734 | void create_seq_entry(char *name, mode_t mode, struct file_operations *f) | 734 | void create_seq_entry(char *name, mode_t mode, const struct file_operations *f) |
735 | { | 735 | { |
736 | struct proc_dir_entry *entry; | 736 | struct proc_dir_entry *entry; |
737 | entry = create_proc_entry(name, mode, NULL); | 737 | entry = create_proc_entry(name, mode, NULL); |
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 4063fb32f78c..7efa73d44c9a 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c | |||
@@ -172,7 +172,7 @@ static int open_vmcore(struct inode *inode, struct file *filp) | |||
172 | return 0; | 172 | return 0; |
173 | } | 173 | } |
174 | 174 | ||
175 | struct file_operations proc_vmcore_operations = { | 175 | const struct file_operations proc_vmcore_operations = { |
176 | .read = read_vmcore, | 176 | .read = read_vmcore, |
177 | .open = open_vmcore, | 177 | .open = open_vmcore, |
178 | }; | 178 | }; |