aboutsummaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2006-10-02 15:33:19 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2006-10-02 15:33:19 +0200
commitf6238cf6244b32bd84e3d2819963d7f5473867c8 (patch)
tree3380b1891f1249b9d59fe0241eb4d13bf40b236b /linux-core
parent3a16e615cabfed18b1891a732e7243ef41dc0ad0 (diff)
Fix type of second argument to spin_lock_irqsave().
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_irq.c4
-rw-r--r--linux-core/drm_lock.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c
index 41038fd7..4d8e4a25 100644
--- a/linux-core/drm_irq.c
+++ b/linux-core/drm_irq.c
@@ -416,7 +416,7 @@ EXPORT_SYMBOL(drm_vbl_send_signals);
static void drm_locked_tasklet_func(unsigned long data)
{
drm_device_t *dev = (drm_device_t*)data;
- unsigned int irqflags;
+ unsigned long irqflags;
spin_lock_irqsave(&dev->tasklet_lock, irqflags);
@@ -454,7 +454,7 @@ static void drm_locked_tasklet_func(unsigned long data)
*/
void drm_locked_tasklet(drm_device_t *dev, void (*func)(drm_device_t*))
{
- unsigned int irqflags;
+ unsigned long irqflags;
static DECLARE_TASKLET(drm_tasklet, drm_locked_tasklet_func, 0);
if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ) ||
diff --git a/linux-core/drm_lock.c b/linux-core/drm_lock.c
index fa677bae..d1b85a15 100644
--- a/linux-core/drm_lock.c
+++ b/linux-core/drm_lock.c
@@ -152,7 +152,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->head->dev;
drm_lock_t lock;
- unsigned int irqflags;
+ unsigned long irqflags;
if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock)))
return -EFAULT;