From f6238cf6244b32bd84e3d2819963d7f5473867c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Mon, 2 Oct 2006 15:33:19 +0200
Subject: Fix type of second argument to spin_lock_irqsave().

---
 linux-core/drm_irq.c       | 4 ++--
 linux-core/drm_lock.c      | 2 +-
 shared-core/drm_drawable.c | 8 ++++----
 shared-core/i915_irq.c     | 5 +++--
 4 files changed, 10 insertions(+), 9 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;
diff --git a/shared-core/drm_drawable.c b/shared-core/drm_drawable.c
index d203b244..0817e321 100644
--- a/shared-core/drm_drawable.c
+++ b/shared-core/drm_drawable.c
@@ -43,7 +43,7 @@
 int drm_adddraw(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
-	unsigned int irqflags;
+	unsigned long irqflags;
 	int i, j;
 	u32 *bitfield = dev->drw_bitfield;
 	unsigned int bitfield_length = dev->drw_bitfield_length;
@@ -134,7 +134,7 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 	drm_draw_t draw;
 	int id, idx;
 	unsigned int shift;
-	unsigned int irqflags;
+	unsigned long irqflags;
 	u32 *bitfield = dev->drw_bitfield;
 	unsigned int bitfield_length = dev->drw_bitfield_length;
 	drm_drawable_info_t **info = dev->drw_info;
@@ -220,9 +220,9 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 int drm_update_drawable_info(DRM_IOCTL_ARGS) {
 	DRM_DEVICE;
 	drm_update_draw_t update;
-	unsigned int id, idx, shift;
+	unsigned int id, idx, shift, bitfield_length = dev->drw_bitfield_length;
 	u32 *bitfield = dev->drw_bitfield;
-	unsigned int irqflags, bitfield_length = dev->drw_bitfield_length;
+	unsigned long irqflags;
 	drm_drawable_info_t *info;
 	drm_clip_rect_t *rects;
 	int err;
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 76c3a810..feb7acc7 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -45,7 +45,7 @@
 static void i915_vblank_tasklet(drm_device_t *dev)
 {
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-	unsigned int irqflags;
+	unsigned long irqflags;
 	struct list_head *list, *tmp;
 
 	DRM_DEBUG("\n");
@@ -388,7 +388,8 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	drm_i915_vblank_swap_t swap;
 	drm_i915_vbl_swap_t *vbl_swap;
-	unsigned int pipe, seqtype, irqflags, curseq;
+	unsigned int pipe, seqtype, curseq;
+	unsigned long irqflags;
 	struct list_head *list;
 
 	if (!dev_priv) {
-- 
cgit v1.2.3