diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
| commit | d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b (patch) | |
| tree | a9b7de7df6da5c3132cc68169b9c47ba288ccd42 /fs/sysfs/bin.c | |
| parent | d55651168a20078a94597a297d5cdfd807bf07b6 (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge commit 'v2.6.32-rc3'
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, |