diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c index 0fe31766e4cf..635c0ffee7fe 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | |||
| @@ -545,7 +545,7 @@ int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma) | |||
| 545 | struct drm_file *file_priv; | 545 | struct drm_file *file_priv; |
| 546 | struct vmw_private *dev_priv; | 546 | struct vmw_private *dev_priv; |
| 547 | 547 | ||
| 548 | file_priv = (struct drm_file *)filp->private_data; | 548 | file_priv = filp->private_data; |
| 549 | dev_priv = vmw_priv(file_priv->minor->dev); | 549 | dev_priv = vmw_priv(file_priv->minor->dev); |
| 550 | 550 | ||
| 551 | if (vma->vm_pgoff != (dev_priv->mmio_start >> PAGE_SHIFT) || | 551 | if (vma->vm_pgoff != (dev_priv->mmio_start >> PAGE_SHIFT) || |