summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
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 d1a6a6b1..21c3887d 100644
--- a/linux-core/drm_irq.c
+++ b/linux-core/drm_irq.c
@@ -417,7 +417,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);
@@ -455,7 +455,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 (test_bit(TASKLET_STATE_SCHED, &drm_tasklet.state))
diff --git a/linux-core/drm_lock.c b/linux-core/drm_lock.c
index 0cf183a7..d11c570e 100644
--- a/linux-core/drm_lock.c
+++ b/linux-core/drm_lock.c
@@ -155,7 +155,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;