Fix type of second argument to spin_lock_irqsave().

(cherry picked from f6238cf624 commit)
main
Michel Dänzer 2006-10-02 15:33:19 +02:00
parent eacedf41a6
commit 16be6ba63a
4 changed files with 10 additions and 9 deletions

View File

@ -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))

View File

@ -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;

View File

@ -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;

View File

@ -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");
@ -417,7 +417,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) {