vserver 2.0 rc7

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

diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index 3a7637c..f15c86c 100644 (file)
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -208,7 +208,7 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
                     unsigned int cmd, unsigned long arg)
 {
        drm_file_t      *priv   = filp->private_data;
-       drm_device_t    *dev    = priv->dev;
+       drm_device_t    *dev    = priv->head->dev;
        drm_ctx_priv_map_t __user *argp = (void __user *)arg;
        drm_ctx_priv_map_t request;
        drm_map_t *map;
@@ -247,7 +247,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
                     unsigned int cmd, unsigned long arg)
 {
        drm_file_t      *priv   = filp->private_data;
-       drm_device_t    *dev    = priv->dev;
+       drm_device_t    *dev    = priv->head->dev;
        drm_ctx_priv_map_t request;
        drm_map_t *map = NULL;
        drm_map_list_t *r_list = NULL;
@@ -395,7 +395,7 @@ int drm_addctx( struct inode *inode, struct file *filp,
                 unsigned int cmd, unsigned long arg )
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_ctx_list_t * ctx_entry;
        drm_ctx_t __user *argp = (void __user *)arg;
        drm_ctx_t ctx;
@@ -489,7 +489,7 @@ int drm_switchctx( struct inode *inode, struct file *filp,
                    unsigned int cmd, unsigned long arg )
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_ctx_t ctx;
 
        if ( copy_from_user( &ctx, (drm_ctx_t __user *)arg, sizeof(ctx) ) )
@@ -514,7 +514,7 @@ int drm_newctx( struct inode *inode, struct file *filp,
                 unsigned int cmd, unsigned long arg )
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_ctx_t ctx;
 
        if ( copy_from_user( &ctx, (drm_ctx_t __user *)arg, sizeof(ctx) ) )
@@ -541,7 +541,7 @@ int drm_rmctx( struct inode *inode, struct file *filp,
                unsigned int cmd, unsigned long arg )
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_ctx_t ctx;
 
        if ( copy_from_user( &ctx, (drm_ctx_t __user *)arg, sizeof(ctx) ) )