aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-23 09:46:50 -0400
committerDave Airlie <airlied@redhat.com>2014-09-23 21:43:20 -0400
commit884d9f05eb6c765d62da0ec8c36a669d8c813340 (patch)
tree00cde8593f77099f2a8878661687d4c487346c34
parentbfbf3c851ce53b914fe98d60ea3fe3fc1ab75b96 (diff)
drm: Move drm_vm_open_locked into drm_internal.h
Leftover from my previous header cleanup. This depends upon the patch to rework exynos mmap support, otherwise it'll break exynos. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_internal.h1
-rw-r--r--drivers/gpu/drm/drm_vm.c1
-rw-r--r--include/drm/drmP.h1
3 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index d27faae45f1b..05624561118a 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -37,6 +37,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
37 37
38/* drm_vm.c */ 38/* drm_vm.c */
39int drm_vma_info(struct seq_file *m, void *data); 39int drm_vma_info(struct seq_file *m, void *data);
40void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma);
40void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma); 41void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma);
41 42
42/* drm_prime.c */ 43/* drm_prime.c */
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 28739d401596..4a2c328959e5 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -417,7 +417,6 @@ void drm_vm_open_locked(struct drm_device *dev,
417 list_add(&vma_entry->head, &dev->vmalist); 417 list_add(&vma_entry->head, &dev->vmalist);
418 } 418 }
419} 419}
420EXPORT_SYMBOL_GPL(drm_vm_open_locked);
421 420
422static void drm_vm_open(struct vm_area_struct *vma) 421static void drm_vm_open(struct vm_area_struct *vma)
423{ 422{
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 40c999019d9e..7b545975afd9 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -961,7 +961,6 @@ extern ssize_t drm_read(struct file *filp, char __user *buffer,
961extern int drm_release(struct inode *inode, struct file *filp); 961extern int drm_release(struct inode *inode, struct file *filp);
962 962
963 /* Mapping support (drm_vm.h) */ 963 /* Mapping support (drm_vm.h) */
964extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma);
965extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); 964extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
966 965
967/* Misc. IOCTL support (drm_ioctl.c) */ 966/* Misc. IOCTL support (drm_ioctl.c) */