Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ba58aebf567d2cb45ed9dbbb6910b51144f20c68

Authored by Arnd Bergmann
Committed by Tony Luck
1 parent 7b313fdf23
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[IA64] perfmon: convert to unlocked_ioctl 

The ioctl function in this driver does not
do anything that requires the BKL, so make
it use unlocked_ioctl.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Showing 1 changed file with 11 additions and 11 deletions Side-by-side Diff

arch/ia64/kernel/perfmon.c
Diff comments   View file @ ba58aeb
... ... @@ -1696,8 +1696,8 @@
1696 1696 return mask;
1697 1697 }
1698 1698  
1699   -static int
1700   -pfm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
  1699 +static long
  1700 +pfm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
1701 1701 {
1702 1702 DPRINT(("pfm_ioctl called\n"));
1703 1703 return -EINVAL;
... ... @@ -2174,15 +2174,15 @@
2174 2174  
2175 2175  
2176 2176 static const struct file_operations pfm_file_ops = {
2177   - .llseek = no_llseek,
2178   - .read = pfm_read,
2179   - .write = pfm_write,
2180   - .poll = pfm_poll,
2181   - .ioctl = pfm_ioctl,
2182   - .open = pfm_no_open, /* special open code to disallow open via /proc */
2183   - .fasync = pfm_fasync,
2184   - .release = pfm_close,
2185   - .flush = pfm_flush
  2177 + .llseek = no_llseek,
  2178 + .read = pfm_read,
  2179 + .write = pfm_write,
  2180 + .poll = pfm_poll,
  2181 + .unlocked_ioctl = pfm_ioctl,
  2182 + .open = pfm_no_open, /* special open code to disallow open via /proc */
  2183 + .fasync = pfm_fasync,
  2184 + .release = pfm_close,
  2185 + .flush = pfm_flush
2186 2186 };
2187 2187  
2188 2188 static int