|
@@ -947,11 +947,11 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
|
|
static struct vm_operations_struct radeon_ttm_vm_ops;
|
|
static struct vm_operations_struct radeon_ttm_vm_ops;
|
|
static const struct vm_operations_struct *ttm_vm_ops = NULL;
|
|
static const struct vm_operations_struct *ttm_vm_ops = NULL;
|
|
|
|
|
|
-static int radeon_ttm_fault(struct vm_fault *vmf)
|
|
|
|
|
|
+static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
|
|
{
|
|
{
|
|
struct ttm_buffer_object *bo;
|
|
struct ttm_buffer_object *bo;
|
|
struct radeon_device *rdev;
|
|
struct radeon_device *rdev;
|
|
- int r;
|
|
|
|
|
|
+ vm_fault_t ret;
|
|
|
|
|
|
bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
|
|
bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
|
|
if (bo == NULL) {
|
|
if (bo == NULL) {
|
|
@@ -959,9 +959,9 @@ static int radeon_ttm_fault(struct vm_fault *vmf)
|
|
}
|
|
}
|
|
rdev = radeon_get_rdev(bo->bdev);
|
|
rdev = radeon_get_rdev(bo->bdev);
|
|
down_read(&rdev->pm.mclk_lock);
|
|
down_read(&rdev->pm.mclk_lock);
|
|
- r = ttm_vm_ops->fault(vmf);
|
|
|
|
|
|
+ ret = ttm_vm_ops->fault(vmf);
|
|
up_read(&rdev->pm.mclk_lock);
|
|
up_read(&rdev->pm.mclk_lock);
|
|
- return r;
|
|
|
|
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
|
|
int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
|
|
int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
|