diff options
author | Helge Deller <deller@gmx.de> | 2006-12-06 23:40:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:46 -0500 |
commit | 15ad7cdcfd76450d4beebc789ec646664238184d (patch) | |
tree | 279d05a76ae0906c23ee2de8c5684d95d9886ad3 /kernel | |
parent | 4a08a9f68168e547c2baf100020e9b96cae5fbd1 (diff) |
[PATCH] struct seq_operations and struct file_operations constification
- move some file_operations structs into the .rodata section
- move static strings from policy_types[] array into the .rodata section
- fix generic seq_operations usages, so that those structs may be defined
as "const" as well
[akpm@osdl.org: couple of fixes]
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/configs.c | 2 | ||||
-rw-r--r-- | kernel/cpuset.c | 4 | ||||
-rw-r--r-- | kernel/dma.c | 2 | ||||
-rw-r--r-- | kernel/futex.c | 2 | ||||
-rw-r--r-- | kernel/kallsyms.c | 4 | ||||
-rw-r--r-- | kernel/lockdep_proc.c | 6 | ||||
-rw-r--r-- | kernel/module.c | 2 | ||||
-rw-r--r-- | kernel/power/user.c | 2 | ||||
-rw-r--r-- | kernel/profile.c | 2 | ||||
-rw-r--r-- | kernel/relay.c | 2 | ||||
-rw-r--r-- | kernel/resource.c | 6 | ||||
-rw-r--r-- | kernel/sched.c | 2 | ||||
-rw-r--r-- | kernel/sysctl.c | 2 |
13 files changed, 19 insertions, 19 deletions
diff --git a/kernel/configs.c b/kernel/configs.c index f9e31974f4ad..8fa1fb28f8a7 100644 --- a/kernel/configs.c +++ b/kernel/configs.c | |||
@@ -75,7 +75,7 @@ ikconfig_read_current(struct file *file, char __user *buf, | |||
75 | return count; | 75 | return count; |
76 | } | 76 | } |
77 | 77 | ||
78 | static struct file_operations ikconfig_file_ops = { | 78 | static const struct file_operations ikconfig_file_ops = { |
79 | .owner = THIS_MODULE, | 79 | .owner = THIS_MODULE, |
80 | .read = ikconfig_read_current, | 80 | .read = ikconfig_read_current, |
81 | }; | 81 | }; |
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 9b62b4c03ad0..4ef1d29297ca 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -1531,7 +1531,7 @@ static int cpuset_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1531 | return simple_rename(old_dir, old_dentry, new_dir, new_dentry); | 1531 | return simple_rename(old_dir, old_dentry, new_dir, new_dentry); |
1532 | } | 1532 | } |
1533 | 1533 | ||
1534 | static struct file_operations cpuset_file_operations = { | 1534 | static const struct file_operations cpuset_file_operations = { |
1535 | .read = cpuset_file_read, | 1535 | .read = cpuset_file_read, |
1536 | .write = cpuset_file_write, | 1536 | .write = cpuset_file_write, |
1537 | .llseek = generic_file_llseek, | 1537 | .llseek = generic_file_llseek, |
@@ -2605,7 +2605,7 @@ static int cpuset_open(struct inode *inode, struct file *file) | |||
2605 | return single_open(file, proc_cpuset_show, pid); | 2605 | return single_open(file, proc_cpuset_show, pid); |
2606 | } | 2606 | } |
2607 | 2607 | ||
2608 | struct file_operations proc_cpuset_operations = { | 2608 | const struct file_operations proc_cpuset_operations = { |
2609 | .open = cpuset_open, | 2609 | .open = cpuset_open, |
2610 | .read = seq_read, | 2610 | .read = seq_read, |
2611 | .llseek = seq_lseek, | 2611 | .llseek = seq_lseek, |
diff --git a/kernel/dma.c b/kernel/dma.c index 2020644c938a..937b13ca33ba 100644 --- a/kernel/dma.c +++ b/kernel/dma.c | |||
@@ -140,7 +140,7 @@ static int proc_dma_open(struct inode *inode, struct file *file) | |||
140 | return single_open(file, proc_dma_show, NULL); | 140 | return single_open(file, proc_dma_show, NULL); |
141 | } | 141 | } |
142 | 142 | ||
143 | static struct file_operations proc_dma_operations = { | 143 | static const struct file_operations proc_dma_operations = { |
144 | .open = proc_dma_open, | 144 | .open = proc_dma_open, |
145 | .read = seq_read, | 145 | .read = seq_read, |
146 | .llseek = seq_lseek, | 146 | .llseek = seq_lseek, |
diff --git a/kernel/futex.c b/kernel/futex.c index a8302a1620ea..95989a3b4168 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -1492,7 +1492,7 @@ static unsigned int futex_poll(struct file *filp, | |||
1492 | return ret; | 1492 | return ret; |
1493 | } | 1493 | } |
1494 | 1494 | ||
1495 | static struct file_operations futex_fops = { | 1495 | static const struct file_operations futex_fops = { |
1496 | .release = futex_close, | 1496 | .release = futex_close, |
1497 | .poll = futex_poll, | 1497 | .poll = futex_poll, |
1498 | }; | 1498 | }; |
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 54befe36ee0b..ab63cfc42992 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c | |||
@@ -398,7 +398,7 @@ static int s_show(struct seq_file *m, void *p) | |||
398 | return 0; | 398 | return 0; |
399 | } | 399 | } |
400 | 400 | ||
401 | static struct seq_operations kallsyms_op = { | 401 | static const struct seq_operations kallsyms_op = { |
402 | .start = s_start, | 402 | .start = s_start, |
403 | .next = s_next, | 403 | .next = s_next, |
404 | .stop = s_stop, | 404 | .stop = s_stop, |
@@ -433,7 +433,7 @@ static int kallsyms_release(struct inode *inode, struct file *file) | |||
433 | return seq_release(inode, file); | 433 | return seq_release(inode, file); |
434 | } | 434 | } |
435 | 435 | ||
436 | static struct file_operations kallsyms_operations = { | 436 | static const struct file_operations kallsyms_operations = { |
437 | .open = kallsyms_open, | 437 | .open = kallsyms_open, |
438 | .read = seq_read, | 438 | .read = seq_read, |
439 | .llseek = seq_lseek, | 439 | .llseek = seq_lseek, |
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index f6e72eaab3fa..b554b40a4aa6 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c | |||
@@ -113,7 +113,7 @@ static int l_show(struct seq_file *m, void *v) | |||
113 | return 0; | 113 | return 0; |
114 | } | 114 | } |
115 | 115 | ||
116 | static struct seq_operations lockdep_ops = { | 116 | static const struct seq_operations lockdep_ops = { |
117 | .start = l_start, | 117 | .start = l_start, |
118 | .next = l_next, | 118 | .next = l_next, |
119 | .stop = l_stop, | 119 | .stop = l_stop, |
@@ -135,7 +135,7 @@ static int lockdep_open(struct inode *inode, struct file *file) | |||
135 | return res; | 135 | return res; |
136 | } | 136 | } |
137 | 137 | ||
138 | static struct file_operations proc_lockdep_operations = { | 138 | static const struct file_operations proc_lockdep_operations = { |
139 | .open = lockdep_open, | 139 | .open = lockdep_open, |
140 | .read = seq_read, | 140 | .read = seq_read, |
141 | .llseek = seq_lseek, | 141 | .llseek = seq_lseek, |
@@ -319,7 +319,7 @@ static int lockdep_stats_open(struct inode *inode, struct file *file) | |||
319 | return single_open(file, lockdep_stats_show, NULL); | 319 | return single_open(file, lockdep_stats_show, NULL); |
320 | } | 320 | } |
321 | 321 | ||
322 | static struct file_operations proc_lockdep_stats_operations = { | 322 | static const struct file_operations proc_lockdep_stats_operations = { |
323 | .open = lockdep_stats_open, | 323 | .open = lockdep_stats_open, |
324 | .read = seq_read, | 324 | .read = seq_read, |
325 | .llseek = seq_lseek, | 325 | .llseek = seq_lseek, |
diff --git a/kernel/module.c b/kernel/module.c index e2d09d604ca0..d9eae45d0145 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -2209,7 +2209,7 @@ static int m_show(struct seq_file *m, void *p) | |||
2209 | Where refcount is a number or -, and deps is a comma-separated list | 2209 | Where refcount is a number or -, and deps is a comma-separated list |
2210 | of depends or -. | 2210 | of depends or -. |
2211 | */ | 2211 | */ |
2212 | struct seq_operations modules_op = { | 2212 | const struct seq_operations modules_op = { |
2213 | .start = m_start, | 2213 | .start = m_start, |
2214 | .next = m_next, | 2214 | .next = m_next, |
2215 | .stop = m_stop, | 2215 | .stop = m_stop, |
diff --git a/kernel/power/user.c b/kernel/power/user.c index 069732e5695c..89443b85163b 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c | |||
@@ -383,7 +383,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, | |||
383 | return error; | 383 | return error; |
384 | } | 384 | } |
385 | 385 | ||
386 | static struct file_operations snapshot_fops = { | 386 | static const struct file_operations snapshot_fops = { |
387 | .open = snapshot_open, | 387 | .open = snapshot_open, |
388 | .release = snapshot_release, | 388 | .release = snapshot_release, |
389 | .read = snapshot_read, | 389 | .read = snapshot_read, |
diff --git a/kernel/profile.c b/kernel/profile.c index 0961d93e1d91..fb5e03d57e9d 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
@@ -501,7 +501,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf, | |||
501 | return count; | 501 | return count; |
502 | } | 502 | } |
503 | 503 | ||
504 | static struct file_operations proc_profile_operations = { | 504 | static const struct file_operations proc_profile_operations = { |
505 | .read = read_profile, | 505 | .read = read_profile, |
506 | .write = write_profile, | 506 | .write = write_profile, |
507 | }; | 507 | }; |
diff --git a/kernel/relay.c b/kernel/relay.c index 2b92e8ece85b..75a3a9a7efc2 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
@@ -1013,7 +1013,7 @@ static ssize_t relay_file_sendfile(struct file *filp, | |||
1013 | actor, &desc); | 1013 | actor, &desc); |
1014 | } | 1014 | } |
1015 | 1015 | ||
1016 | struct file_operations relay_file_operations = { | 1016 | const struct file_operations relay_file_operations = { |
1017 | .open = relay_file_open, | 1017 | .open = relay_file_open, |
1018 | .poll = relay_file_poll, | 1018 | .poll = relay_file_poll, |
1019 | .mmap = relay_file_mmap, | 1019 | .mmap = relay_file_mmap, |
diff --git a/kernel/resource.c b/kernel/resource.c index 6de60c12143e..7b9a497419d9 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -88,7 +88,7 @@ static int r_show(struct seq_file *m, void *v) | |||
88 | return 0; | 88 | return 0; |
89 | } | 89 | } |
90 | 90 | ||
91 | static struct seq_operations resource_op = { | 91 | static const struct seq_operations resource_op = { |
92 | .start = r_start, | 92 | .start = r_start, |
93 | .next = r_next, | 93 | .next = r_next, |
94 | .stop = r_stop, | 94 | .stop = r_stop, |
@@ -115,14 +115,14 @@ static int iomem_open(struct inode *inode, struct file *file) | |||
115 | return res; | 115 | return res; |
116 | } | 116 | } |
117 | 117 | ||
118 | static struct file_operations proc_ioports_operations = { | 118 | static const struct file_operations proc_ioports_operations = { |
119 | .open = ioports_open, | 119 | .open = ioports_open, |
120 | .read = seq_read, | 120 | .read = seq_read, |
121 | .llseek = seq_lseek, | 121 | .llseek = seq_lseek, |
122 | .release = seq_release, | 122 | .release = seq_release, |
123 | }; | 123 | }; |
124 | 124 | ||
125 | static struct file_operations proc_iomem_operations = { | 125 | static const struct file_operations proc_iomem_operations = { |
126 | .open = iomem_open, | 126 | .open = iomem_open, |
127 | .read = seq_read, | 127 | .read = seq_read, |
128 | .llseek = seq_lseek, | 128 | .llseek = seq_lseek, |
diff --git a/kernel/sched.c b/kernel/sched.c index b43cef02ce5b..f385eff4682d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -505,7 +505,7 @@ static int schedstat_open(struct inode *inode, struct file *file) | |||
505 | return res; | 505 | return res; |
506 | } | 506 | } |
507 | 507 | ||
508 | struct file_operations proc_schedstat_operations = { | 508 | const struct file_operations proc_schedstat_operations = { |
509 | .open = schedstat_open, | 509 | .open = schedstat_open, |
510 | .read = seq_read, | 510 | .read = seq_read, |
511 | .llseek = seq_lseek, | 511 | .llseek = seq_lseek, |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 6d7147cf66bb..758dbbf972a5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -170,7 +170,7 @@ static ssize_t proc_readsys(struct file *, char __user *, size_t, loff_t *); | |||
170 | static ssize_t proc_writesys(struct file *, const char __user *, size_t, loff_t *); | 170 | static ssize_t proc_writesys(struct file *, const char __user *, size_t, loff_t *); |
171 | static int proc_opensys(struct inode *, struct file *); | 171 | static int proc_opensys(struct inode *, struct file *); |
172 | 172 | ||
173 | struct file_operations proc_sys_file_operations = { | 173 | const struct file_operations proc_sys_file_operations = { |
174 | .open = proc_opensys, | 174 | .open = proc_opensys, |
175 | .read = proc_readsys, | 175 | .read = proc_readsys, |
176 | .write = proc_writesys, | 176 | .write = proc_writesys, |