vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / drm / i830_irq.c

diff --git a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c
index 6a0e25c..0977445 100644 (file)
--- a/drivers/char/drm/i830_irq.c
+++ b/drivers/char/drm/i830_irq.c
@@ -26,7 +26,6 @@
  *
  */
 
-#include "i830.h"
 #include "drmP.h"
 #include "drm.h"
 #include "i830_drm.h"
@@ -129,10 +128,7 @@ int i830_irq_emit( struct inode *inode, struct file *filp, unsigned int cmd,
        drm_i830_irq_emit_t emit;
        int result;
 
-       if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
-               DRM_ERROR("i830_irq_emit called without lock held\n");
-               return -EINVAL;
-       }
+       LOCK_TEST_WITH_RETURN(dev, filp);
 
        if ( !dev_priv ) {
                DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );