diff options
| author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
| commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
| tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /bsd-core/drm_lock.c | |
| parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
| parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'bsd-core/drm_lock.c')
| -rw-r--r-- | bsd-core/drm_lock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c index 9731ff92..9101dec8 100644 --- a/bsd-core/drm_lock.c +++ b/bsd-core/drm_lock.c @@ -77,7 +77,7 @@ int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context) /* This takes a lock forcibly and hands it to context. Should ONLY be used inside *_unlock to give lock to kernel before calling *_dma_schedule. */ -int drm_lock_transfer(drm_device_t *dev, +int drm_lock_transfer(struct drm_device *dev, __volatile__ unsigned int *lock, unsigned int context) { unsigned int old, new; @@ -91,7 +91,7 @@ int drm_lock_transfer(drm_device_t *dev, return 1; } -int drm_lock_free(drm_device_t *dev, +int drm_lock_free(struct drm_device *dev, __volatile__ unsigned int *lock, unsigned int context) { unsigned int old, new; @@ -111,7 +111,7 @@ int drm_lock_free(drm_device_t *dev, return 0; } -int drm_lock(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) { drm_lock_t *lock = data; int ret = 0; @@ -164,7 +164,7 @@ int drm_lock(drm_device_t *dev, void *data, struct drm_file *file_priv) return 0; } -int drm_unlock(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) { drm_lock_t *lock = data; |