diff options
| author | Patrice Mandin <pmandin@caramail.com> | 2007-08-02 20:08:05 +0200 |
|---|---|---|
| committer | Patrice Mandin <pmandin@caramail.com> | 2007-08-02 20:08:05 +0200 |
| commit | 9dfcc1ba07b6ad1a41234ae4016b54444094ac18 (patch) | |
| tree | c0deaa0f308616f35eabfda98d83814a8d405fed /linux-core/drm_drv.c | |
| parent | 405c48b857a967c1174b27a5db975668e1d6a9f8 (diff) | |
| parent | 7602e4f8a67d777437502672b4f74d9b990535ce (diff) | |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/drm
Diffstat (limited to 'linux-core/drm_drv.c')
| -rw-r--r-- | linux-core/drm_drv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index cc676bda..bb15987e 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -574,6 +574,12 @@ static int drm_version(struct drm_device *dev, void *data, int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { + return drm_unlocked_ioctl(filp, cmd, arg); +} +EXPORT_SYMBOL(drm_ioctl); + +long drm_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ struct drm_file *file_priv = filp->private_data; struct drm_device *dev = file_priv->head->dev; struct drm_ioctl_desc *ioctl; @@ -650,7 +656,7 @@ err_i1: DRM_DEBUG("ret = %x\n", retcode); return retcode; } -EXPORT_SYMBOL(drm_ioctl); +EXPORT_SYMBOL(drm_unlocked_ioctl); drm_local_map_t *drm_getsarea(struct drm_device *dev) { |