]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
agp: convert drivers/char/agp/frontend.c to use unlocked_ioctl
authorMathieu Segaud <mathieu.segaud@regala.cx>
Fri, 18 Apr 2008 20:29:38 +0000 (13:29 -0700)
committerDave Airlie <airlied@linux.ie>
Sat, 26 Apr 2008 08:43:20 +0000 (18:43 +1000)
As of now, agp_compat_ioctl already runs without the BKL.  Mutual exclusion
is enforced by agp_fe.agp_mutex in agp_ioctl() and agp_compat_ioctl().
Apply the same locking rationale to the two functions allowing BKL cleanup.

Signed-off-by: Mathieu Segaud <mathieu.segaud@regala.cx>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/char/agp/frontend.c

index 55d7a82bd071a725a8813d888dabb77215de79be..857b26227d87d69b894f51609a5307fd68ea4bab 100644 (file)
@@ -967,7 +967,7 @@ int agpioc_chipset_flush_wrap(struct agp_file_private *priv)
        return 0;
 }
 
-static int agp_ioctl(struct inode *inode, struct file *file,
+static long agp_ioctl(struct file *file,
                     unsigned int cmd, unsigned long arg)
 {
        struct agp_file_private *curr_priv = file->private_data;
@@ -1058,7 +1058,7 @@ static const struct file_operations agp_fops =
        .llseek         = no_llseek,
        .read           = agp_read,
        .write          = agp_write,
-       .ioctl          = agp_ioctl,
+       .unlocked_ioctl = agp_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = compat_agp_ioctl,
 #endif