diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
| commit | 838632438145ac6863377eb12d8b8eef9c55d288 (patch) | |
| tree | fbb0757df837f3c75a99c518a3596c38daef162d /fs/sysfs/bin.c | |
| parent | 9996508b3353063f2d6c48c1a28a84543d72d70b (diff) | |
| parent | 29e553631b2a0d4eebd23db630572e1027a9967a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/sysfs/bin.c')
| -rw-r--r-- | fs/sysfs/bin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c index 2524714bece1..60c702bc10ae 100644 --- a/fs/sysfs/bin.c +++ b/fs/sysfs/bin.c | |||
| @@ -40,7 +40,7 @@ struct bin_buffer { | |||
| 40 | struct mutex mutex; | 40 | struct mutex mutex; |
| 41 | void *buffer; | 41 | void *buffer; |
| 42 | int mmapped; | 42 | int mmapped; |
| 43 | struct vm_operations_struct *vm_ops; | 43 | const struct vm_operations_struct *vm_ops; |
| 44 | struct file *file; | 44 | struct file *file; |
| 45 | struct hlist_node list; | 45 | struct hlist_node list; |
| 46 | }; | 46 | }; |
| @@ -331,7 +331,7 @@ static int bin_migrate(struct vm_area_struct *vma, const nodemask_t *from, | |||
| 331 | } | 331 | } |
| 332 | #endif | 332 | #endif |
| 333 | 333 | ||
| 334 | static struct vm_operations_struct bin_vm_ops = { | 334 | static const struct vm_operations_struct bin_vm_ops = { |
| 335 | .open = bin_vma_open, | 335 | .open = bin_vma_open, |
| 336 | .close = bin_vma_close, | 336 | .close = bin_vma_close, |
| 337 | .fault = bin_fault, | 337 | .fault = bin_fault, |