* [PATCH] drm: fix LOCK_TEST_WITH_RETURN macro
@ 2009-01-22 15:54 Roel Kluin
0 siblings, 0 replies; only message in thread
From: Roel Kluin @ 2009-01-22 15:54 UTC (permalink / raw)
To: airlied; +Cc: dri-devel, lkml
fix LOCK_TEST_WITH_RETURN macro:
When this macro isn't called with 'file_priv' this will result in a
build failure.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index afb7858..7437927 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -237,15 +237,15 @@ struct drm_device;
* \param dev DRM device.
* \param filp file pointer of the caller.
*/
-#define LOCK_TEST_WITH_RETURN( dev, file_priv ) \
-do { \
- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) || \
- file_priv->master->lock.file_priv != file_priv) { \
+#define LOCK_TEST_WITH_RETURN( dev, _file_priv ) \
+do { \
+ if (!_DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock) || \
+ _file_priv->master->lock.file_priv != _file_priv) { \
DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\
- __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\
- file_priv->master->lock.file_priv, file_priv); \
- return -EINVAL; \
- } \
+ __func__, _DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock),\
+ _file_priv->master->lock.file_priv, _file_priv); \
+ return -EINVAL; \
+ } \
} while (0)
/**
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-01-22 15:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-22 15:54 [PATCH] drm: fix LOCK_TEST_WITH_RETURN macro Roel Kluin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.