diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/misc/sgi-gru/grufile.c | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/misc/sgi-gru/grufile.c')
| -rw-r--r-- | drivers/misc/sgi-gru/grufile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 300e7ba391a0..41c8fe2a928c 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c | |||
| @@ -53,7 +53,6 @@ struct gru_stats_s gru_stats; | |||
| 53 | /* Guaranteed user available resources on each node */ | 53 | /* Guaranteed user available resources on each node */ |
| 54 | static int max_user_cbrs, max_user_dsr_bytes; | 54 | static int max_user_cbrs, max_user_dsr_bytes; |
| 55 | 55 | ||
| 56 | static struct file_operations gru_fops; | ||
| 57 | static struct miscdevice gru_miscdev; | 56 | static struct miscdevice gru_miscdev; |
| 58 | 57 | ||
| 59 | 58 | ||
| @@ -426,7 +425,7 @@ static void __exit gru_exit(void) | |||
| 426 | gru_proc_exit(); | 425 | gru_proc_exit(); |
| 427 | } | 426 | } |
| 428 | 427 | ||
| 429 | static struct file_operations gru_fops = { | 428 | static const struct file_operations gru_fops = { |
| 430 | .owner = THIS_MODULE, | 429 | .owner = THIS_MODULE, |
| 431 | .unlocked_ioctl = gru_file_unlocked_ioctl, | 430 | .unlocked_ioctl = gru_file_unlocked_ioctl, |
| 432 | .mmap = gru_file_mmap, | 431 | .mmap = gru_file_mmap, |